JavaScriptPlugins
diff --git a/‎src/compiler/core.ts‎
Lines changed: 13 additions & 0 deletions b/‎src/compiler/core.ts‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎src/harness/unittests/cachingInServerLSHost.ts‎
Lines changed: 1 addition & 1 deletion b/‎src/harness/unittests/cachingInServerLSHost.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/harness/unittests/tsserverProjectSystem.ts‎
Lines changed: 2 additions & 0 deletions b/‎src/harness/unittests/tsserverProjectSystem.ts‎
Lines changed: 2 additions & 0 deletions
@@ -534,6 +534,19 @@ namespace ts {
         return result;
     }
 
+    export function mapDefinedIter<T, U>(iter: Iterator<T>, mapFn: (x: T) => U | undefined): U[] {
+        const result: U[] = [];
+        while (true) {
+            const { value, done } = iter.next();
+            if (done) break;
+            const res = mapFn(value);
+            if (res !== undefined) {
+                result.push(res);
+            }
+        }
+        return result;
+    }
+
     /**
      * Computes the first matching span of elements and returns a tuple of the first span
      * and the remaining elements.
 
@@ -74,7 +74,7 @@ namespace ts {
         const projectService = new server.ProjectService(svcOpts);
         const rootScriptInfo = projectService.getOrCreateScriptInfo(rootFile, /* openedByClient */ true, /*containingProject*/ undefined);
 
-        const project = projectService.createInferredProjectWithRootFileIfNecessary(rootScriptInfo);
+        const project = projectService.assignScriptInfoToInferredProject(rootScriptInfo);
         project.setCompilerOptions({ module: ts.ModuleKind.AMD, noLib: true } );
         return {
             project,
 
@@ -263,6 +263,8 @@ namespace ts.projectSystem {
 
     function invokeWatcherCallbacks<T>(callbacks: T[], invokeCallback: (cb: T) => void): void {
         if (callbacks) {
+            // The array copy is made to ensure that even if one of the callback removes the callbacks,
+            // we dont miss any callbacks following it
             const cbs = callbacks.slice();
             for (const cb of cbs) {
                 invokeCallback(cb);