src/Builder4/Editor.bjs
[app.Builder.js] / src / Builder4 / Editor.vala
index 7037b7e..20dae92 100644 (file)
@@ -24,7 +24,6 @@ public class Editor : Object
     public int pos_root_x;
     public int pos_root_y;
     public string ptype;
-    public string fname;
     public string key;
     public JsRender.JsRender file;
     public bool pos;
@@ -42,7 +41,6 @@ public class Editor : Object
         this.window = null;
         this.activeEditor = "";
         this.ptype = "";
-        this.fname = "";
         this.key = "";
         this.file = null;
         this.pos = false;
@@ -51,6 +49,7 @@ public class Editor : Object
 
         // set gobject values
         this.el.homogeneous = false;
+        this.el.hexpand = true;
         var child_0 = new Xcls_Box2( _this );
         child_0.ref();
         this.el.pack_start (  child_0.el , false,true );
@@ -68,37 +67,30 @@ public class Editor : Object
         }
         
         
-        
-        
+       
        
          
          var str = _this.buffer.toString();
          
-          
+         _this.buffer.checkSyntax();
          
          
-         if (!_this.buffer.checkSyntax()) {
-             print("check syntax failed");
-             //this.get('/StandardErrorDialog').show("Fix errors in code and save.."); 
-             //return false;
-         }
          
          // LeftPanel.model.changed(  str , false);
          _this.dirty = false;
          _this.save_button.el.sensitive = false;
          
-         
-            
-         
         // find the text for the node..
-        if (ptype == "listener") {
-            this.node.listeners.set(key,str);
-        
+        if (_this.file.xtype != "PlainFile") {
+            if (ptype == "listener") {
+                this.node.listeners.set(key,str);
+            
+            } else {
+                 this.node.props.set(key,str);
+            }
         } else {
-             this.node.props.set(key,str);
-        }
-    
-         
+            _this.file.setSource(  str );
+         }
         
         // call the signal..
         this.save();
@@ -106,42 +98,52 @@ public class Editor : Object
         return true;
     
     }
-    public void showPlainFile (string fname)
+    public void scroll_to_line (int line) {
+    
+       GLib.Timeout.add(1000, () => {
+       
+               var buf = this.view.el.get_buffer();
+    
+               var sbuf = (Gtk.SourceBuffer) buf;
+    
+    
+               Gtk.TextIter iter;   
+               sbuf.get_iter_at_line(out iter,  line);
+               this.view.el.scroll_to_iter(iter,  0.1f, true, 0.0f, 0.0f);
+               return false;
+       });   
+    }
+    public   void show (JsRender.JsRender file, JsRender.Node? node, string ptype, string key)
     {
+        this.file = file;    
         this.ptype = "";
         this.key  = "";
         this.node = null;
-        this.file = null;
-        this.fname = fname;
-        string str;
-        try {
-            GLib.FileUtils.get_contents(fname, out str);
-        } catch (Error e) {
-            str = ""; // a tad dangerios... - perhaps we should block editing...
-        }
-        
-        this.view.load(str);
-        this.key_edit.el.text = "";    
     
-    }
-    public   void show (JsRender.JsRender file, JsRender.Node node, string ptype, string key)
-    {
-        this.ptype = ptype;
-        this.key  = key;
-        this.node = node;
-        this.file = file;
         
-       string val = "";
-        // find the text for the node..
-        if (ptype == "listener") {
-            val = node.listeners.get(key);
+        if (file.xtype != "PlainFile") {
+        
+            this.ptype = ptype;
+            this.key  = key;
+            this.node = node;
+             string val = "";
+            // find the text for the node..
+            if (ptype == "listener") {
+                val = node.listeners.get(key);
+            
+            } else {
+                val = node.props.get(key);
+            }
+            this.view.load(val);
+            this.key_edit.el.show();
+            this.key_edit.el.text = key;  
         
         } else {
-            val = node.props.get(key);
+            this.view.load(        file.toSource() );
+            this.key_edit.el.hide();
         }
-        this.view.load(val);
-        this.key_edit.el.text = key;    
     
+           
     }
     public class Xcls_Box2 : Object
     {
@@ -276,6 +278,8 @@ public class Editor : Object
             this.el.show_line_marks = true;
             this.el.insert_spaces_instead_of_tabs = true;
             this.el.show_line_numbers = true;
+            this.el.draw_spaces = Gtk.SourceDrawSpacesFlags.LEADING + Gtk.SourceDrawSpacesFlags.TRAILING + Gtk.SourceDrawSpacesFlags.TAB + Gtk.SourceDrawSpacesFlags.SPACE;
+            this.el.tab_width = 4;
             this.el.highlight_current_line = true;
             var child_0 = new Xcls_buffer( _this );
             child_0.ref();
@@ -284,10 +288,16 @@ public class Editor : Object
             // init method
 
             var description =   Pango.FontDescription.from_string("monospace");
-                description.set_size(8000);
-                this.el.override_font(description);
-            
-            
+                       description.set_size(8000);
+                        this.el.override_font(description);
+                
+               
+               this.el.completion.add_provider(new Palete.CompletionProvider(_this));
+               this.el.completion.unblock_interactive();
+               this.el.completion.select_on_show                       = true; // select
+               this.el.completion.show_headers                 = false;
+               this.el.completion.remember_info_visibility             = true;
+                
               
                 var attrs = new Gtk.SourceMarkAttributes();
                 var  pink =   Gdk.RGBA();
@@ -350,18 +360,30 @@ public class Editor : Object
         
         
           // this.get('/BottomPane').el.set_current_page(0);
-          var buf = (Gtk.SourceBuffer)this.el.get_buffer();
+            var buf = (Gtk.SourceBuffer)this.el.get_buffer();
             buf.set_text(str, str.length);
             buf.set_undo_manager(null);
             
             var lm = Gtk.SourceLanguageManager.get_default();
-            
-            var lang = _this.file.language;
-            //?? is javascript going to work as js?
-            
-            ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lm.get_language(lang));
-         
+            var lang = "vala";
+            if (_this.file != null) {
+                 lang = _this.file.language;
+            }
+            print("lang=%s, content_type = %s\n", lang, _this.file.content_type);
+            var lg = _this.file.content_type.length > 0  ?
+                    lm.guess_language(_this.file.path, _this.file.content_type) :
+                    lm.get_language(lang);
              
+           
+            ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg); 
+        
+            this.el.insert_spaces_instead_of_tabs = true;
+            if (lg != null) {
+                       print("sourcelanguage  = %s\n", lg.name);
+                       if (lg.name == "Vala") {
+                           this.el.insert_spaces_instead_of_tabs = false;
+                       }
+             }
             _this.dirty = false;
             this.el.grab_focus();
             _this.save_button.el.sensitive = false;
@@ -409,6 +431,7 @@ public class Editor : Object
 
         // user defined functions
         public bool highlightErrors ( Gee.HashMap<int,string> validate_res) {
+                 
                 this.error_line = validate_res.size;
         
                 if (this.error_line < 1) {
@@ -426,7 +449,7 @@ public class Editor : Object
                     }
                     this.el.get_iter_at_line( out iter, eline);
                     //print("mark line\n");
-                    this.el.create_source_mark(valiter.get_value(), "error", iter);
+                    this.el.create_source_mark(valiter.get_value(), "ERR", iter);
                 }   
                 return false;
             }
@@ -474,20 +497,25 @@ public class Editor : Object
                 print("checkSyntax - empty string?\n");
                 return true;
             }
-            if (_this.file == null && _this.fname.length > 0) {
+            
+            if (_this.file.xtype == "PlainFile") {
             
                 // assume it's gtk...
                    this.check_running = true;
         
-                 _this.window.windowstate.valasource.checkPlainFileSpawn(
-                    _this.window.project,
-                   _this.fname,
+                 if (!_this.window.windowstate.valasource.checkPlainFileSpawn(
+                  _this.file,
                    str
-                );
-                return;
+                )) {
+                    this.check_running = false;
+                }
+               
+                return true;
             
             }
-           
+           if (_this.file == null) {
+               return true;
+           }
             var p = Palete.factory(_this.file.xtype);   
             
         
@@ -513,16 +541,15 @@ public class Editor : Object
             // clear the buttons.
          
             
-            p.validateVala(
-                _this.window.windowstate,
-                str, 
-                 _this.key, 
-                _this.ptype,
+           if (! _this.window.windowstate.valasource.checkFileWithNodePropChange(
                 _this.file,
-                _this.node 
-                
-                
-            );
+                _this.node,
+                 _this.key,        
+                 _this.ptype,
+                    str
+                )) {
+                this.check_running = false;
+            } 
              
             
             
@@ -551,34 +578,48 @@ public class Editor : Object
                 return true;
             } 
             
-            if (_this.file == null) {
-                return true;
-            }
             
             var err = obj.get_object_member(type);
             
             
-            var valafn = "";
-              try {             
-                   var  regex = new Regex("\\.bjs$");
+            if (_this.file == null) {
+                return true;
+            
+            }
+            var valafn = _this.file.path;
+         
+            if (_this.file.xtype != "PlainFile") {
+        
+        
                 
-                 
-                    valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala");
-                 } catch (GLib.RegexError e) {
-                    return true;
-                }   
+                
+                 valafn = "";
+                  try {             
+                       var  regex = new Regex("\\.bjs$");
+                       // should not happen
+                      
+                     
+                        valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala");
+                     } catch (GLib.RegexError e) {
+                        return true;
+                    }   
         
-           if (!err.has_member(valafn)) {
-                print("File path has no errors\n");
-                return  true;
-            }
         
-            var lines = err.get_object_member(valafn);
+        
+              }
+               if (!err.has_member(valafn)) {
+                    print("File path has no errors\n");
+                    return  true;
+                }
+        
+                var lines = err.get_object_member(valafn);
+                
+                var offset = 1;
+                if (obj.has_member("line_offset")) {
+                    offset = (int)obj.get_int_member("line_offset") + 1;
+                }
             
-            var offset = 1;
-            if (obj.has_member("line_offset")) {
-                offset = (int)obj.get_int_member("line_offset") + 1;
-            }
+        
              
             
             var tlines = this.el.get_line_count () +1;