From 6cec077dfcc05d1a4bc6807e63457f04b586266e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 2 Jun 2015 20:27:57 +0800 Subject: [PATCH] src/Builder4/About.vala.c src/Builder4/ClutterFiles.vala.c src/Builder4/DialogConfirm.vala.c src/Builder4/DialogPluginWebkit.vala.c src/Builder4/DialogSaveModule.vala.c src/Builder4/DialogSaveTemplate.vala.c src/Builder4/DialogTemplateSelect.vala.c src/Builder4/Editor.vala.c src/Builder4/EditProject.vala.c src/Builder4/FakeServer.vala.c src/Builder4/GtkView.vala.c src/Builder4/MainWindow.vala.c src/Builder4/ProjectSettings.vala.c src/Builder4/RooProjectProperties.vala.c src/Builder4/StandardErrorDialog.vala.c src/Builder4/ValaProjectSettings.vala.c src/Builder4/WindowAddProp.vala.c src/Builder4/WindowLeftProjects.vala.c src/Builder4/WindowLeftProps.vala.c src/Builder4/WindowLeftTree.vala.c src/Builder4/WindowRightPalete.vala.c src/Builder4/WindowRooView.vala.c src/Builder4/WindowState.vala.c src/Builder4/PopoverFileDetails.vala.c src/Builder4/ValaCompileErrors.vala.c src/Builder4/ValaCompileResults.vala.c src/Builder4/PopoverProperty.vala.c src/JsRender/Gtk.vala.c src/JsRender/JsRender.vala.c src/JsRender/Lang.vala.c src/JsRender/NodeToGlade.vala.c src/JsRender/NodeToGtk.vala.c src/JsRender/NodeToJs.vala.c src/JsRender/NodeToVala.vala.c src/JsRender/Node.vala.c src/JsRender/Roo.vala.c src/JsRender/PlainFile.vala.c src/Palete/Gir.vala.c src/Palete/Gtk.vala.c src/Palete/Javascript.vala.c src/Palete/Palete.vala.c src/Palete/RooDatabase.vala.c src/Palete/Roo.vala.c src/Palete/ValaSource.vala.c src/Palete/GirObject.vala.c src/Palete/VapiParser.vala.c src/Palete/ValaSourceCompiler.vala.c src/Palete/CompletionProvider.vala.c src/Project/Gtk.vala.c src/Project/Project.vala.c src/Project/Roo.vala.c src/Application.vala.c src/Main.vala.c src/Resources.vala.c src/Spawn.vala.c --- src/Builder4/Editor.bjs | 2 +- src/Builder4/Editor.vala | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs index 5ff637918..4c0fbc6cd 100644 --- a/src/Builder4/Editor.bjs +++ b/src/Builder4/Editor.bjs @@ -9,7 +9,7 @@ "items" : [ { "# Xcls_MainWindow window" : "null", - "| Gee.ArrayList search" : "(string txt) {\n var ret = new Gee.ArrayList();\n \n return ret;\n}\n", + "| Gee.ArrayList search" : "(string txt) {\n\tvar ret = new Gee.ArrayList();\n\n\tvar str = this.buffer.toString();\n\n\tvar lines = str.split(\"\\n\");\n\tfor (var i = 0 ; i < lines.length; i++) {\n\tif (lines[i].contains(txt)) {\n\t\tret.add(i);\n\t}\n \n\t}\n\treturn ret;\n}\n", "| bool saveContents" : " () {\n \n \n if (_this.file == null) {\n return true;\n }\n \n \n \n \n \n var str = _this.buffer.toString();\n \n _this.buffer.checkSyntax();\n \n \n \n // LeftPanel.model.changed( str , false);\n _this.dirty = false;\n _this.save_button.el.sensitive = false;\n \n // find the text for the node..\n if (_this.file.xtype != \"PlainFile\") {\n if (ptype == \"listener\") {\n this.node.listeners.set(key,str);\n \n } else {\n this.node.props.set(key,str);\n }\n } else {\n _this.file.setSource( str );\n }\n \n // call the signal..\n this.save();\n \n return true;\n\n} ", "# string activeEditor" : "\"\"", "| void scroll_to_line" : "(int line) {\n\n\tGLib.Timeout.add(500, () => {\n \n\t\tvar buf = this.view.el.get_buffer();\n\n\t\tvar sbuf = (Gtk.SourceBuffer) buf;\n\n\n\t\tGtk.TextIter iter; \n\t\tsbuf.get_iter_at_line(out iter, line);\n\t\tthis.view.el.scroll_to_iter(iter, 0.1f, true, 0.0f, 0.5f);\n\t\treturn false;\n\t}); \n}\n", diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala index ccf58ddd2..8db47873f 100644 --- a/src/Builder4/Editor.vala +++ b/src/Builder4/Editor.vala @@ -60,9 +60,18 @@ public class Editor : Object // user defined functions public Gee.ArrayList search (string txt) { - var ret = new Gee.ArrayList(); + var ret = new Gee.ArrayList(); + + var str = this.buffer.toString(); + + var lines = str.split("\n"); + for (var i = 0 ; i < lines.length; i++) { + if (lines[i].contains(txt)) { + ret.add(i); + } - return ret; + } + return ret; } public bool saveContents () { -- 2.39.2