X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=src%2FBuilder4%2FEditor.vala;h=3b4d09b35fc314225ef90606782422ebe4a4fda0;hp=a4ed0d58a365b6704d542dd08f92b8e2af60545c;hb=fc49f865ff0b406b1fb2313e84cf3edb8536727b;hpb=121e9063612522d9b62098c8da2d8a1b075a375f diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala index a4ed0d58a..3b4d09b35 100644 --- a/src/Builder4/Editor.vala +++ b/src/Builder4/Editor.vala @@ -24,7 +24,9 @@ public class Editor : Object public int pos_root_x; public int pos_root_y; public string ptype; + public int last_search_end; public string key; + public Gtk.SourceSearchContext searchcontext; public JsRender.JsRender file; public bool pos; public bool dirty; @@ -41,7 +43,9 @@ public class Editor : Object this.window = null; this.activeEditor = ""; this.ptype = ""; + this.last_search_end = 0; this.key = ""; + this.searchcontext = null; this.file = null; this.pos = false; this.dirty = false; @@ -59,29 +63,6 @@ public class Editor : Object } // user defined functions - public Gee.ArrayList search (string txt) { - - var s = new Gtk.SourceSearchSettings(); - - var sctx = new Gtk.SourceSearchContext(this.buffer,s); - sctx.set_highlight(true); - s.set_search_text(txt); - - - - 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; - } public bool saveContents () { @@ -135,6 +116,25 @@ public class Editor : Object this.view.el.scroll_to_iter(iter, 0.1f, true, 0.0f, 0.5f); return false; }); + } + public int search (string txt) { + + var s = new Gtk.SourceSearchSettings(); + + this.searchcontext = new Gtk.SourceSearchContext(this.buffer.el,s); + this.searchcontext .set_highlight(true); + s.set_search_text(txt); + Gtk.TextIter beg, st,en; + + this.buffer.el.get_start_iter(out beg); + this.searchcontext.forward(beg, out st, out en); + this.last_search_end = 0; + + return this.searchcontext.get_occurrences_count(); + + + + } public void show (JsRender.JsRender file, JsRender.Node? node, string ptype, string key) { @@ -142,7 +142,7 @@ public class Editor : Object this.ptype = ""; this.key = ""; this.node = null; - + this.searchcontext = null; if (file.xtype != "PlainFile") { @@ -167,6 +167,28 @@ public class Editor : Object } + } + public void forwardSearch (bool change_focus) { + + if (this.searchcontext == null) { + return; + } + + Gtk.TextIter beg, st,en; + + this.buffer.el.get_iter_at_offset(out beg, this.last_search_end); + if (!this.searchcontext.forward(beg, out st, out en)) { + + this.last_search_end = 0; + } else { + this.last_search_end = en.get_offset(); + if (change_focus) { + this.view.el.grab_focus(); + } + this.buffer.el.place_cursor(st); + this.view.el.scroll_to_iter(st, 0.1f, true, 0.0f, 0.5f); + } + } public class Xcls_Box2 : Object { @@ -312,10 +334,13 @@ public class Editor : Object var description = Pango.FontDescription.from_string("monospace"); description.set_size(8000); + this.el.override_font(description); + + try { + this.el.completion.add_provider(new Palete.CompletionProvider(_this)); + } catch (GLib.Error e) {} - - this.el.completion.add_provider(new Palete.CompletionProvider(_this)); this.el.completion.unblock_interactive(); this.el.completion.select_on_show = true; // select this.el.completion.show_headers = false; @@ -525,7 +550,7 @@ public class Editor : Object // assume it's gtk... this.check_running = true; - + if (!_this.window.windowstate.valasource.checkPlainFileSpawn( _this.file, str @@ -549,13 +574,17 @@ public class Editor : Object if (_this.file.language == "js") { this.check_running = false; print("calling validate javascript\n"); - return this.highlightErrors(p.validateJavascript( + Gee.HashMap errors; + p.javascriptHasErrors( + _this.window.windowstate, str, _this.key, _this.ptype, _this.file, - _this.node - )); + + out errors + ); + return this.highlightErrors(errors); }