From f96fb46425fc0904d2c40a17189e339ef830d3e5 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 18 May 2015 18:16:18 +0800 Subject: [PATCH] src/Builder4/Editor.bjs src/Builder4/Editor.vala --- src/Builder4/Editor.bjs | 2 +- src/Builder4/Editor.vala | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs index 91a990822..8ab89f74d 100644 --- a/src/Builder4/Editor.bjs +++ b/src/Builder4/Editor.bjs @@ -89,7 +89,7 @@ "xtype" : "SourceBuffer", "bool check_running" : false, "$ xns" : "Gtk", - "| bool highlightErrorsJson" : "(Json.Object obj) {\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 \n if (obj.has_member(\"ERR-TOTAL\")) {\n\n _this.window.statusbar_errors.setNotices( obj.get_object_member(\"ERR\") , obj.get_int_member(\"ERR-TOTAL\"));\n } else {\n _this.window.statusbar_errors.setNotices( new Json.Object() , 0);\n } \n \n if (obj.has_member(\"WARN-TOTAL\")) {\n\n _this.window.statusbar_warnings.setNotices(obj.get_object_member(\"WARN\"), obj.get_int_member(\"WARN-TOTAL\"));\n } else {\n _this.window.statusbar_warnings.setNotices( new Json.Object() , 0);\n }\n if (obj.has_member(\"DEPR-TOTAL\")) {\n \n _this.window.statusbar_depricated.setNotices( obj.get_object_member(\"DEPR\"), obj.get_int_member(\"DEPR-TOTAL\"));\n// _this.window.statusbar_depricated.el.label = obj.get_int_member(\"DEPR-TOTAL\").to_string() + \" Depricated\";\n } else {\n _this.window.statusbar_depricated.setNotices( new Json.Object(),0);\n }\n \n if (!obj.has_member(\"ERR\")) {\n print(\"Return has no errors\\n\");\n return true;\n }\n var err = obj.get_object_member(\"ERR\");\n \n \n \n if (!err.has_member(_this.file.path)) {\n print(\"File path has no errors\\n\");\n return true;\n }\n\n var lines = err.get_object_member(_this.file.path);\n \n var offset = 1;\n if (obj.has_member(\"line_offset\")) {\n offset = (int)obj.get_int_member(\"line_offset\") + 1;\n }\n \n \n var tlines = this.el.get_line_count () +1;\n \n lines.foreach_member((obj, line, node) => {\n \n Gtk.TextIter iter;\n // print(\"get inter\\n\");\n var eline = int.parse(line) - offset;\n print(\"GOT ERROR on line %s -- converted to %d\\n\", line,eline);\n \n \n if (eline > tlines || eline < 0) {\n return;\n }\n this.el.get_iter_at_line( out iter, eline);\n //print(\"mark line\\n\");\n var msg = \"Line: %d\".printf(eline+1);\n var ar = lines.get_array_member(line);\n for (var i = 0 ; i < ar.get_length(); i++) {\n\t\t msg += (msg.length > 0) ? \"\\n\" : \"\";\n\t\t msg += ar.get_string_element(i);\n\t }\n \n \n this.el.create_source_mark(msg, \"error\", iter);\n } );\n return false;\n \n\n\n\n\n}\n" + "| bool highlightErrorsJson" : "(Json.Object obj) {\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 if (obj.has_member(\"ERR-TOTAL\")) {\n\n _this.window.statusbar_errors.setNotices( obj.get_object_member(\"ERR\") , (int) obj.get_int_member(\"ERR-TOTAL\"));\n } else {\n _this.window.statusbar_errors.setNotices( new Json.Object() , 0);\n } \n \n if (obj.has_member(\"WARN-TOTAL\")) {\n\n _this.window.statusbar_warnings.setNotices(obj.get_object_member(\"WARN\"), (int) obj.get_int_member(\"WARN-TOTAL\"));\n } else {\n _this.window.statusbar_warnings.setNotices( new Json.Object() , 0);\n }\n if (obj.has_member(\"DEPR-TOTAL\")) {\n \n _this.window.statusbar_depricated.setNotices( obj.get_object_member(\"DEPR\"), (int) obj.get_int_member(\"DEPR-TOTAL\"));\n// _this.window.statusbar_depricated.el.label = obj.get_int_member(\"DEPR-TOTAL\").to_string() + \" Depricated\";\n } else {\n _this.window.statusbar_depricated.setNotices( new Json.Object(),0);\n }\n \n if (!obj.has_member(\"ERR\")) {\n print(\"Return has no errors\\n\");\n return true;\n }\n var err = obj.get_object_member(\"ERR\");\n \n \n \n if (!err.has_member(_this.file.path)) {\n print(\"File path has no errors\\n\");\n return true;\n }\n\n var lines = err.get_object_member(_this.file.path);\n \n var offset = 1;\n if (obj.has_member(\"line_offset\")) {\n offset = (int)obj.get_int_member(\"line_offset\") + 1;\n }\n \n \n var tlines = this.el.get_line_count () +1;\n \n lines.foreach_member((obj, line, node) => {\n \n Gtk.TextIter iter;\n // print(\"get inter\\n\");\n var eline = int.parse(line) - offset;\n print(\"GOT ERROR on line %s -- converted to %d\\n\", line,eline);\n \n \n if (eline > tlines || eline < 0) {\n return;\n }\n this.el.get_iter_at_line( out iter, eline);\n //print(\"mark line\\n\");\n var msg = \"Line: %d\".printf(eline+1);\n var ar = lines.get_array_member(line);\n for (var i = 0 ; i < ar.get_length(); i++) {\n\t\t msg += (msg.length > 0) ? \"\\n\" : \"\";\n\t\t msg += ar.get_string_element(i);\n\t }\n \n \n this.el.create_source_mark(msg, \"error\", iter);\n } );\n return false;\n \n\n\n\n\n}\n" } ] } diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala index 3734d900c..68febd862 100644 --- a/src/Builder4/Editor.vala +++ b/src/Builder4/Editor.vala @@ -476,25 +476,23 @@ public class Editor : Object this.el.get_bounds (out start, out end); this.el.remove_source_marks (start, end, null); - - - + if (obj.has_member("ERR-TOTAL")) { - _this.window.statusbar_errors.setNotices( obj.get_object_member("ERR") , obj.get_int_member("ERR-TOTAL")); + _this.window.statusbar_errors.setNotices( obj.get_object_member("ERR") , (int) obj.get_int_member("ERR-TOTAL")); } else { _this.window.statusbar_errors.setNotices( new Json.Object() , 0); } if (obj.has_member("WARN-TOTAL")) { - _this.window.statusbar_warnings.setNotices(obj.get_object_member("WARN"), obj.get_int_member("WARN-TOTAL")); + _this.window.statusbar_warnings.setNotices(obj.get_object_member("WARN"), (int) obj.get_int_member("WARN-TOTAL")); } else { _this.window.statusbar_warnings.setNotices( new Json.Object() , 0); } if (obj.has_member("DEPR-TOTAL")) { - _this.window.statusbar_depricated.setNotices( obj.get_object_member("DEPR"), obj.get_int_member("DEPR-TOTAL")); + _this.window.statusbar_depricated.setNotices( obj.get_object_member("DEPR"), (int) obj.get_int_member("DEPR-TOTAL")); // _this.window.statusbar_depricated.el.label = obj.get_int_member("DEPR-TOTAL").to_string() + " Depricated"; } else { _this.window.statusbar_depricated.setNotices( new Json.Object(),0); -- 2.39.2