maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix formatting when keyword is parsed as part of a JSX identifier (e.g. module-layout) (#18598)

Browse source
This commit is contained in:
Andy 2017-09-20 15:01:04 -07:00 committed by GitHub
parent 7dec4ae9d1
commit 4d2aa9bf2c
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/services/formatting/formattingScanner.ts
View file

@ -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;
}

9
tests/cases/fourslash/formatJsxWithKeywordInIdentifier.ts Normal file
View file

@ -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>`);