X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=src%2FBuilder4%2FWindowRooView.vala;h=6906c4176196359295c9135fa34b7051ba69fe2d;hb=6b47d4fc5bda7c979e3860e27bbd54bf211574b8;hp=134323208efd010973be298663aa716819fc46aa;hpb=9faef60022b56a80929b9391bc18ae69684750e3;p=app.Builder.js diff --git a/src/Builder4/WindowRooView.vala b/src/Builder4/WindowRooView.vala index 134323208..6906c4176 100644 --- a/src/Builder4/WindowRooView.vala +++ b/src/Builder4/WindowRooView.vala @@ -22,6 +22,7 @@ public class Xcls_WindowRooView : Object public Xcls_view view; public Xcls_inspectorcontainer inspectorcontainer; public Xcls_sourceview sourceview; + public Xcls_buffer buffer; // my vars (def) public Gtk.Widget lastObj; @@ -932,6 +933,7 @@ public class Xcls_WindowRooView : Object // my vars (def) public bool loading; public bool allow_node_scroll; + public JsRender.Node? node; public string propSelected; // ctor @@ -944,12 +946,16 @@ public class Xcls_WindowRooView : Object // my vars (dec) this.loading = true; this.allow_node_scroll = true; + this.node = null; this.propSelected = ""; // set gobject values this.el.editable = false; this.el.show_line_marks = true; this.el.show_line_numbers = true; + var child_0 = new Xcls_buffer( _this ); + child_0.ref(); + this.el.set_buffer ( child_0.el ); // init method @@ -1053,6 +1059,10 @@ public class Xcls_WindowRooView : Object print("prop : %s", prop == null ? "???" : prop); + + + + var ltree = _this.main_window.windowstate.left_tree; var tp = ltree.model.treePathFromNode(node); print("got tree path %s\n", tp); @@ -1083,7 +1093,7 @@ public class Xcls_WindowRooView : Object } ltree.view.setCursor(tp, "editor"); // ltree.view.el.set_cursor(new Gtk.TreePath.from_string(tp), null, false); - + this.nodeSelected(node,false); // scrolling is disabled... as node selection calls scroll 10ms after it changes. GLib.Timeout.add_full(GLib.Priority.DEFAULT,100 , () => { @@ -1094,21 +1104,23 @@ public class Xcls_WindowRooView : Object // highlight the node.. } - public void nodeSelected (JsRender.Node? sel) { + public void nodeSelected (JsRender.Node? sel, bool scroll ) { - + // this is connected in widnowstate - print("node selected\n"); - var buf = this.el.get_buffer(); - - var sbuf = (Gtk.SourceBuffer) buf; - + + // not sure why.... while(Gtk.events_pending()) { Gtk.main_iteration(); } + + print("node selected\n"); + var buf = this.el.get_buffer(); + var sbuf = (Gtk.SourceBuffer) buf; + // clear all the marks.. Gtk.TextIter start; @@ -1131,13 +1143,16 @@ public class Xcls_WindowRooView : Object Gtk.TextIter cur_iter; sbuf.get_iter_at_offset(out cur_iter, sbuf.cursor_position); + + var cursor_at_line = cur_iter.get_line(); + //var cur_line = cur_iter.get_line(); //if (cur_line > sel.line_start && cur_line < sel.line_end) { //} else { - if (this.allow_node_scroll) { - + if (scroll) { + print("scrolling to node -- should occur on node picking.\n"); this.el.scroll_to_iter(iter, 0.1f, true, 0.0f, 0.5f); } @@ -1146,6 +1161,9 @@ public class Xcls_WindowRooView : Object this.el.editable = false; + + var colon_pos = 0; + // now if we have selected a property... if (this.propSelected.length> 0 ) { @@ -1154,14 +1172,70 @@ public class Xcls_WindowRooView : Object start_line = nstart; end_line = nend; this.el.editable = true; + print("start line = %d, end line = %d\n", start_line, end_line); + + // see if we are 'right of ':' + // get an iter for the start of the line. + Gtk.TextIter start_line_iter,end_line_iter; + this.el.buffer.get_iter_at_line(out start_line_iter, start_line -1); + this.el.buffer.get_iter_at_line(out end_line_iter, start_line -1); + + + + + if (end_line_iter.forward_to_line_end()) { + var first_line = this.el.buffer.get_text(start_line_iter, end_line_iter, false); + print("first line = %s\n", first_line); + if (first_line.contains(":")) { + colon_pos = start_line_iter.get_offset() + first_line.index_of(":"); + } + print("colon_pos = %d\n", colon_pos); + } + print("is cursor at line? %d ?= %d\n", start_line -1 , cursor_at_line); + if (start_line - 1 == cursor_at_line) { + print("cursor is on current line.\n"); + var before_cursor_string = this.el.buffer.get_text(start_line_iter, cur_iter, false); + print("before cursor string = %s\n", before_cursor_string); + if (!before_cursor_string.contains(":")) { + this.el.editable = false; + } + + } + + } - print("propSelected = %s range %d -> %d\n", this.propSelected, nstart, nend); + print("propSelected = %s range %d -> %d\n", this.propSelected, start_line, end_line); + + + } + + print("checking selection\n"); + + + // check selection - if it's out of 'bounds' + if (this.el.editable && sbuf.get_has_selection()) { + Gtk.TextIter sel_start_iter, sel_end_iter; + sbuf.get_selection_bounds(out sel_start_iter, out sel_end_iter); + if (sel_start_iter.get_line() < start_line || sel_end_iter.get_line() > end_line || + sel_start_iter.get_line() > end_line || sel_end_iter.get_line() < start_line ) { + // save? + this.el.editable = false; + } + if (colon_pos > 0 && + (sel_start_iter.get_offset() < colon_pos || sel_end_iter.get_offset() < colon_pos) + + ) { + this.el.editable = false; + } + + } + for (var i = 0; i < buf.get_line_count();i++) { if (i < (start_line -1) || i > (end_line -1)) { @@ -1185,7 +1259,18 @@ public class Xcls_WindowRooView : Object } public void loadFile ( ) { this.loading = true; + + + // get the cursor and scroll position.... var buf = this.el.get_buffer(); + var cpos = buf.cursor_position; + + print("BEFORE LOAD cursor = %d\n", cpos); + + var vadj_pos = this.el.get_vadjustment().get_value(); + + + buf.set_text("",0); var sbuf = (Gtk.SourceBuffer) buf; @@ -1216,86 +1301,159 @@ public class Xcls_WindowRooView : Object sbuf.get_bounds (out start, out end); sbuf.remove_source_marks (start, end, null); // remove all marks.. - - - + GLib.Timeout.add(500, () => { + + print("RESORTING cursor to = %d\n", cpos); + Gtk.TextIter cpos_iter; + buf.get_iter_at_offset(out cpos_iter, cpos); + buf.place_cursor(cpos_iter); + + this.el.get_vadjustment().set_value(vadj_pos);; + this.onCursorChanged(); + _this.buffer.checkSyntax(); + return false; + }); + this.loading = false; + _this.buffer.dirty = false; } public void highlightErrorsJson (string type, Json.Object obj) { - Gtk.TextIter start; - Gtk.TextIter end; - - var buf = this.el.get_buffer(); - var sbuf = (Gtk.SourceBuffer)buf; - buf.get_bounds (out start, out end); - - sbuf.remove_source_marks (start, end, type); - - - // we should highlight other types of errors.. - - if (!obj.has_member(type)) { - print("Return has no errors\n"); + // this is a hook for the vala code - it has no value in javascript + // as we only have one error ususally.... return ; - } - var err = obj.get_object_member(type); - if (_this.file == null) { - return; // just in case the file has not loaded yet? - } - var valafn = ""; - try { - var regex = new Regex("\\.bjs$"); + + } + } + public class Xcls_buffer : Object + { + public Gtk.SourceBuffer el; + private Xcls_WindowRooView _this; + + + // my vars (def) + public bool dirty; + public int error_line; + + // ctor + public Xcls_buffer(Xcls_WindowRooView _owner ) + { + _this = _owner; + _this.buffer = this; + this.el = new Gtk.SourceBuffer( null ); + + // my vars (dec) + this.dirty = false; + this.error_line = -1; + + // set gobject values + + //listeners + this.el.changed.connect( () => { + // check syntax?? + // ??needed..?? + // _this.save_button.el.sensitive = true; + ///?? has changed occured during loading? + if (_this.sourceview.loading) { + return; + } + + print("- PREVIEW EDITOR CHANGED--"); + this.dirty = true; + if (!this.checkSyntax()) { + return; + } + + // what are we editing?? + + + + + + return ; + }); + } + + // user defined functions + public bool highlightErrors ( Gee.HashMap validate_res) { - valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala"); - } catch (GLib.RegexError e) { - return; - } - - if (!err.has_member(valafn)) { - print("File path has no errors\n"); - return ; + this.error_line = validate_res.size; + + if (this.error_line < 1) { + return true; } - var lines = err.get_object_member(valafn); + var tlines = this.el.get_line_count (); + Gtk.TextIter iter; + var valiter = validate_res.map_iterator(); + while (valiter.next()) { + // print("get inter\n"); + var eline = valiter.get_key(); + if (eline > tlines) { + continue; + } + this.el.get_iter_at_line( out iter, eline); + //print("mark line\n"); + this.el.create_source_mark(valiter.get_value(), "ERR", iter); + } + return false; + } + public string toString () { + + Gtk.TextIter s; + Gtk.TextIter e; + this.el.get_start_iter(out s); + this.el.get_end_iter(out e); + var ret = this.el.get_text(s,e,true); + //print("TO STRING? " + ret); + return ret; + } + public bool checkSyntax () { + + var str = this.toString(); - var tlines = buf.get_line_count () +1; + // needed??? + if (this.error_line > 0) { + Gtk.TextIter start; + Gtk.TextIter end; + this.el.get_bounds (out start, out end); + + this.el.remove_source_marks (start, end, null); + } - lines.foreach_member((obj, line, node) => { - - Gtk.TextIter iter; - // print("get inter\n"); - var eline = int.parse(line) -1 ; - print("GOT ERROR on line %s -- converted to %d\n", line,eline); - - - if (eline > tlines || eline < 0) { - return; - } - sbuf.get_iter_at_line( out iter, eline); - //print("mark line\n"); - var msg = type + " on line: %d - %s".printf(eline+1, valafn); - var ar = lines.get_array_member(line); - for (var i = 0 ; i < ar.get_length(); i++) { - msg += (msg.length > 0) ? "\n" : ""; - msg += ar.get_string_element(i); - } - - - sbuf.create_source_mark(msg, type, iter); - } ); - return ; + if (str.length < 1) { + print("checkSyntax - empty string?\n"); + return false; + } + + if (_this.file == null) { + return false; + } + var p = Palete.factory(_this.file.xtype); // returns Roo | Gtk | PlainFile + if (_this.file.language != "js") { + return false; // fake syntax error. + } + + - + return this.highlightErrors(p.validateJavascript( + str, + "", // _this.key, + "file", //_this.ptype, + _this.file, + null + )); + } } + }