Builder4/Editor.bjs.JE7FMX

Builder4/Editor.bjs
Builder4/Editor.vala
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
Builder4/Application.vala.c
tests/JsCoreTest.vala.c

diff --git a/Builder4/Editor.bjs b/Builder4/Editor.bjs
index cbec3c9..c50ff9d 100644 (file)
--- a/Builder4/Editor.bjs
+++ b/Builder4/Editor.bjs
@@ -77,7 +77,7 @@
                                     },
                                     "id" : "buffer",
                                     "|   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    \n    p.validateCode(\n        str, \n        ptype == \"listener\" ? \"| function \" : key, \n        file.language, \n        out res\n    );\n    \n    \n    \n \n /*\n    var str = this.toString();\n    var res = \"\";\n    /*\n    try {\n      //  print('var res = ' + str);\n        Seed.check_syntax('var res = ' + str);\n        \n       \n    } catch (e) {\n        \n        this.get('/RightEditor.view').el.modify_base(Gtk.StateType.NORMAL, new Gdk.Color({\n            red: 0xFFFF, green: 0xCCCC , blue : 0xCCCC\n           }));\n        print(\"SYNTAX ERROR IN EDITOR\");   \n        print(e);\n        // print(str);\n        //console.dump(e);\n        return false;\n    }\n     this.get('/RightEditor.view').el.modify_base(Gtk.StateType.NORMAL, new Gdk.Color({\n        red: 0xFFFF, green: 0xFFFF , blue : 0xFFFF\n       }));\n    */\n    return true;\n}\n",
+                                    "|   bool checkSyntax" : " () {\n \n    var p = Palete.factory(this.file.xtype);   \n    \n    var str = this.toString();\n    \n    string res = \"\";\n    Gdk.Color white;\n    Gdk.Color.parse(\"#fffff\", white);\n    this.view.el.modify_base(\n            Gtk.StateType.NORMAL, \n             white\n     );\n    \n    var line =  p.validateCode(\n        str, \n        ptype == \"listener\" ? \"| function \" : key, \n        file.language, \n        out res\n    );\n    if (line < 0) {\n    \n    \n        return true;\n    }\n    Gdk.Color pink;\n    Gdk.Color.parse(\"#ffcccc\", pink);\n    \n    \n    \n    this.view.el.modify_base(\n        Gtk.StateType.NORMAL, \n         pink\n     );\n    return false;\n}\n",
                                     "* pack" : "set_buffer",
                                     "xtype" : "Buffer",
                                     "$ xns" : "GtkSource"

diff --git a/Builder4/Editor.vala b/Builder4/Editor.vala
index 8bf0bb3..8aded68 100644 (file)
--- a/Builder4/Editor.vala
+++ b/Builder4/Editor.vala
@@ -354,43 +354,34 @@ public class Editor : Object
             var str = this.toString();
             
             string res = "";
+            Gdk.Color white;
+            Gdk.Color.parse("#fffff", white);
+            this.view.el.modify_base(
+                    Gtk.StateType.NORMAL, 
+                     white
+             );
             
-            
-            p.validateCode(
+            var line =  p.validateCode(
                 str, 
                 ptype == "listener" ? "| function " : key, 
                 file.language, 
                 out res
             );
+            if (line < 0) {
             
             
-            
-         
-         /*
-            var str = this.toString();
-            var res = "";
-            /*
-            try {
-              //  print('var res = ' + str);
-                Seed.check_syntax('var res = ' + str);
-                
-               
-            } catch (e) {
-                
-                this.get('/RightEditor.view').el.modify_base(Gtk.StateType.NORMAL, new Gdk.Color({
-                    red: 0xFFFF, green: 0xCCCC , blue : 0xCCCC
-                   }));
-                print("SYNTAX ERROR IN EDITOR");   
-                print(e);
-                // print(str);
-                //console.dump(e);
-                return false;
+                return true;
             }
-             this.get('/RightEditor.view').el.modify_base(Gtk.StateType.NORMAL, new Gdk.Color({
-                red: 0xFFFF, green: 0xFFFF , blue : 0xFFFF
-               }));
-            */
-            return true;
+            Gdk.Color pink;
+            Gdk.Color.parse("#ffcccc", pink);
+            
+            
+            
+            this.view.el.modify_base(
+                Gtk.StateType.NORMAL, 
+                 pink
+             );
+            return false;
         }
     }
 }