src/Palete/Palete.vala

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

diff --git a/src/Palete/Palete.vala b/src/Palete/Palete.vala
index a9a3cf9..f672766 100644 (file)
--- a/src/Palete/Palete.vala
+++ b/src/Palete/Palete.vala
@@ -396,10 +396,10 @@ namespace Palete
                                        var lines_ar = new Json.Array();
                                        lines_ar.add_string_element(errmsg);
                                        lines_obj.set_array_member(line.to_string(), lines_ar);
-                                       files_obj.set_object_member(file.filename, lines_obj);
+                                       files_obj.set_object_member(file.path, lines_obj);
                                         
                                        err.set_object_member("ERR", files_obj);
-                                       err.set_object_member("ERR-TOTAL", 1);
+ 
                                        state.showCompileResult(err);
                                        return ret;
                                }
@@ -435,24 +435,8 @@ namespace Palete
                        var estr = "";
                        var ret = new Gee.HashMap<int,string>();
                         
-                       p.packFile(code, file.filename,"");
-                       if (!p.hasErrors("")) {
-                               state.showCompileResult(err);
-                       }
-                         
-                       if (estr.length > 0 ) {
-
-                               var bits = estr.split(",");
-                               if (bits.length > 2) {
-                                       var linebits = bits[1].strip().split(" ");
-                                       if (linebits.length > 1) {
-                                               var line = int.parse(linebits[1]);
-                                               // line is correct - but our standard for error messages is to do it start at '0'
-                                               ret.set(line -1 , bits[2]);
-                                       }
-                                       
-                               }
-                       }
+                       p.packFile(code, file.path,"");
+                       state.showCompileResult(p.result);
                        
                        return ret;