Symlink jsinfer into cloud9 local

gero3 · May 9, 2012 · 1c08bf9 · 1c08bf9
1 parent 82da6ea
commit 1c08bf9
Show file tree

Hide file tree

Showing 9 changed files with 1,037 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -34,6 +34,7 @@ worker:
 	ln -s `pwd`/plugins-client/ext.language /tmp/c9_worker_build/ext/language
 	ln -s `pwd`/plugins-client/ext.codecomplete /tmp/c9_worker_build/ext/codecomplete
 	ln -s `pwd`/plugins-client/ext.jslanguage /tmp/c9_worker_build/ext/jslanguage
+	ln -s `pwd`/plugins-client/ext.jsinfer /tmp/c9_worker_build/ext/jsinfer
 	./Makefile.dryice.js worker
 	cp node_modules/ace/build/src/worker* plugins-client/lib.ace/www/worker
 

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
@@ -58,7 +58,9 @@ function worker(project) {
                     'ext/jslanguage/parse',
                     'ext/jslanguage/scope_analyzer',
                     'ext/jslanguage/narcissus_jshint',
-                    'ext/jslanguage/debugger'
+                    'ext/jslanguage/narcissus_jshint',
+                    'ext/jslanguage/debugger',
+                    'ext/jsinfer/complete'
                 ]
             })
         ],

diff --git a/configs/default.js b/configs/default.js
@@ -127,7 +127,8 @@ var config = {
                     "ext/codetools/codetools",
                     "ext/colorpicker/colorpicker",
                     "ext/revisions/revisions",
-                    "ext/language/liveinspect"
+                    "ext/language/liveinspect",
+                    "ext/jsinfer/jsinfer"
                     //"ext/splitview/splitview"
                     //"ext/minimap/minimap"
                     //"ext/acebugs/acebugs"

diff --git a/plugins-client/ext.jsinfer b/plugins-client/ext.jsinfer
@@ -0,0 +1 @@
+../../c9_jsinfer/plugins-client/ext.jsinfer
diff --git a/plugins-client/lib.ace/www/worker/worker-coffee.js b/plugins-client/lib.ace/www/worker/worker-coffee.js
@@ -187,6 +187,9 @@ define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, ex
             return !x.lastIndex;
         }();
 
+    if (compliantLastIndexIncrement && compliantExecNpcg)
+        return;
+
     //---------------------------------
     //  Overriden native methods
     //---------------------------------

diff --git a/plugins-client/lib.ace/www/worker/worker-css.js b/plugins-client/lib.ace/www/worker/worker-css.js
@@ -187,6 +187,9 @@ define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, ex
             return !x.lastIndex;
         }();
 
+    if (compliantLastIndexIncrement && compliantExecNpcg)
+        return;
+
     //---------------------------------
     //  Overriden native methods
     //---------------------------------

diff --git a/plugins-client/lib.ace/www/worker/worker-javascript.js b/plugins-client/lib.ace/www/worker/worker-javascript.js
@@ -187,6 +187,9 @@ define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, ex
             return !x.lastIndex;
         }();
 
+    if (compliantLastIndexIncrement && compliantExecNpcg)
+        return;
+
     //---------------------------------
     //  Overriden native methods
     //---------------------------------

diff --git a/plugins-client/lib.ace/www/worker/worker-json.js b/plugins-client/lib.ace/www/worker/worker-json.js
@@ -187,6 +187,9 @@ define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, ex
             return !x.lastIndex;
         }();
 
+    if (compliantLastIndexIncrement && compliantExecNpcg)
+        return;
+
     //---------------------------------
     //  Overriden native methods
     //---------------------------------