X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=src%2FBuilder4%2FWindowRooView.vala;h=4582600330ef9e82d0d71fc10544b9f18c57b1f5;hp=42defa2d2d7791c23a21f67113c2f7d3706c0f22;hb=26980b815cd4686adba075775bc47ae9eabede08;hpb=33778ac75586506b6d17c26f49287c814d63d4a1 diff --git a/src/Builder4/WindowRooView.vala b/src/Builder4/WindowRooView.vala index 42defa2d2..458260033 100644 --- a/src/Builder4/WindowRooView.vala +++ b/src/Builder4/WindowRooView.vala @@ -933,7 +933,8 @@ public class Xcls_WindowRooView : Object // my vars (def) public bool loading; public bool allow_node_scroll; - public string propSelected; + public string prop_selected; + public JsRender.Node? node_selected; // ctor public Xcls_sourceview(Xcls_WindowRooView _owner ) @@ -945,7 +946,8 @@ public class Xcls_WindowRooView : Object // my vars (dec) this.loading = true; this.allow_node_scroll = true; - this.propSelected = ""; + this.prop_selected = ""; + this.node_selected = null; // set gobject values this.el.editable = false; @@ -1029,6 +1031,10 @@ public class Xcls_WindowRooView : Object return false; }); + this.el.key_press_event.connect( () => { + this.onCursorChanged(); + return false; + }); } // user defined functions @@ -1059,7 +1065,7 @@ public class Xcls_WindowRooView : Object - + // ---------- this selects the tree's node... var ltree = _this.main_window.windowstate.left_tree; var tp = ltree.model.treePathFromNode(node); @@ -1074,7 +1080,7 @@ public class Xcls_WindowRooView : Object // let's try allowing editing on the methods. // a little klunky at present.. - this.propSelected = ""; + this.prop_selected = ""; if (prop != null) { //see if we can find it.. var kv = prop.split(":"); @@ -1082,10 +1088,10 @@ public class Xcls_WindowRooView : Object //var k = prop.get_key(kv[1]); // fixme -- need to determine if it's an editable property... - this.propSelected = prop; + this.prop_selected = prop; } else if (kv[0] == "l") { - this.propSelected = prop; + this.prop_selected = prop; } } @@ -1102,23 +1108,10 @@ public class Xcls_WindowRooView : Object // highlight the node.. } - public void nodeSelected (JsRender.Node? sel, bool scroll ) { - + public void clearGreySelection () { + // clear all the marks.. + var sbuf = (Gtk.SourceBuffer)this.el.buffer; - - // this is connected in widnowstate - print("node selected\n"); - var buf = this.el.get_buffer(); - - var sbuf = (Gtk.SourceBuffer) buf; - - - while(Gtk.events_pending()) { - Gtk.main_iteration(); - } - - - // clear all the marks.. Gtk.TextIter start; Gtk.TextIter end; @@ -1126,75 +1119,25 @@ public class Xcls_WindowRooView : Object sbuf.remove_source_marks (start, end, "grey"); - if (sel == null) { - print("no selected node\n"); - // no highlighting.. - return; - } - - print("highlight region %d to %d\n", sel.line_start,sel.line_end); - Gtk.TextIter iter; - sbuf.get_iter_at_line(out iter, sel.line_start); - - - Gtk.TextIter cur_iter; - sbuf.get_iter_at_offset(out cur_iter, sbuf.cursor_position); - - //var cur_line = cur_iter.get_line(); - //if (cur_line > sel.line_start && cur_line < sel.line_end) { - - //} else { - if (scroll) { - - this.el.scroll_to_iter(iter, 0.1f, true, 0.0f, 0.5f); - } - - var start_line = sel.line_start; - var end_line = sel.line_end; - + } + public void nodeSelected (JsRender.Node? sel, bool scroll ) { + - this.el.editable = false; - // now if we have selected a property... - if (this.propSelected.length> 0 ) { + + // this is connected in widnowstate - int nstart, nend; - if (sel.getPropertyRange(this.propSelected, out nstart, out nend) && nend > nstart) { - start_line = nstart; - end_line = nend; - this.el.editable = true; - } - print("propSelected = %s range %d -> %d\n", this.propSelected, start_line, end_line); - - - } - - // 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; - } - + + // not sure why.... + while(Gtk.events_pending()) { + Gtk.main_iteration(); } + this.node_selected = sel; + this.updateGreySelection(scroll); - for (var i = 0; i < buf.get_line_count();i++) { - if (i < (start_line -1) || i > (end_line -1)) { - - sbuf.get_iter_at_line(out iter, i); - sbuf.create_source_mark(null, "grey", iter); - - } - - } - } public string toString () { Gtk.TextIter s; @@ -1250,86 +1193,162 @@ public class Xcls_WindowRooView : Object sbuf.remove_source_marks (start, end, null); // remove all marks.. GLib.Timeout.add(500, () => { - - print("RESORTING cursor to = %d\n", cpos); + + 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"); - return ; + public void updateGreySelection (bool scroll) { + var sel = this.node_selected; + print("node selected\n"); + var buf = this.el.get_buffer(); + var sbuf = (Gtk.SourceBuffer) buf; + + + this.clearGreySelection(); + + + + if (sel == null) { + print("no selected node\n"); + // no highlighting.. + 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$"); - - - valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala"); - } catch (GLib.RegexError e) { - return; - } + print("highlight region %d to %d\n", sel.line_start,sel.line_end); + Gtk.TextIter iter; + sbuf.get_iter_at_line(out iter, sel.line_start); + + + 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 (scroll) { + print("scrolling to node -- should occur on node picking.\n"); + this.el.scroll_to_iter(iter, 0.1f, true, 0.0f, 0.5f); + } + + var start_line = sel.line_start; + var end_line = sel.line_end; + + + this.el.editable = false; + + var colon_pos = 0; + + // now if we have selected a property... + if (this.prop_selected.length> 0 ) { - if (!err.has_member(valafn)) { - print("File path has no errors\n"); - return ; + int nstart, nend; + if (sel.getPropertyRange(this.prop_selected, out nstart, out nend) && nend > nstart) { + 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(":") + 1; + } + 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.prop_selected, start_line, end_line); + + } - var lines = err.get_object_member(valafn); - + print("checking selection\n"); - var tlines = buf.get_line_count () +1; - 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); - } - + // 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)) { + + sbuf.get_iter_at_line(out iter, i); + sbuf.create_source_mark(null, "grey", iter); - sbuf.create_source_mark(msg, type, iter); - } ); + } + + } + if (scroll) { + Gtk.TextIter cpos_iter; + buf.get_iter_at_line(out cpos_iter, start_line); + buf.place_cursor(cpos_iter); + } + + + } + public void highlightErrorsJson (string type, Json.Object obj) { + // this is a hook for the vala code - it has no value in javascript + // as we only have one error ususally.... return ; @@ -1344,10 +1363,8 @@ public class Xcls_WindowRooView : Object // my vars (def) - public bool check_queued; public bool dirty; public int error_line; - public bool check_running; // ctor public Xcls_buffer(Xcls_WindowRooView _owner ) @@ -1357,10 +1374,8 @@ public class Xcls_WindowRooView : Object this.el = new Gtk.SourceBuffer( null ); // my vars (dec) - this.check_queued = false; this.dirty = false; this.error_line = -1; - this.check_running = false; // set gobject values @@ -1370,12 +1385,21 @@ public class Xcls_WindowRooView : Object // ??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; + } - - //this.checkSyntax(); + // what are we editing?? - this.dirty = true; + + return ; @@ -1383,6 +1407,29 @@ public class Xcls_WindowRooView : Object } // user defined functions + public bool highlightErrors ( Gee.HashMap validate_res) { + + this.error_line = validate_res.size; + + if (this.error_line < 1) { + return true; + } + 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; @@ -1395,24 +1442,7 @@ public class Xcls_WindowRooView : Object } public bool checkSyntax () { - if (this.check_running) { - print("Check is running\n"); - if (this.check_queued) { - print("Check is already queued"); - return true; - } - this.check_queued = true; - print("Adding queued Check "); - GLib.Timeout.add_seconds(1, () => { - this.check_queued = false; - - this.checkSyntax(); - return false; - }); - - - return true; - } + var str = this.toString(); // needed??? @@ -1423,69 +1453,33 @@ public class Xcls_WindowRooView : Object this.el.remove_source_marks (start, end, null); } + if (str.length < 1) { print("checkSyntax - empty string?\n"); - return true; + return false; } - if (_this.file.xtype == "PlainFile") { - - // assume it's gtk... - this.check_running = true; - /* - if (!_this.window.windowstate.valasource.checkPlainFileSpawn( - _this.file, - str - )) { - this.check_running = false; - } - */ - return true; - - } if (_this.file == null) { - return true; + return false; } - var p = Palete.factory(_this.file.xtype); + var p = Palete.factory(_this.file.xtype); // returns Roo | Gtk | PlainFile - - - this.check_running = true; - - - if (_this.file.language == "js") { - this.check_running = false; - print("calling validate javascript\n"); - /* return this.highlightErrors(p.validateJavascript( - str, - _this.key, - _this.ptype, - _this.file, - _this.node - )); - */ - } - - - print("calling validate vala\n"); - // clear the buttons. - /* - if (! _this.window.windowstate.valasource.checkFileWithNodePropChange( - _this.file, - _this.node, - _this.key, - _this.ptype, - str - )) { - this.check_running = false; - } - - */ - - //print("done mark line\n"); + if (_this.file.language != "js") { + return false; // fake syntax error. + } + + //Gee.HashMap ret_x; + + return p.javascriptHasErrors( + _this.main_window.windowstate, + str, + "", // _this.key, + "file", //_this.ptype, + _this.file, + null + ); - return true; // at present allow saving - even if it's invalid.. } }