Merge pull request microsoft#11246 from Microsoft/export_in_function

Andy · web-flow · commit 631ab0abab02 · 2016-09-30T06:03:15.000-07:00
Ensure that `checkGrammarModuleElementContext` reliably returns `true` when there is bad grammar
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17714,9 +17714,11 @@ namespace ts {
         }
 
         function checkGrammarModuleElementContext(node: Statement, errorMessage: DiagnosticMessage): boolean {
-            if (node.parent.kind !== SyntaxKind.SourceFile && node.parent.kind !== SyntaxKind.ModuleBlock && node.parent.kind !== SyntaxKind.ModuleDeclaration) {
-                return grammarErrorOnFirstToken(node, errorMessage);
+            const isInAppropriateContext = node.parent.kind === SyntaxKind.SourceFile || node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.ModuleDeclaration;
+            if (!isInAppropriateContext) {
+                grammarErrorOnFirstToken(node, errorMessage);
             }
+            return !isInAppropriateContext;
         }
 
         function checkExportSpecifier(node: ExportSpecifier) {
@@ -17757,7 +17759,7 @@ namespace ts {
                 checkExpressionCached(node.expression);
             }
 
-            checkExternalModuleExports(<SourceFile | ModuleDeclaration>container);
+            checkExternalModuleExports(container);
 
             if (node.isExportEquals && !isInAmbientContext(node)) {
                 if (modulekind === ModuleKind.ES6) {
diff --git a/tests/baselines/reference/exportInFunction.errors.txt b/tests/baselines/reference/exportInFunction.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/compiler/exportInFunction.ts(3,1): error TS1005: '}' expected.
+
+
+==== tests/cases/compiler/exportInFunction.ts (1 errors) ====
+    function f() {
+        export = 0;
+    
+    
+!!! error TS1005: '}' expected.
diff --git a/tests/baselines/reference/exportInFunction.js b/tests/baselines/reference/exportInFunction.js
@@ -0,0 +1,9 @@
+//// [exportInFunction.ts]
+function f() {
+    export = 0;
+
+
+//// [exportInFunction.js]
+function f() {
+    export = 0;
+}
diff --git a/tests/cases/compiler/exportInFunction.ts b/tests/cases/compiler/exportInFunction.ts
@@ -0,0 +1,2 @@
+function f() {
+    export = 0;

Original file line number	Diff line number	Diff line change
`@@ -17714,9 +17714,11 @@ namespace ts {`
`17714`	`17714`	`}`
`17715`	`17715`
`17716`	`17716`	`function checkGrammarModuleElementContext(node: Statement, errorMessage: DiagnosticMessage): boolean {`
`17717`		`- if (node.parent.kind !== SyntaxKind.SourceFile && node.parent.kind !== SyntaxKind.ModuleBlock && node.parent.kind !== SyntaxKind.ModuleDeclaration) {`
`17718`		`- return grammarErrorOnFirstToken(node, errorMessage);`
	`17717`	`+ const isInAppropriateContext = node.parent.kind === SyntaxKind.SourceFile \|\| node.parent.kind === SyntaxKind.ModuleBlock \|\| node.parent.kind === SyntaxKind.ModuleDeclaration;`
	`17718`	`+ if (!isInAppropriateContext) {`
	`17719`	`+ grammarErrorOnFirstToken(node, errorMessage);`
`17719`	`17720`	`}`
	`17721`	`+ return !isInAppropriateContext;`
`17720`	`17722`	`}`
`17721`	`17723`
`17722`	`17724`	`function checkExportSpecifier(node: ExportSpecifier) {`
`@@ -17757,7 +17759,7 @@ namespace ts {`
`17757`	`17759`	`checkExpressionCached(node.expression);`
`17758`	`17760`	`}`
`17759`	`17761`
`17760`		`- checkExternalModuleExports(<SourceFile \| ModuleDeclaration>container);`
	`17762`	`+ checkExternalModuleExports(container);`
`17761`	`17763`
`17762`	`17764`	`if (node.isExportEquals && !isInAmbientContext(node)) {`
`17763`	`17765`	`if (modulekind === ModuleKind.ES6) {`