fix ?noworker=1 mode

joeithub · Mar 21, 2018 · 904c80f · 904c80f
1 parent bcebf55
commit 904c80f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/plugins/c9.ide.language.jsonalyzer/worker/jsonalyzer_worker.js b/plugins/c9.ide.language.jsonalyzer/worker/jsonalyzer_worker.js
@@ -118,23 +118,14 @@ worker.loadPlugin = function(modulePath, contents, callback) {
             return callback("Could not load language handler " + modulePath + ": " + e);
         }
     }
-    var handler;
-    try {
-        handler = require(modulePath);
+
+    require([modulePath], function(handler) {
         if (!handler)
-            throw new Error("Unable to load required module: " + modulePath);
-    } catch (e) {
-        if (isInWebWorker)
-            return callback("Could not load language handler " + modulePath + ": " + e);
-
-        // In ?noworker=1 debugging mode, synchronous require doesn't work
-        return require([modulePath], function(handler) {
-            if (!handler)
-                return callback("Could not load language handler " + modulePath);
-            callback(null, handler);
-        });
-    }
-    callback(null, handler);
+            return callback("Could not load language handler " + modulePath);
+        callback(null, handler);
+    }, function(err) {
+        callback(err);
+    });
 };
 
 worker.handlesLanguage = function(language, part) {

diff --git a/plugins/node_modules/ace/lib/ace/worker/worker_client.js b/plugins/node_modules/ace/lib/ace/worker/worker_client.js