X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=src%2FBuilder4%2FEditor.vala;h=3b4d09b35fc314225ef90606782422ebe4a4fda0;hp=9ff8682db499892ae3e9dc12390bc1649346099c;hb=fc49f865ff0b406b1fb2313e84cf3edb8536727b;hpb=48f6118a9682766a58051282ea6e5fe9751c229f

diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index 9ff8682db..3b4d09b35 100644
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -24,6 +24,7 @@ public class Editor : Object
     public int pos_root_x;
     public int pos_root_y;
     public string ptype;
+    public int last_search_end;
     public string key;
     public Gtk.SourceSearchContext searchcontext;
     public JsRender.JsRender file;
@@ -42,6 +43,7 @@ public class Editor : Object
         this.window = null;
         this.activeEditor = "";
         this.ptype = "";
+        this.last_search_end = 0;
         this.key = "";
         this.searchcontext = null;
         this.file = null;
@@ -119,10 +121,19 @@ public class Editor : Object
     
     	var s = new Gtk.SourceSearchSettings();
     	
-    	this.sourcecontext = new Gtk.SourceSearchContext(this.buffer.el,s);
-    	sctx.set_highlight(true);
+    	this.searchcontext = new Gtk.SourceSearchContext(this.buffer.el,s);
+    	this.searchcontext .set_highlight(true);
     	s.set_search_text(txt);
-    	return this.sourcecontext.get_occurences_count();
+    	Gtk.TextIter beg, st,en;
+    	 
+    	this.buffer.el.get_start_iter(out beg);
+    	this.searchcontext.forward(beg, out st, out en);
+    	this.last_search_end = 0;
+    	
+    	return this.searchcontext.get_occurrences_count();
+    
+     
+       
     
     }
     public   void show (JsRender.JsRender file, JsRender.Node? node, string ptype, string key)
@@ -131,7 +142,7 @@ public class Editor : Object
         this.ptype = "";
         this.key  = "";
         this.node = null;
-    
+    	this.searchcontext = null;
         
         if (file.xtype != "PlainFile") {
         
@@ -156,6 +167,28 @@ public class Editor : Object
         }
     
            
+    }
+    public void forwardSearch (bool change_focus) {
+    
+    	if (this.searchcontext == null) {
+    		return;
+    	}
+    	
+    	Gtk.TextIter beg, st,en;
+    	 
+    	this.buffer.el.get_iter_at_offset(out beg, this.last_search_end);
+    	if (!this.searchcontext.forward(beg, out st, out en)) {
+    	
+    		this.last_search_end = 0;
+    	} else {
+    		this.last_search_end = en.get_offset();
+    		if (change_focus) {
+    			this.view.el.grab_focus();
+    		}
+    		this.buffer.el.place_cursor(st);
+    		this.view.el.scroll_to_iter(st,  0.1f, true, 0.0f, 0.5f);
+    	}
+    
     }
     public class Xcls_Box2 : Object
     {
@@ -301,10 +334,13 @@ public class Editor : Object
 
             var description =   Pango.FontDescription.from_string("monospace");
             		description.set_size(8000);
+            
             		 this.el.override_font(description);
+            
+            	try {        
+            		this.el.completion.add_provider(new Palete.CompletionProvider(_this));
+                } catch (GLib.Error  e) {}
                 
-               
-            	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;
@@ -514,7 +550,7 @@ public class Editor : Object
             
                 // assume it's gtk...
                    this.check_running = true;
-        
+         
                  if (!_this.window.windowstate.valasource.checkPlainFileSpawn(
         	   _this.file,
         	    str
@@ -538,13 +574,17 @@ public class Editor : Object
             if (_this.file.language == "js") {
                 this.check_running = false;
                 print("calling validate javascript\n"); 
-                return this.highlightErrors(p.validateJavascript(
+                Gee.HashMap<int,string> errors;
+                p.javascriptHasErrors(
+            		_this.window.windowstate,
                     str, 
                      _this.key, 
                     _this.ptype,
                     _this.file,
-                    _this.node
-                ));    
+         
+                    out errors
+                );
+                return this.highlightErrors(errors);    
                 
             }