src/Palete/Palete.vala

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

diff --git a/src/Palete/Palete.vala b/src/Palete/Palete.vala
index bf25556..44ed2e3 100644 (file)
--- a/src/Palete/Palete.vala
+++ b/src/Palete/Palete.vala
@@ -395,33 +395,32 @@ namespace Palete
                                        var lines_obj = new Json.Object();
                                        var lines_ar = new Json.Array();
                                        lines_ar.add_string_element(errmsg);
-                                       lines_obj.set_array_member(line, lines_ar);
+                                       lines_obj.set_array_member(line.to_string(), lines_ar);
                                        files_obj.set_object_member(file.filename, lines_obj);
                                         
                                        err.set_object_member("ERR", files_obj);
-                                       err.set_object_member("ERR-TOTAL", 1);
+ 
                                        state.showCompileResult(err);
                                        return ret;
                                }
-                               ret.set(line, errmsg); // depricated - this is used by the editor currently -- but we are planning to switch from taht.
+                               ret.set(line, errmsg); // depricated - this is used by the editor currently -- but we are planning to switch from that..
                                print("got  errors\n");
                                return ret;
 
                        }
+                       // now syntax is OK.. try the 
                        
-                               if (ptype == "file") {
-                                       return this.validateJavascriptCompression(code);
-                               }
-                               print("no errors\n");
-                               return ret;
+                       
+                       
+                       if (ptype == "file") {
+                                this.validateJavascriptCompression(file, state, code);
                        }
-                       ret.set(line, errmsg);
-                       print("got  errors\n");
+                       print("no errors\n");
                        return ret;
                          
                } 
                
-               public Gee.HashMap<int,string>  validateJavascriptCompression(string code)
+               public void  validateJavascriptCompression(JsRender.JsRender file, WindowState state, string code)
                {
                        // this uses the roojspacker code to try and compress the code.
                        // it should highlight errors before we actually push live the code.
@@ -435,13 +434,12 @@ namespace Palete
                        p.cleanup = false; 
                        var estr = "";
                        var ret = new Gee.HashMap<int,string>();
-                       try { 
-                               p.packFile(code, "ANONFILE","");
-                       } catch (JSDOC.TokenReaderError e) {
-                               estr = e.message;
-                       } catch (JSDOC.ScopeParserError e) {
-                               estr = e.message;
+                        
+                       p.packFile(code, file.filename,"");
+                       if (!p.hasErrors("")) {
+                               state.showCompileResult(err);
                        }
+                         
                        if (estr.length > 0 ) {
 
                                var bits = estr.split(",");