From e72bb57b9ae807ab042ee19d5cd540dd21975b3b Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Wed, 29 Jun 2016 20:59:39 -0700
Subject: [PATCH] added tests

---
 src/server/editorServices.ts                  |  2 +-
 .../cases/unittests/tsserverProjectSystem.ts  | 42 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index e133ca0eb98..65b34d817f8 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -121,7 +121,7 @@ namespace ts.server {
         /**
          * maps external project file name to list of config files that were the part of this project
          */
-        private readonly externalProjectToConfiguredProjectMap: Map<NormalizedPath[]>;
+        private readonly externalProjectToConfiguredProjectMap: Map<NormalizedPath[]> = {};
 
         /**
          * external projects (configuration and list of root files is not controlled by tsserver)
diff --git a/tests/cases/unittests/tsserverProjectSystem.ts b/tests/cases/unittests/tsserverProjectSystem.ts
index a0ba0c37ce5..c989d376c2a 100644
--- a/tests/cases/unittests/tsserverProjectSystem.ts
+++ b/tests/cases/unittests/tsserverProjectSystem.ts
@@ -116,6 +116,10 @@ namespace ts {
         assert.equal(projectService.configuredProjects.length, expected, `expected ${expected} configured project(s)`);
     }
 
+    function checkNumberOfExternalProjects(projectService: server.ProjectService, expected: number) {
+        assert.equal(projectService.externalProjects.length, expected, `expected ${expected} external project(s)`);
+    }
+
     function checkNumberOfInferredProjects(projectService: server.ProjectService, expected: number) {
         assert.equal(projectService.inferredProjects.length, expected, `expected ${expected} inferred project(s)`);
     }
@@ -144,7 +148,7 @@ namespace ts {
             const timeoutId = this.nextId;
             this.nextId++;
             this.map[timeoutId] = cb.bind(undefined, ...args);
-            return timeoutId;            
+            return timeoutId;
         }
         unregister(id: any) {
             if (typeof id === "number") {
@@ -759,5 +763,41 @@ namespace ts {
             projectService.closeClientFile(file1.path);
             checkNumberOfConfiguredProjects(projectService, 0);
         });
+
+        it ("should not close external project with no open files", () => {
+            const file1 = {
+                path: "/a/b/f1.ts",
+                content: "let x =1;"
+            };
+            const file2 = {
+                path: "/a/b/f2.ts",
+                content: "let y =1;"
+            };
+            const externalProjectName = "externalproject";
+            const host = createServerHost({ fileOrFolderList: [file1, file2], libFile });
+            const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ true);
+            projectService.openExternalProject({
+                rootFiles: [ file1.path, file2.path ],
+                options: {},
+                projectFileName: externalProjectName
+            });
+
+            checkNumberOfExternalProjects(projectService, 1);
+            checkNumberOfInferredProjects(projectService, 0);
+
+            // open client file - should not lead to creation of inferred project
+            projectService.openClientFile(file1.path, file1.content);
+            checkNumberOfExternalProjects(projectService, 1);
+            checkNumberOfInferredProjects(projectService, 0);
+
+            // close client file - external project should still exists
+            projectService.closeClientFile(file1.path);
+            checkNumberOfExternalProjects(projectService, 1);
+            checkNumberOfInferredProjects(projectService, 0);
+
+            projectService.closeExternalProject(externalProjectName);
+            checkNumberOfExternalProjects(projectService, 0);
+            checkNumberOfInferredProjects(projectService, 0);
+        });
     });
 }
\ No newline at end of file