Remove the check that if base file name starts with ^ is dynamic file name since those files can exist (microsoft#36109)

sheetalkamat · web-flow · commit 00b21efcb06c · 2020-01-10T10:57:44.000-08:00
Fixes microsoft#35734
diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
@@ -272,7 +272,7 @@ namespace ts.server {
 
     /*@internal*/
     export function isDynamicFileName(fileName: NormalizedPath) {
-        return fileName[0] === "^" || getBaseFileName(fileName)[0] === "^";
+        return fileName[0] === "^";
     }
 
     /*@internal*/
diff --git a/src/testRunner/unittests/tsserver/configuredProjects.ts b/src/testRunner/unittests/tsserver/configuredProjects.ts
@@ -905,6 +905,24 @@ declare var console: {
                 ]
             });
         });
+
+        it("when file name starts with ^", () => {
+            const file: File = {
+                path: `${tscWatch.projectRoot}/file.ts`,
+                content: "const x = 10;"
+            };
+            const app: File = {
+                path: `${tscWatch.projectRoot}/^app.ts`,
+                content: "const y = 10;"
+            };
+            const tsconfig: File = {
+                path: `${tscWatch.projectRoot}/tsconfig.json`,
+                content: "{}"
+            };
+            const host = createServerHost([file, app, tsconfig, libFile]);
+            const service = createProjectService(host);
+            service.openClientFile(file.path);
+        });
     });
 
     describe("unittests:: tsserver:: ConfiguredProjects:: non-existing directories listed in config file input array", () => {
diff --git a/src/testRunner/unittests/tsserver/externalProjects.ts b/src/testRunner/unittests/tsserver/externalProjects.ts
@@ -226,6 +226,27 @@ namespace ts.projectSystem {
             projectService.applyChangesInOpenFiles(arrayIterator(externalFiles));
         });
 
+        it("when file name starts with ^", () => {
+            const file: File = {
+                path: `${tscWatch.projectRoot}/file.ts`,
+                content: "const x = 10;"
+            };
+            const app: File = {
+                path: `${tscWatch.projectRoot}/^app.ts`,
+                content: "const y = 10;"
+            };
+            const host = createServerHost([file, app, libFile]);
+            const service = createProjectService(host);
+            service.openExternalProjects([{
+                projectFileName: `${tscWatch.projectRoot}/myproject.njsproj`,
+                rootFiles: [
+                    toExternalFile(file.path),
+                    toExternalFile(app.path)
+                ],
+                options: { },
+            }]);
+        });
+
         it("external project that included config files", () => {
             const file1 = {
                 path: "/a/b/f1.ts",

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ namespace ts.server {`
`272`	`272`
`273`	`273`	`/@internal/`
`274`	`274`	`export function isDynamicFileName(fileName: NormalizedPath) {`
`275`		`- return fileName[0] === "^" \|\| getBaseFileName(fileName)[0] === "^";`
	`275`	`+ return fileName[0] === "^";`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`/@internal/`