JsRender/Gtk.vala.c

JsRender/JsRender.vala.c
JsRender/Lang.vala.c
JsRender/Node.vala.c
JsRender/NodeToGlade.vala.c
JsRender/NodeToGtk.vala.c
JsRender/NodeToJs.vala.c
JsRender/NodeToVala.vala.c
JsRender/Roo.vala.c
Project/Gtk.vala.c
Project/Project.vala.c
Project/Roo.vala.c
Palete/Gir.vala.c
Palete/Gtk.vala.c
Palete/Javascript.vala.c
Palete/Palete.vala.c
Palete/Roo.vala.c
Palete/ValaSource.vala.c
Builder4/Application.vala.c
Builder4/About.vala.c
Builder4/DialogConfirm.vala.c
Builder4/DialogNewComponent.vala.c
Builder4/StandardErrorDialog.vala.c
Builder4/DialogSaveTemplate.vala.c
Builder4/DialogSaveModule.vala.c
Builder4/DialogTemplateSelect.vala.c
Builder4/EditProject.vala.c
Builder4/Editor.vala.c
Builder4/ProjectSettings.vala.c
Builder4/WindowRightPalete.vala.c
Builder4/WindowLeftTree.vala.c
Builder4/WindowRooView.vala.c
Builder4/WindowLeftProps.vala.c
Builder4/ClutterFiles.vala.c
Builder4/WindowLeftProjects.vala.c
Builder4/WindowAddProp.vala.c
Builder4/GtkView.vala.c
Builder4/MainWindow.vala.c
Builder4/Main.vala.c

diff --git a/Builder4/Editor.bjs b/Builder4/Editor.bjs
index 7e9218a..9c3d7e9 100644 (file)
--- a/Builder4/Editor.bjs
+++ b/Builder4/Editor.bjs
@@ -80,7 +80,7 @@
                                     "id" : "buffer",
                                     "int error_line" : "-1",
                                     "|   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    var p = Palete.factory(_this.file.xtype);   \n    \n    var str = this.toString();\n    \n    string res = \"\";\n    \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    \n    var validate_res =  p.validateCode(\n        str, \n         _this.key, \n        _this.ptype,\n        _this.file,\n        _this.node\n        \n    );\n     \n    this.error_line = validate_res.size;\n\n    if (this.error_line < 1) {\n          return true;\n    }\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        \n        this.el.get_iter_at_line( out iter, eline);\n        print(\"mark line\\n\");\n        this.el.create_source_mark(valiter.get_value(), \"error\", iter);\n    }   \n    \n    print(\"done mark line\\n\");\n     \n    return true; // at present allow saving - even if it's invalid..\n}\n",
+                                    "|   bool checkSyntax" : " () {\n \n    var p = Palete.factory(_this.file.xtype);   \n    \n    var str = this.toString();\n    \n    string res = \"\";\n    \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    \n    var validate_res =  p.validateCode(\n        str, \n         _this.key, \n        _this.ptype,\n        _this.file,\n        _this.node\n        \n    );\n     \n    this.error_line = validate_res.size;\n\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(), \"error\", iter);\n    }   \n    \n    //print(\"done mark line\\n\");\n     \n    return true; // at present allow saving - even if it's invalid..\n}\n",
                                     "* pack" : "set_buffer",
                                     "xtype" : "Buffer",
                                     "$ xns" : "GtkSource"

diff --git a/Builder4/Editor.vala b/Builder4/Editor.vala
index be4de65..454d717 100644 (file)
--- a/Builder4/Editor.vala
+++ b/Builder4/Editor.vala
@@ -398,19 +398,22 @@ public class Editor : Object
             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");
+        //        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");
+                //print("mark line\n");
                 this.el.create_source_mark(valiter.get_value(), "error", iter);
             }   
             
-            print("done mark line\n");
+            //print("done mark line\n");
              
             return true; // at present allow saving - even if it's invalid..
         }