From: Alan Knowles <alan@roojs.com>
Date: Tue, 19 May 2015 09:36:06 +0000 (+0800)
Subject: src/Builder4/ValaCompileErrors.bjs
X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=7de496ee2ef3fbe4f123b68e3f24afb9915cbb8a

src/Builder4/ValaCompileErrors.bjs
src/Builder4/ValaCompileErrors.vala
---

diff --git a/src/Builder4/ValaCompileErrors.bjs b/src/Builder4/ValaCompileErrors.bjs
index 57f2761df..68f5b391f 100644
--- a/src/Builder4/ValaCompileErrors.bjs
+++ b/src/Builder4/ValaCompileErrors.bjs
@@ -52,7 +52,7 @@
        "items" : [
         {
          "listeners" : {
-          "button_press_event" : "  ( ev)  => {\n \n    Gtk.TreeViewColumn col;\n    int cell_x;\n    int cell_y;\n    Gtk.TreePath path;\n    if (!this.el.get_path_at_pos((int)ev.x, (int) ev.y, out path, out col, out cell_x, out cell_y )) {\n        print(\"nothing selected on click\");\n        \n        return false; //not on a element.\n    }\n    \n     \n     // right click.\n     if (ev.type != Gdk.EventType.2BUTTON_PRESS  || ev.button != 1  ) {    \n        // show popup!.   \n            \n         \n        return false;\n    }\n    Gtk.TreeIter iter;\n     var mod = _this.compile_result_store.el;\n    mod.get_iter (out iter, path);\n    \n     \n    \n    \n    \n    // var val = \"\";\n    GLib.Value value;\n    _this.compile_result_store.el.get_value(iter, 3, out value);\n    var fname = (string)value;\n    //GLib.Value lvalue;\n    //_this.compile_result_store.el.get_value(iter, 1, out lvalue);\n    //var line = (int) lvalue;\n    \n     \n     var f = fname;\n     Regex regex;\n    try {             \n        regex = new Regex(\"\\\\.vala$\");\n    } catch (GLib.RegexError e) {\n        return false;\n    }\n     \n    var bjsf = regex.replace(f,f.length , 0 , \".bjs\");\n        \n    var p = _this.window.project;\n        \n        \n        \n    var jsr = p.getByPath(bjsf);\n    if (jsr != null) {\n        _this.window.windowstate.fileViewOpen(jsr);\n        \n        return false;\n    \n    }\n     return false;\n    \n  }\n    ",
+          "button_press_event" : "  ( ev)  => {\n \n    Gtk.TreeViewColumn col;\n    int cell_x;\n    int cell_y;\n    Gtk.TreePath path;\n    if (!this.el.get_path_at_pos((int)ev.x, (int) ev.y, out path, out col, out cell_x, out cell_y )) {\n        print(\"nothing selected on click\");\n        \n        return false; //not on a element.\n    }\n    \n     \n     // right click.\n     if (ev.type != Gdk.EventType.2BUTTON_PRESS  || ev.button != 1  ) {    \n        // show popup!.   \n            \n         \n        return false;\n    }\n    Gtk.TreeIter iter;\n     var mod = _this.compile_result_store.el;\n    mod.get_iter (out iter, path);\n    \n     \n    \n    \n    \n    // var val = \"\";\n    GLib.Value value;\n    _this.compile_result_store.el.get_value(iter, 3, out value);\n    var fname = (string)value;\n    //GLib.Value lvalue;\n    //_this.compile_result_store.el.get_value(iter, 1, out lvalue);\n    //var line = (int) lvalue;\n    \n    \n   var  bjsf = \"\";\n    try {             \n       var  regex = new Regex(\"\\\\.vala$\");\n    \n     \n        bjsf = regex.replace(fname,fname.length , 0 , \".bjs\");\n     } catch (GLib.RegexError e) {\n        return false;\n    }   \n    var p = _this.window.project;\n        \n        \n        \n    var jsr = p.getByPath(bjsf);\n    if (jsr != null) {\n        _this.window.windowstate.fileViewOpen(jsr);\n        \n        return false;\n    \n    }\n     return false;\n    \n  }\n    ",
           "cursor_changed" : "() => {\n    var sel = this.el.get_selection();\n\n    if (sel.count_selected_rows() < 1) {\n\n        print(\"selected rows < 1\\n\");\n        //??this.mo \n        return  ;\n    }\n        \n        //console.log('changed');\n     \n     Gtk.TreeIter iter;\n     Gtk.TreeModel mod;\n    sel.get_selected(out mod, out iter);\n     \n    \n    \n    \n    // var val = \"\";\n    GLib.Value value;\n    _this.compile_result_store.el.get_value(iter, 3, out value);\n    var fname = (string)value;\n    GLib.Value lvalue;\n    _this.compile_result_store.el.get_value(iter, 1, out lvalue);\n    var line = (int) lvalue;\n    \n    \n    \n \n    \n    \n    print (\"loadfile %s : %d\", fname,line);\n    \n   // _this.sourceview.loadFile(fname, line);\n    /*\n        var f = _this.sourceview.curfname;\n                \n        Regex regex = new Regex(\"\\\\.vala$\");\n    \n        var bjsf = regex.replace(f,f.length , 0 , \".bjs\");\n        \n        var p = _this.window.project;\n        \n        \n        \n        var jsr = p.getByPath(bjsf);\n        if (jsr != null) {\n            _this.window.windowstate.fileViewOpen(jsr);\n            \n            return;\n        \n        }\n         */   \n            \n}\n             "
          },
          "id" : "compile_tree",
diff --git a/src/Builder4/ValaCompileErrors.vala b/src/Builder4/ValaCompileErrors.vala
index 09a1b1cbe..a1bb91741 100644
--- a/src/Builder4/ValaCompileErrors.vala
+++ b/src/Builder4/ValaCompileErrors.vala
@@ -302,17 +302,16 @@ public class Xcls_ValaCompileErrors : Object
                 //_this.compile_result_store.el.get_value(iter, 1, out lvalue);
                 //var line = (int) lvalue;
                 
-                 
-                 var f = fname;
-                 Regex regex;
+                
+               var  bjsf = "";
                 try {             
-                    regex = new Regex("\\.vala$");
-                } catch (GLib.RegexError e) {
-                    return false;
-                }
+                   var  regex = new Regex("\\.vala$");
+                
                  
-                var bjsf = regex.replace(f,f.length , 0 , ".bjs");
-                    
+                    bjsf = regex.replace(fname,fname.length , 0 , ".bjs");
+                 } catch (GLib.RegexError e) {
+                    return false;
+                }   
                 var p = _this.window.project;