Ensure that checkGrammarModuleElementContext reliably returns true when there is bad grammar.

Andy Hanson · Andy Hanson · commit 228ddde66ea7 · 2016-09-29T06:15:48.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17706,9 +17706,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) {
@@ -17749,7 +17751,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
`@@ -17706,9 +17706,11 @@ namespace ts {`
`17706`	`17706`	`}`
`17707`	`17707`
`17708`	`17708`	`function checkGrammarModuleElementContext(node: Statement, errorMessage: DiagnosticMessage): boolean {`
`17709`		`- if (node.parent.kind !== SyntaxKind.SourceFile && node.parent.kind !== SyntaxKind.ModuleBlock && node.parent.kind !== SyntaxKind.ModuleDeclaration) {`
`17710`		`- return grammarErrorOnFirstToken(node, errorMessage);`
	`17709`	`+ const isInAppropriateContext = node.parent.kind === SyntaxKind.SourceFile \|\| node.parent.kind === SyntaxKind.ModuleBlock \|\| node.parent.kind === SyntaxKind.ModuleDeclaration;`
	`17710`	`+ if (!isInAppropriateContext) {`
	`17711`	`+ grammarErrorOnFirstToken(node, errorMessage);`
`17711`	`17712`	`}`
	`17713`	`+ return !isInAppropriateContext;`
`17712`	`17714`	`}`
`17713`	`17715`
`17714`	`17716`	`function checkExportSpecifier(node: ExportSpecifier) {`
`@@ -17749,7 +17751,7 @@ namespace ts {`
`17749`	`17751`	`checkExpressionCached(node.expression);`
`17750`	`17752`	`}`
`17751`	`17753`
`17752`		`- checkExternalModuleExports(<SourceFile \| ModuleDeclaration>container);`
	`17754`	`+ checkExternalModuleExports(container);`
`17753`	`17755`
`17754`	`17756`	`if (node.isExportEquals && !isInAmbientContext(node)) {`
`17755`	`17757`	`if (modulekind === ModuleKind.ES6) {`