Merge pull request microsoft#15843 from DickvdBrink/issue-15828

sandersn · web-flow · commit fceb897f75bb · 2017-05-15T09:06:08.000-07:00
Allow const enum to be used before declaration
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1280,7 +1280,7 @@ namespace ts {
                 else if (result.flags & SymbolFlags.Class) {
                     error(errorLocation, Diagnostics.Class_0_used_before_its_declaration, declarationNameToString(getNameOfDeclaration(declaration)));
                 }
-                else if (result.flags & SymbolFlags.Enum) {
+                else if (result.flags & SymbolFlags.RegularEnum) {
                     error(errorLocation, Diagnostics.Enum_0_used_before_its_declaration, declarationNameToString(getNameOfDeclaration(declaration)));
                 }
             }
diff --git a/tests/baselines/reference/enumUsedBeforeDeclaration.errors.txt b/tests/baselines/reference/enumUsedBeforeDeclaration.errors.txt
@@ -1,14 +1,11 @@
 tests/cases/compiler/enumUsedBeforeDeclaration.ts(1,18): error TS2450: Enum 'Color' used before its declaration.
-tests/cases/compiler/enumUsedBeforeDeclaration.ts(2,24): error TS2450: Enum 'ConstColor' used before its declaration.
 
 
-==== tests/cases/compiler/enumUsedBeforeDeclaration.ts (2 errors) ====
+==== tests/cases/compiler/enumUsedBeforeDeclaration.ts (1 errors) ====
     const v: Color = Color.Green;
                      ~~~~~
 !!! error TS2450: Enum 'Color' used before its declaration.
     const v2: ConstColor = ConstColor.Green;
-                           ~~~~~~~~~~
-!!! error TS2450: Enum 'ConstColor' used before its declaration.
     enum Color { Red, Green, Blue }
     const enum ConstColor { Red, Green, Blue }
     

Original file line number	Diff line number	Diff line change
`@@ -1280,7 +1280,7 @@ namespace ts {`
`1280`	`1280`	`else if (result.flags & SymbolFlags.Class) {`
`1281`	`1281`	`error(errorLocation, Diagnostics.Class_0_used_before_its_declaration, declarationNameToString(getNameOfDeclaration(declaration)));`
`1282`	`1282`	`}`
`1283`		`- else if (result.flags & SymbolFlags.Enum) {`
	`1283`	`+ else if (result.flags & SymbolFlags.RegularEnum) {`
`1284`	`1284`	`error(errorLocation, Diagnostics.Enum_0_used_before_its_declaration, declarationNameToString(getNameOfDeclaration(declaration)));`
`1285`	`1285`	`}`
`1286`	`1286`	`}`