JavaScriptBench
diff --git a/Collapse file
‎src/services/formatting/formattingScanner.ts‎
Copy file name to clipboardExpand all lines: src/services/formatting/formattingScanner.ts
+3-2Lines changed: 3 additions & 2 deletions b/Collapse file
‎src/services/formatting/formattingScanner.ts‎
Copy file name to clipboardExpand all lines: src/services/formatting/formattingScanner.ts
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/Collapse file
‎tests/cases/fourslash/formatJsxWithKeywordInIdentifier.ts‎
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/Collapse file
‎tests/cases/fourslash/formatJsxWithKeywordInIdentifier.ts‎
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
@@ -125,7 +125,8 @@ namespace ts.formatting {
                     case SyntaxKind.JsxOpeningElement:
                     case SyntaxKind.JsxClosingElement:
                     case SyntaxKind.JsxSelfClosingElement:
-                        return node.kind === SyntaxKind.Identifier;
+                        // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier.
+                        return isKeyword(node.kind) || node.kind === SyntaxKind.Identifier;
                 }
             }
 
@@ -209,7 +210,7 @@ namespace ts.formatting {
                 currentToken = scanner.reScanTemplateToken();
                 lastScanAction = ScanAction.RescanTemplateToken;
             }
-            else if (expectedScanAction === ScanAction.RescanJsxIdentifier && currentToken === SyntaxKind.Identifier) {
+            else if (expectedScanAction === ScanAction.RescanJsxIdentifier) {
                 currentToken = scanner.scanJsxIdentifier();
                 lastScanAction = ScanAction.RescanJsxIdentifier;
             }
 
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// Test that we don't crash when encountering a keyword in a JSX identifier.
+
+// @Filename: /a.tsx
+////<div module-layout=""></div>
+
+format.document();
+verify.currentFileContentIs(`<div module-layout=""></div>`);
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,8 @@ namespace ts.formatting {`
`125`	`125`	`case SyntaxKind.JsxOpeningElement:`
`126`	`126`	`case SyntaxKind.JsxClosingElement:`
`127`	`127`	`case SyntaxKind.JsxSelfClosingElement:`
`128`		`- return node.kind === SyntaxKind.Identifier;`
	`128`	+ // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier.
	`129`	`+ return isKeyword(node.kind) \|\| node.kind === SyntaxKind.Identifier;`
`129`	`130`	`}`
`130`	`131`	`}`
`131`	`132`
`@@ -209,7 +210,7 @@ namespace ts.formatting {`
`209`	`210`	`currentToken = scanner.reScanTemplateToken();`
`210`	`211`	`lastScanAction = ScanAction.RescanTemplateToken;`
`211`	`212`	`}`
`212`		`- else if (expectedScanAction === ScanAction.RescanJsxIdentifier && currentToken === SyntaxKind.Identifier) {`
	`213`	`+ else if (expectedScanAction === ScanAction.RescanJsxIdentifier) {`
`213`	`214`	`currentToken = scanner.scanJsxIdentifier();`
`214`	`215`	`lastScanAction = ScanAction.RescanJsxIdentifier;`
`215`	`216`	`}`