Merge pull request microsoft#19930 from Microsoft/constEnumWithWatch

sheetalkamat · web-flow · commit 8777962373b9 · 2017-11-10T14:57:47.000-08:00
Ensure that enum member value is computed before using it
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -22415,7 +22415,7 @@ namespace ts {
                     const declaration = memberSymbol.valueDeclaration;
                     if (declaration !== member) {
                         if (isBlockScopedNameDeclaredBeforeUse(declaration, member)) {
-                            return getNodeLinks(declaration).enumMemberValue;
+                            return getEnumMemberValue(declaration as EnumMember);
                         }
                         error(expr, Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
                         return 0;
diff --git a/src/harness/unittests/tscWatchMode.ts b/src/harness/unittests/tscWatchMode.ts
@@ -1616,6 +1616,36 @@ namespace ts.tscWatch {
                 return files.slice(0, 2);
             }
         });
+
+        it("Elides const enums correctly in incremental compilation", () => {
+            const currentDirectory = "/user/someone/projects/myproject";
+            const file1: FileOrFolder = {
+                path: `${currentDirectory}/file1.ts`,
+                content: "export const enum E1 { V = 1 }"
+            };
+            const file2: FileOrFolder = {
+                path: `${currentDirectory}/file2.ts`,
+                content: `import { E1 } from "./file1"; export const enum E2 { V = E1.V }`
+            };
+            const file3: FileOrFolder = {
+                path: `${currentDirectory}/file3.ts`,
+                content: `import { E2 } from "./file2"; const v: E2 = E2.V;`
+            };
+            const strictAndEsModule = `"use strict";\nexports.__esModule = true;\n`;
+            verifyEmittedFileContents("\n", [file3, file2, file1], [
+                `${strictAndEsModule}var v = 1 /* V */;\n`,
+                strictAndEsModule,
+                strictAndEsModule
+            ], modifyFiles);
+
+            function modifyFiles(files: FileOrFolderEmit[], emittedFiles: EmittedFile[]) {
+                files[0].content += `function foo2() { return 2; }`;
+                emittedFiles[0].content += `function foo2() { return 2; }\n`;
+                emittedFiles[1].shouldBeWritten = false;
+                emittedFiles[2].shouldBeWritten = false;
+                return [files[0]];
+            }
+        });
     });
 
     describe("tsc-watch module resolution caching", () => {

Original file line number	Diff line number	Diff line change
`@@ -22415,7 +22415,7 @@ namespace ts {`
`22415`	`22415`	`const declaration = memberSymbol.valueDeclaration;`
`22416`	`22416`	`if (declaration !== member) {`
`22417`	`22417`	`if (isBlockScopedNameDeclaredBeforeUse(declaration, member)) {`
`22418`		`- return getNodeLinks(declaration).enumMemberValue;`
	`22418`	`+ return getEnumMemberValue(declaration as EnumMember);`
`22419`	`22419`	`}`
`22420`	`22420`	`error(expr, Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);`
`22421`	`22421`	`return 0;`