@@ -279,9 +279,9 @@ namespace ts.formatting {
279
279
rule ( "NoSpaceBetweenEmptyBraceBrackets" , SyntaxKind . OpenBraceToken , SyntaxKind . CloseBraceToken , [ isOptionDisabled ( "insertSpaceAfterOpeningAndBeforeClosingEmptyBraces" ) , isNonJsxSameLineTokenContext ] , RuleAction . DeleteSpace ) ,
280
280
281
281
// Insert space after opening and before closing template string braces
282
- rule ( "SpaceAfterTemplateHeadAndMiddle" , [ SyntaxKind . TemplateHead , SyntaxKind . TemplateMiddle ] , anyToken , [ isOptionEnabled ( "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces" ) , isNonJsxSameLineTokenContext ] , RuleAction . InsertSpace ) ,
282
+ rule ( "SpaceAfterTemplateHeadAndMiddle" , [ SyntaxKind . TemplateHead , SyntaxKind . TemplateMiddle ] , anyToken , [ isOptionEnabled ( "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces" ) , isNonJsxTextContext ] , RuleAction . InsertSpace , RuleFlags . CanDeleteNewLines ) ,
283
283
rule ( "SpaceBeforeTemplateMiddleAndTail" , anyToken , [ SyntaxKind . TemplateMiddle , SyntaxKind . TemplateTail ] , [ isOptionEnabled ( "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces" ) , isNonJsxSameLineTokenContext ] , RuleAction . InsertSpace ) ,
284
- rule ( "NoSpaceAfterTemplateHeadAndMiddle" , [ SyntaxKind . TemplateHead , SyntaxKind . TemplateMiddle ] , anyToken , [ isOptionDisabledOrUndefined ( "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces" ) , isNonJsxSameLineTokenContext ] , RuleAction . DeleteSpace ) ,
284
+ rule ( "NoSpaceAfterTemplateHeadAndMiddle" , [ SyntaxKind . TemplateHead , SyntaxKind . TemplateMiddle ] , anyToken , [ isOptionDisabledOrUndefined ( "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces" ) , isNonJsxTextContext ] , RuleAction . DeleteSpace , RuleFlags . CanDeleteNewLines ) ,
285
285
rule ( "NoSpaceBeforeTemplateMiddleAndTail" , anyToken , [ SyntaxKind . TemplateMiddle , SyntaxKind . TemplateTail ] , [ isOptionDisabledOrUndefined ( "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces" ) , isNonJsxSameLineTokenContext ] , RuleAction . DeleteSpace ) ,
286
286
287
287
// No space after { and before } in JSX expression
@@ -690,6 +690,10 @@ namespace ts.formatting {
690
690
return context . TokensAreOnSameLine ( ) && context . contextNode . kind !== SyntaxKind . JsxText ;
691
691
}
692
692
693
+ function isNonJsxTextContext ( context : FormattingContext ) : boolean {
694
+ return context . contextNode . kind !== SyntaxKind . JsxText ;
695
+ }
696
+
693
697
function isNonJsxElementOrFragmentContext ( context : FormattingContext ) : boolean {
694
698
return context . contextNode . kind !== SyntaxKind . JsxElement && context . contextNode . kind !== SyntaxKind . JsxFragment ;
695
699
}
0 commit comments