microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-23 18:48:40 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #20924 from uniqueiniquity/jsxSpreadAttributeFormatting

Browse Source 
Jsx spread attribute formatting
This commit is contained in:
Benjamin Lichtman
2018-01-05 10:27:47 -08:00
committed by GitHub
parent f6dc0ad707 624f68a8e1
commit 5bd477e441
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,7 +619,7 @@ namespace ts.formatting {
}
function isJsxExpressionContext(context: FormattingContext): boolean {
return context.contextNode.kind === SyntaxKind.JsxExpression;
return context.contextNode.kind === SyntaxKind.JsxExpression || context.contextNode.kind === SyntaxKind.JsxSpreadAttribute;
}
function isNextTokenParentJsxAttribute(context: FormattingContext): boolean {

19
tests/cases/fourslash/formattingOptionsChangeJsx.ts
View File

@@ -1,14 +1,21 @@
///<reference path="fourslash.ts"/>
//@Filename: file.tsx
/////*InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces*/<Madoka homu={ true } saya={ (true) } />;
/////*1*/<Madoka homu={ true } saya={ (true) } />;
////
////<PrimaryButton
//// /*2*/{ ...this._getButtonProps() }
/////>
runTest("InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces", "<Madoka homu={ true } saya={ (true) } />;", "<Madoka homu={true} saya={(true)} />;");
runTest("1", "<Madoka homu={ true } saya={ (true) } />;", "<Madoka homu={true} saya={(true)} />;");
runTest("2", " { ...this._getButtonProps() }", " {...this._getButtonProps()}");
function runTest(propertyName: string, expectedStringWhenTrue: string, expectedStringWhenFalse: string) {
function runTest(markerName: string, expectedStringWhenTrue: string, expectedStringWhenFalse: string) {
const propertyName = "InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces";
// Go to the correct file
goTo.marker(propertyName);
goTo.marker(markerName);
// Set the option to false first
format.setOption(propertyName, false);
@@ -17,7 +24,7 @@ function runTest(propertyName: string, expectedStringWhenTrue: string, expectedS
format.document();
// Verify
goTo.marker(propertyName);
goTo.marker(markerName);
verify.currentLineContentIs(expectedStringWhenFalse);
// Set the option to true
@@ -27,6 +34,6 @@ function runTest(propertyName: string, expectedStringWhenTrue: string, expectedS
format.document();
// Verify
goTo.marker(propertyName);
goTo.marker(markerName);
verify.currentLineContentIs(expectedStringWhenTrue);
}