sync

[app.Builder.js] / src / Palete / Palete.vala

diff --git a/src/Palete/Palete.vala b/src/Palete/Palete.vala
index 7116ed4..129da08 100644 (file)
--- a/src/Palete/Palete.vala
+++ b/src/Palete/Palete.vala
@@ -324,54 +324,71 @@ namespace Palete
 
        
          
-       public Gee.HashMap<int,string>  validateCode(
+       public async Gee.HashMap<int,string>  validateVala(
                        string code, 
-                       string property, 
-                       string ptype,
-                        JsRender.JsRender file,
-                       JsRender.Node node
+                               string property, 
+                               string ptype,
+                               JsRender.JsRender file,
+                               JsRender.Node node
                      ) 
        {   
 
-               //print("validate code (%s) %s\n", file.language, code);
-                
+                print("validate code (%s) %s\n", file.language, code);
+                var ret = new Gee.HashMap<int,string>();
                
-               if (file.language == "js" && (ptype == "listener" || property[0] == '|')) {
-                       var ret = new Gee.HashMap<int,string>();
-                       
-                       //var cd = new JSCore.ClassDefinitionEmpty();
-                       string errmsg;
-                       var line = Javascript.singleton().validate(
-                                  "var __aaa___ = " + code, out errmsg);
-
-                       if (line < 0) {
-                               return ret;
-                       }
-                       ret.set(line, errmsg);
+                
+               if (file.language != "vala" ) { // not sure if we need to validate property
                        return ret;
                }
-               if (file.language == "vala" ) { // not sure if we need to validate property
+               var vs = new ValaSource(file);
+               //var cd = new JSCore.ClassDefinitionEmpty();
+                ret = yield vs.checkFileWithNodePropChange(
+                               node, 
+                               property, 
+                               ptype,
+                               code
+                );
+               return ret;
+
+       }
+       public   Gee.HashMap<int,string>  validateJavascript(
+                       string code, 
+                               string property, 
+                               string ptype,
+                               JsRender.JsRender file,
+                               JsRender.Node node
+                     ) 
+       {   
+
+                print("validate code (%s) %s\n", file.language, code);
+                var ret = new Gee.HashMap<int,string>();
+               
+               if (file.language != "js") {
+                       return ret;
+                }
+                if (ptype != "listener" && property[0] == '|') {
+                       return ret;
+                }
                        
-                       var vs = new ValaSource(file);
-                       //var cd = new JSCore.ClassDefinitionEmpty();
-                       var ret = vs.checkFileWithNodePropChange(
-                               node, 
-                                       property, 
-                                       ptype,
-                                       code
-                         );
+               //var cd = new JSCore.ClassDefinitionEmpty();
+               //print("TESTING CODE %s\n", code);
+               string errmsg;
+               var line = Javascript.singleton().validate(
+                                                         "var __aaa___ = " + code, out errmsg);
+
+               if (line < 0) {
+                       print("no errors\n");
                        return ret;
                }
-               var ret = new Gee.HashMap<int,string>();
-
-               //print ("not javascript\n");
+               ret.set(line, errmsg);
+               print("got  errors\n");
                return ret;
+                
 
        }
-
            
           
-        public abstract void fillPack(JsRender.Node node,JsRender.Node parent);
+       public abstract void fillPack(JsRender.Node node,JsRender.Node parent);
        public abstract void load();
        public abstract Gee.HashMap<string,GirObject> getPropertiesFor(string ename, string type);
        public abstract GirObject? getClass(string ename);