Make type fetching a promise

Author: CompuIves

standalone-packages/monaco-typescript/release/dev/tsWorker.js

@@ -127,7 +127,7 @@ define(["require", "exports", "./lib/typescriptServices", "./lib/lib", "./fetchD
                     var devDependencies_1 = p_1.devDependencies || {};
                     Promise.join(__spread(Object.keys(p_1.dependencies), Object.keys(devDependencies_1).filter(function (p) { return p.indexOf('@types/') === 0; })).map(function (depName) {
                         var version = p_1.dependencies[depName] || devDependencies_1[depName];
-                        fetchTypings.fetchAndAddDependencies(depName, version, function (paths) {
+                        return fetchTypings.fetchAndAddDependencies(depName, version, function (paths) {
                             var fileAmount = Object.keys(paths).length;
                             Object.keys(paths).forEach(function (p) {
                                 var pathToWrite = '/sandbox/' + p;
@@ -140,10 +140,12 @@ define(["require", "exports", "./lib/typescriptServices", "./lib/lib", "./fetchD
                                     });
                                 }
                             });
-                        }).catch(function (e) { });
+                        }).catch(function () { });
                     })).then(function () {
-                        _this.typesLoaded = true;
                         _this._languageService.cleanupSemanticCache();
+                        setTimeout(function () {
+                            _this.typesLoaded = true;
+                        });
                     });
                 }
                 catch (e) {

standalone-packages/monaco-typescript/src/fetchDependencyTypings.ts

@@ -334,7 +334,7 @@ const getFileTypes = (
     return Promise.all(
       dependencies
         .map(depPath =>
-          fetchAndAddDependencies(getDependencyName(depPath), "latest", () => {}, fetchedPaths).catch(
+          fetchAndAddDependencies(getDependencyName(depPath), "latest", fetchedPaths).catch(
             () => {
               /* ignore */
             }
@@ -421,7 +421,6 @@ function fetchFromTypings(dependency, version, fetchedPaths) {
 export async function fetchAndAddDependencies(
   dep,
   version,
-  onDependencies,
   fetchedPaths = {}
 ) {
   try {
@@ -453,5 +452,5 @@ export async function fetchAndAddDependencies(
     // }
   }
 
-  onDependencies(fetchedPaths);
+  return fetchedPaths;
 }