fix merge

[roobuilder] / src / Application.vala

diff --git a/src/Application.vala b/src/Application.vala
index bf40278..4df8de0 100644 (file)
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -182,7 +182,7 @@
                        this.testBjs(cur_project);
                        this.languageServer(cur_project);
                        this.compileBjs(cur_project);
-                       this.compileVala();
+                       //this.compileVala();
 
                }
 
@@ -250,6 +250,7 @@
                                });
                        }
                        
+                       
                
                }
                void listProjects()
@@ -410,16 +411,18 @@
                                                var oldfn = file.targetName();
                                                
                                                print("\n\n\n\nFile : %s\n", oldfn);
-                                               //GLib.FileUtils.get_contents(oldfn, out oldstr);
+                                               
                                                                                
                                                var outstr = file.toSourceCode();
+                                               
+                                               /* line number checking
                                                var bad = false;
                                                // check line numbers:
                                                var bits = outstr.split("\n");
                                                var end = bits.length;
                                                for(var i = 0;i < end; i++) {
                                                        print("%i : %s\n", i+1 , bits[i]);
-                                                       if (!bad && bits[i].has_prefix("/*") && !bits[i].has_prefix("/*%d*/".printf(i+1))) {
+                                                       if (!bad && bits[i].has_prefix("/*") && !bits[i].has_prefix(("/*%d*" +"/").printf(i+1))) {
                                                                end = i + 5 > bits.length ? bits.length: (i + 5);
                                                                print ("^^^^ mismatch\null");
                                                                bad = true;
@@ -430,14 +433,16 @@
                                                if (bad) {
                                                        GLib.error("got bad file");
                                                }
-                                               /*
+                                               */
+                                               // compare files. 
+                                               string oldstr;
+                                               GLib.FileUtils.get_contents(oldfn, out oldstr);
                                                if (outstr != oldstr) { 
                                                        
                                                        GLib.FileUtils.set_contents("/tmp/" + file.name   + ".out",   outstr);
                                                        print("meld   %s /tmp/%s\n", oldfn,  file.name + ".out");
                                                        //GLib.Process.exit(Posix.EXIT_SUCCESS);                
-                                               }
-*.*                                            */
+                                               }                                               
                                                //print("# Files match %s\n", file.name);
                                        }               
                                } catch (FileError e) {
@@ -520,21 +525,26 @@
                        if (ls == null) {
                                GLib.error("No langauge server returned for file:%s", file.relpath);
                        }
+                       
+                       //GLib.debug("started server - sleep 30 secs so you can gdb attach");
+                       //Posix.sleep( 30 );
                        var loop = new MainLoop();
                        GLib.Timeout.add_seconds(1, () => {
-                               if (!ls.isReady()) {
-                                       GLib.debug("waiting for server to be ready");
-                                       return true;
-                               }
+                        
                                GLib.debug("Sending document_open");
                                // it's ready..
                                 
                                ls.document_open(file);
+                               ls.document_save.begin( file, (o,res) => {
+                                       ls.document_save.end(res);
+                                });
+                               
+                               //ls.syntax.begin(file, (obj,res) => {
+                               //      ls.syntax.end(res);
+                               
+                               //});
                                
-                               ls.syntax.begin(file, (obj,res) => {
-                                       ls.syntax.end(res);
                                
-                               });
                                return false;
                                
                        });
@@ -544,7 +554,7 @@
                        GLib.Process.exit(Posix.EXIT_SUCCESS);
                }
                        
-                       
+       /*      
                void compileVala()
                {
                        if (BuilderApplication.opt_compile_target == null) {
@@ -555,6 +565,7 @@
                        GLib.Process.exit(Posix.EXIT_SUCCESS);
        
                }
+               */
                void pullResources()
                {
                        if (!opt_pull_resources) {
@@ -673,9 +684,9 @@ flutter-project  -  was try and read flutter data (but desnt work.)
                
                public static void updateCompileResults( )
                {
-                       queue_update_compile_countdown = 4; // 1 second after last call.
+                       queue_update_compile_countdown = 2; // 1 second after last call.
                        if (queue_update_compile_id == 0) {
-                               queue_update_compile_id = GLib.Timeout.add(250, () => {
+                               queue_update_compile_id = GLib.Timeout.add(100, () => {
                                        if (queue_update_compile_countdown < 0) {
                                                return true;
                                        }
@@ -704,8 +715,9 @@ flutter-project  -  was try and read flutter data (but desnt work.)
                                 
                                GLib.debug("calling udate Errors of window %s", ww.windowstate.file.targetName());
                                ww.updateErrors();
-                               
-                               
+                               ww.windowstate.left_tree.updateErrors();
+                               ww.windowstate.left_props.updateErrors();
+       
                        }
                
                }
@@ -792,5 +804,4 @@ flutter-project  -  was try and read flutter data (but desnt work.)
                
 
  
-