Ensure let and const declarations in labels are parsed correctelly

mhegazy · mhegazy · commit e4a20849bba2 · 2014-10-24T10:14:36.000-07:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -3916,22 +3916,22 @@ module ts {
         }
 
         function parseSourceElement() {
-            return parseSourceElementOrModuleElement(ModifierContext.SourceElements, /*allowLetAndConstDeclarations*/ false);
+            return parseSourceElementOrModuleElement(ModifierContext.SourceElements);
         }
 
         function parseModuleElement() {
-            return parseSourceElementOrModuleElement(ModifierContext.ModuleElements, /*allowLetAndConstDeclarations*/ true);
+            return parseSourceElementOrModuleElement(ModifierContext.ModuleElements);
         }
 
-        function parseSourceElementOrModuleElement(modifierContext: ModifierContext, allowLetAndConstDeclarations: boolean): Statement {
+        function parseSourceElementOrModuleElement(modifierContext: ModifierContext): Statement {
             if (isDeclaration()) {
                 return parseDeclaration(modifierContext);
             }
 
             var statementStart = scanner.getTokenPos();
             var statementFirstTokenLength = scanner.getTextPos() - statementStart;
             var errorCountBeforeStatement = file.syntacticErrors.length;
-            var statement = parseStatement(allowLetAndConstDeclarations);
+            var statement = parseStatement(/*allowLetAndConstDeclarations*/ true);
 
             if (inAmbientContext && file.syntacticErrors.length === errorCountBeforeStatement) {
                 grammarErrorAtPos(statementStart, statementFirstTokenLength, Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
diff --git a/tests/baselines/reference/letDeclarations-validContexts.errors.txt b/tests/baselines/reference/letDeclarations-validContexts.errors.txt
@@ -126,4 +126,24 @@ tests/cases/compiler/letDeclarations-validContexts.ts(20,7): error TS2410: All s
         f2: () => {
             let l29 = 0;
         }
+    }
+    
+    // labels
+    label: let l30 = 0;
+    {
+        label2: let l31 = 0;
+    }
+    
+    function f3() {
+        label: let l32 = 0;
+        {
+            label2: let l33 = 0;
+        }
+    }
+    
+    module m3 {
+        label: let l34 = 0;
+        {
+            label2: let l35 = 0;
+        }
     }
diff --git a/tests/baselines/reference/letDeclarations-validContexts.js b/tests/baselines/reference/letDeclarations-validContexts.js
@@ -121,6 +121,26 @@ var o = {
     f2: () => {
         let l29 = 0;
     }
+}
+
+// labels
+label: let l30 = 0;
+{
+    label2: let l31 = 0;
+}
+
+function f3() {
+    label: let l32 = 0;
+    {
+        label2: let l33 = 0;
+    }
+}
+
+module m3 {
+    label: let l34 = 0;
+    {
+        label2: let l35 = 0;
+    }
 }
 
 //// [letDeclarations-validContexts.js]
@@ -227,3 +247,20 @@ var o = {
         let l29 = 0;
     }
 };
+label: let l30 = 0;
+{
+    label2: let l31 = 0;
+}
+function f3() {
+    label: let l32 = 0;
+    {
+        label2: let l33 = 0;
+    }
+}
+var m3;
+(function (m3) {
+    label: let l34 = 0;
+    {
+        label2: let l35 = 0;
+    }
+})(m3 || (m3 = {}));
diff --git a/tests/cases/compiler/letDeclarations-validContexts.ts b/tests/cases/compiler/letDeclarations-validContexts.ts
@@ -121,4 +121,24 @@ var o = {
     f2: () => {
         let l29 = 0;
     }
+}
+
+// labels
+label: let l30 = 0;
+{
+    label2: let l31 = 0;
+}
+
+function f3() {
+    label: let l32 = 0;
+    {
+        label2: let l33 = 0;
+    }
+}
+
+module m3 {
+    label: let l34 = 0;
+    {
+        label2: let l35 = 0;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -3916,22 +3916,22 @@ module ts {`
`3916`	`3916`	`}`
`3917`	`3917`
`3918`	`3918`	`function parseSourceElement() {`
`3919`		`- return parseSourceElementOrModuleElement(ModifierContext.SourceElements, /allowLetAndConstDeclarations/ false);`
	`3919`	`+ return parseSourceElementOrModuleElement(ModifierContext.SourceElements);`
`3920`	`3920`	`}`
`3921`	`3921`
`3922`	`3922`	`function parseModuleElement() {`
`3923`		`- return parseSourceElementOrModuleElement(ModifierContext.ModuleElements, /allowLetAndConstDeclarations/ true);`
	`3923`	`+ return parseSourceElementOrModuleElement(ModifierContext.ModuleElements);`
`3924`	`3924`	`}`
`3925`	`3925`
`3926`		`- function parseSourceElementOrModuleElement(modifierContext: ModifierContext, allowLetAndConstDeclarations: boolean): Statement {`
	`3926`	`+ function parseSourceElementOrModuleElement(modifierContext: ModifierContext): Statement {`
`3927`	`3927`	`if (isDeclaration()) {`
`3928`	`3928`	`return parseDeclaration(modifierContext);`
`3929`	`3929`	`}`
`3930`	`3930`
`3931`	`3931`	`var statementStart = scanner.getTokenPos();`
`3932`	`3932`	`var statementFirstTokenLength = scanner.getTextPos() - statementStart;`
`3933`	`3933`	`var errorCountBeforeStatement = file.syntacticErrors.length;`
`3934`		`- var statement = parseStatement(allowLetAndConstDeclarations);`
	`3934`	`+ var statement = parseStatement(/allowLetAndConstDeclarations/ true);`
`3935`	`3935`
`3936`	`3936`	`if (inAmbientContext && file.syntacticErrors.length === errorCountBeforeStatement) {`
`3937`	`3937`	`grammarErrorAtPos(statementStart, statementFirstTokenLength, Diagnostics.Statements_are_not_allowed_in_ambient_contexts);`