microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 21:53:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Don't leave space for property access on non-integer literals (#50703)

Browse Source
This commit is contained in:
Jake Bailey 2022-09-09 14:36:39 -07:00 committed by GitHub
parent a70bb9d3ff
commit eb40134373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/formatting/rules.ts
View File

@ -59,7 +59,7 @@ namespace ts.formatting {
// in other cases there should be no space between '?' and next token
rule("NoSpaceAfterQuestionMark", SyntaxKind.QuestionToken, anyToken, [isNonJsxSameLineTokenContext], RuleAction.DeleteSpace),
rule("NoSpaceBeforeDot", anyToken, [SyntaxKind.DotToken, SyntaxKind.QuestionDotToken], [isNonJsxSameLineTokenContext, isNotPropertyAccessOnNumericLiteral], RuleAction.DeleteSpace),
rule("NoSpaceBeforeDot", anyToken, [SyntaxKind.DotToken, SyntaxKind.QuestionDotToken], [isNonJsxSameLineTokenContext, isNotPropertyAccessOnIntegerLiteral], RuleAction.DeleteSpace),
rule("NoSpaceAfterDot", [SyntaxKind.DotToken, SyntaxKind.QuestionDotToken], anyToken, [isNonJsxSameLineTokenContext], RuleAction.DeleteSpace),
rule("NoSpaceBetweenImportParenInImportType", SyntaxKind.ImportKeyword, SyntaxKind.OpenParenToken, [isNonJsxSameLineTokenContext, isImportTypeContext], RuleAction.DeleteSpace),
@ -894,7 +894,9 @@ namespace ts.formatting {
return positionIsASICandidate(context.currentTokenSpan.end, context.currentTokenParent, context.sourceFile);
}
function isNotPropertyAccessOnNumericLiteral(context: FormattingContext): boolean {
return !isPropertyAccessExpression(context.contextNode) || !isNumericLiteral(context.contextNode.expression);
function isNotPropertyAccessOnIntegerLiteral(context: FormattingContext): boolean {
return !isPropertyAccessExpression(context.contextNode)
|| !isNumericLiteral(context.contextNode.expression)
|| context.contextNode.expression.getText().indexOf(".") !== -1;
}
}

21
tests/cases/fourslash/formatDotAfterNumber.ts
View File

@ -1,7 +1,24 @@
/// <reference path='fourslash.ts' />
////1+ 2 .toString() +3/**/
////1+ 2 .toString() +3/*1*/
////1+ 2. .toString() +3/*2*/
////1+ 2.0 .toString() +3/*3*/
////1+ (2) .toString() +3/*4*/
////1+ 2_000 .toString() +3/*5*/
format.document();
goTo.marker("");
goTo.marker("1");
verify.currentLineContentIs("1 + 2 .toString() + 3");
goTo.marker("2");
verify.currentLineContentIs("1 + 2..toString() + 3");
goTo.marker("3");
verify.currentLineContentIs("1 + 2.0.toString() + 3");
goTo.marker("4");
verify.currentLineContentIs("1 + (2).toString() + 3");
goTo.marker("5");
verify.currentLineContentIs("1 + 2_000 .toString() + 3");