Skip to content

Commit e35585b

Browse files
author
Andy
authored
Fix conflict between formatting rules (microsoft#21038)
1 parent e78ac47 commit e35585b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/services/formatting/rules.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ namespace ts.formatting {
8080
rule("SpaceAfterSubtractWhenFollowedByUnaryMinus", SyntaxKind.MinusToken, SyntaxKind.MinusToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], RuleAction.Space),
8181
rule("SpaceAfterSubtractWhenFollowedByPredecrement", SyntaxKind.MinusToken, SyntaxKind.MinusMinusToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], RuleAction.Space),
8282

83-
rule("NoSpaceAfterCloseBrace", SyntaxKind.CloseBraceToken, [SyntaxKind.CloseBracketToken, SyntaxKind.CommaToken, SyntaxKind.SemicolonToken], [isNonJsxSameLineTokenContext], RuleAction.Delete),
83+
rule("NoSpaceAfterCloseBrace", SyntaxKind.CloseBraceToken, [SyntaxKind.CommaToken, SyntaxKind.SemicolonToken], [isNonJsxSameLineTokenContext], RuleAction.Delete),
8484
// For functions and control block place } on a new line [multi-line rule]
8585
rule("NewLineBeforeCloseBraceInBlockContext", anyTokenIncludingMultilineComments, SyntaxKind.CloseBraceToken, [isMultilineBlockContext], RuleAction.NewLine),
8686

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
///<reference path="fourslash.ts"/>
2+
3+
////[{}]
4+
5+
format.setOption("insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets", true);
6+
format.document();
7+
verify.currentFileContentIs("[ {} ]");

0 commit comments

Comments
 (0)