Add comments

JsonFreeman · JsonFreeman · commit 380918c49786 · 2015-06-10T17:20:51.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -11119,6 +11119,7 @@ module ts {
                     ? Diagnostics.An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file
                     : Diagnostics.A_namespace_declaration_is_only_allowed_in_a_namespace_or_module;
                 if (checkGrammarModuleElementContext(node, contextErrorMessage)) {
+                    // If we hit a module declaration in an illegal context, just bail out to avoid cascading errors.
                     return;
                 }
 
@@ -11235,6 +11236,7 @@ module ts {
 
         function checkImportDeclaration(node: ImportDeclaration) {
             if (checkGrammarModuleElementContext(node, Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
+                // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
             if (!checkGrammarImportDeclarationNameInStrictMode(node) && !checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {
@@ -11260,6 +11262,7 @@ module ts {
 
         function checkImportEqualsDeclaration(node: ImportEqualsDeclaration) {
             if (checkGrammarModuleElementContext(node, Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
+                // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
 
@@ -11295,6 +11298,7 @@ module ts {
 
         function checkExportDeclaration(node: ExportDeclaration) {
             if (checkGrammarModuleElementContext(node, Diagnostics.An_export_declaration_can_only_be_used_in_a_module)) {
+                // If we hit an export in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
 
@@ -11338,6 +11342,7 @@ module ts {
 
         function checkExportAssignment(node: ExportAssignment) {
             if (checkGrammarModuleElementContext(node, Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
+                // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
 
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -1770,25 +1770,25 @@ module ts {
         }
 
         function parseRightSideOfDot(allowIdentifierNames: boolean): Identifier {
-            // Technically a keyword is valid here as all keywords are identifier names.
-            // However, often we'll encounter this in error situations when the keyword
+            // Technically a keyword is valid here as all identifiers and keywords are identifier names.
+            // However, often we'll encounter this in error situations when the identifier or keyword
             // is actually starting another valid construct.
             //
             // So, we check for the following specific case:
             //
             //      name.
-            //      keyword identifierNameOrKeyword
+            //      identifierOrKeyword identifierNameOrKeyword
             //
             // Note: the newlines are important here.  For example, if that above code
             // were rewritten into:
             //
-            //      name.keyword
+            //      name.identifierOrKeyword
             //      identifierNameOrKeyword
             //
             // Then we would consider it valid.  That's because ASI would take effect and
-            // the code would be implicitly: "name.keyword; identifierNameOrKeyword".
+            // the code would be implicitly: "name.identifierOrKeyword; identifierNameOrKeyword".
             // In the first case though, ASI will not take effect because there is not a
-            // line terminator after the keyword.
+            // line terminator after the identifier or keyword.
             if (scanner.hasPrecedingLineBreak() && isIdentifierOrKeyword()) {
                 let matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
 

Original file line number	Diff line number	Diff line change
`@@ -11119,6 +11119,7 @@ module ts {`
`11119`	`11119`	`? Diagnostics.An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file`
`11120`	`11120`	`: Diagnostics.A_namespace_declaration_is_only_allowed_in_a_namespace_or_module;`
`11121`	`11121`	`if (checkGrammarModuleElementContext(node, contextErrorMessage)) {`
	`11122`	`+ // If we hit a module declaration in an illegal context, just bail out to avoid cascading errors.`
`11122`	`11123`	`return;`
`11123`	`11124`	`}`
`11124`	`11125`
`@@ -11235,6 +11236,7 @@ module ts {`
`11235`	`11236`
`11236`	`11237`	`function checkImportDeclaration(node: ImportDeclaration) {`
`11237`	`11238`	`if (checkGrammarModuleElementContext(node, Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {`
	`11239`	`+ // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.`
`11238`	`11240`	`return;`
`11239`	`11241`	`}`
`11240`	`11242`	`if (!checkGrammarImportDeclarationNameInStrictMode(node) && !checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & NodeFlags.Modifier)) {`
`@@ -11260,6 +11262,7 @@ module ts {`
`11260`	`11262`
`11261`	`11263`	`function checkImportEqualsDeclaration(node: ImportEqualsDeclaration) {`
`11262`	`11264`	`if (checkGrammarModuleElementContext(node, Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {`
	`11265`	`+ // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.`
`11263`	`11266`	`return;`
`11264`	`11267`	`}`
`11265`	`11268`
`@@ -11295,6 +11298,7 @@ module ts {`
`11295`	`11298`
`11296`	`11299`	`function checkExportDeclaration(node: ExportDeclaration) {`
`11297`	`11300`	`if (checkGrammarModuleElementContext(node, Diagnostics.An_export_declaration_can_only_be_used_in_a_module)) {`
	`11301`	`+ // If we hit an export in an illegal context, just bail out to avoid cascading errors.`
`11298`	`11302`	`return;`
`11299`	`11303`	`}`
`11300`	`11304`
`@@ -11338,6 +11342,7 @@ module ts {`
`11338`	`11342`
`11339`	`11343`	`function checkExportAssignment(node: ExportAssignment) {`
`11340`	`11344`	`if (checkGrammarModuleElementContext(node, Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {`
	`11345`	`+ // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.`
`11341`	`11346`	`return;`
`11342`	`11347`	`}`
`11343`	`11348`