From 5c2299b2ce3bb46afc9efba113624f66d1f40e33 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 7 Jun 2016 16:36:37 +0800 Subject: [PATCH] src/Builder4/WindowRooView.bjs src/Builder4/WindowRooView.vala --- src/Builder4/WindowRooView.bjs | 2 +- src/Builder4/WindowRooView.vala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Builder4/WindowRooView.bjs b/src/Builder4/WindowRooView.bjs index aa1832a7f..ae79f7e73 100644 --- a/src/Builder4/WindowRooView.bjs +++ b/src/Builder4/WindowRooView.bjs @@ -185,7 +185,7 @@ "int error_line" : "-1", "| bool highlightErrors" : "( Gee.HashMap validate_res) {\n \n this.error_line = validate_res.size;\n\t\n if (this.error_line < 1) {\n return true;\n }\n var tlines = this.el.get_line_count ();\n Gtk.TextIter iter;\n var valiter = validate_res.map_iterator();\n while (valiter.next()) {\n \n// print(\"get inter\\n\");\n var eline = valiter.get_key();\n if (eline > tlines) {\n continue;\n }\n this.el.get_iter_at_line( out iter, eline);\n //print(\"mark line\\n\");\n this.el.create_source_mark(valiter.get_value(), \"ERR\", iter);\n } \n return false;\n}", "| string toString" : " () {\n \n Gtk.TextIter s;\n Gtk.TextIter e;\n this.el.get_start_iter(out s);\n this.el.get_end_iter(out e);\n var ret = this.el.get_text(s,e,true);\n //print(\"TO STRING? \" + ret);\n return ret;\n}\n ", - "| bool checkSyntax" : " () {\n \n \n var str = this.toString();\n \n // needed???\n if (this.error_line > 0) {\n Gtk.TextIter start;\n Gtk.TextIter end; \n this.el.get_bounds (out start, out end);\n\n this.el.remove_source_marks (start, end, null);\n }\n \n if (str.length < 1) {\n print(\"checkSyntax - empty string?\\n\");\n return true;\n }\n \n if (_this.file == null) {\n return true;\n }\n var p = Palete.factory(_this.file.xtype); // returns Roo | Gtk | PlainFile \n \n \n if (_this.file.language != \"js\") {\n\t\treturn;\n\t}\n\t\n \n\n\treturn this.highlightErrors(p.validateJavascript(\n str, \n \"\", // _this.key, \n \"file\", //_this.ptype,\n _this.file,\n null\n )); \n \n}\n", + "| bool checkSyntax" : " () {\n \n \n var str = this.toString();\n \n // needed???\n if (this.error_line > 0) {\n Gtk.TextIter start;\n Gtk.TextIter end; \n this.el.get_bounds (out start, out end);\n\n this.el.remove_source_marks (start, end, null);\n }\n \n if (str.length < 1) {\n print(\"checkSyntax - empty string?\\n\");\n return false;\n }\n \n if (_this.file == null) {\n return false;\n }\n var p = Palete.factory(_this.file.xtype); // returns Roo | Gtk | PlainFile \n \n \n if (_this.file.language != \"js\") {\n\t\treturn false; // no syntax.\n\t}\n\t\n \n\n\treturn this.highlightErrors(p.validateJavascript(\n str, \n \"\", // _this.key, \n \"file\", //_this.ptype,\n _this.file,\n null\n )); \n \n}\n", "* pack" : "set_buffer", "xtype" : "SourceBuffer", "$ xns" : "Gtk" diff --git a/src/Builder4/WindowRooView.vala b/src/Builder4/WindowRooView.vala index b63aaa772..c0e146f3f 100644 --- a/src/Builder4/WindowRooView.vala +++ b/src/Builder4/WindowRooView.vala @@ -1370,17 +1370,17 @@ public class Xcls_WindowRooView : Object if (str.length < 1) { print("checkSyntax - empty string?\n"); - return true; + return false; } if (_this.file == null) { - return true; + return false; } var p = Palete.factory(_this.file.xtype); // returns Roo | Gtk | PlainFile if (_this.file.language != "js") { - return; + return false; // no syntax. } -- 2.39.2