Added deferred project context test, marked JsFileExtension as deprecated

Armando Aguirre · Armando Aguirre · commit 5434c4146ee5 · 2018-04-20T16:50:57.000-07:00
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -4067,6 +4067,7 @@ namespace ts {
         Prototype,
     }
 
+    /** @deprecated Use FileExtensionInfo instead. */
     export type JsFileExtensionInfo = FileExtensionInfo;
 
     export interface FileExtensionInfo {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -3135,6 +3135,48 @@ namespace ts.projectSystem {
             });
 
         });
+
+        it("includes deferred files in the project context", () => {
+            const file1 = {
+                path: "/a.deferred",
+                content: "const a = 1;"
+            };
+            // Deferred extensions should not affect JS files.
+            const file2 = {
+                path: "/b.js",
+                content: "const b = 1;"
+            };
+            const tsconfig = {
+                path: "/tsconfig.json",
+                content: ""
+            };
+
+            const host = createServerHost([file1, file2, tsconfig]);
+            const session = createSession(host);
+            const projectService = session.getProjectService();
+
+            // Configure the deferred extension.
+            const extraFileExtensions = [{ extension: ".deferred", scriptKind: ScriptKind.Deferred, isMixedContent: true }];
+            const configureHostRequest = makeSessionRequest<protocol.ConfigureRequestArguments>(CommandNames.Configure, { extraFileExtensions });
+            session.executeCommand(configureHostRequest);
+
+            // Open external project
+            const projectName = "/proj1";
+            projectService.openExternalProject({
+                projectFileName: projectName,
+                rootFiles: toExternalFiles([file1.path, file2.path, tsconfig.path]),
+                options: {}
+            });
+
+            // Assert
+            checkNumberOfProjects(projectService, { configuredProjects: 1 });
+
+            const configuredProject = configuredProjectAt(projectService, 0);
+            checkProjectActualFiles(configuredProject, [file1.path, tsconfig.path]);
+
+            // Allow allowNonTsExtensions will be set to true for deferred extensions.
+            assert.isTrue(configuredProject.getCompilerOptions().allowNonTsExtensions);
+        });
     });
 
     describe("tsserverProjectSystem Proper errors", () => {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2266,6 +2266,7 @@ declare namespace ts {
         AlwaysStrict = 64,
         PriorityImpliesCombination = 28
     }
+    /** @deprecated Use FileExtensionInfo instead. */
     type JsFileExtensionInfo = FileExtensionInfo;
     interface FileExtensionInfo {
         extension: string;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -2266,6 +2266,7 @@ declare namespace ts {
         AlwaysStrict = 64,
         PriorityImpliesCombination = 28
     }
+    /** @deprecated Use FileExtensionInfo instead. */
     type JsFileExtensionInfo = FileExtensionInfo;
     interface FileExtensionInfo {
         extension: string;

Original file line number	Diff line number	Diff line change
`@@ -4067,6 +4067,7 @@ namespace ts {`
`4067`	`4067`	`Prototype,`
`4068`	`4068`	`}`
`4069`	`4069`
	`4070`	`+ /** @deprecated Use FileExtensionInfo instead. */`
`4070`	`4071`	`export type JsFileExtensionInfo = FileExtensionInfo;`
`4071`	`4072`
`4072`	`4073`	`export interface FileExtensionInfo {`
Original file line number	Diff line number	Diff line change
`@@ -2266,6 +2266,7 @@ declare namespace ts {`
`2266`	`2266`	`AlwaysStrict = 64,`
`2267`	`2267`	`PriorityImpliesCombination = 28`
`2268`	`2268`	`}`
	`2269`	`+ /** @deprecated Use FileExtensionInfo instead. */`
`2269`	`2270`	`type JsFileExtensionInfo = FileExtensionInfo;`
`2270`	`2271`	`interface FileExtensionInfo {`
`2271`	`2272`	`extension: string;`