Bug 527356 - Trying to load a Tern definition that does not exist wri…

…tes exception to the console
eclipse · Nov 16, 2017 · 91bd400 · 91bd400
1 parent fb91fa7
commit 91bd400
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/ternWorkerCore.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/ternWorkerCore.js
@@ -168,7 +168,17 @@ require([
         return Deferred.all(loadDefs(defNames, projectLoc));
       })
         .then(function (json) {
-          options.defs = json;
+        	var arr = json;
+        	if(!Array.isArray(arr)) {
+        		arr = [arr];
+        	}
+        	options.defs = [];
+        	arr.forEach(function(def) {
+        		if(Object.keys(def).length < 1) {
+        			return;
+        		}
+        		options.defs.push(def);
+        	});
           startAndMessage(options);
         }, fallback)
         .then(undefined, fallback);