Skip to content

Commit df8ad98

Browse files
author
Dimitri BARBOT
committed
Fix issue with expression formatting
1 parent 21dc923 commit df8ad98

File tree

10 files changed

+98
-1
lines changed

10 files changed

+98
-1
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prettier-plugin-tailwind-styled-components",
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"description": "A Prettier plugin for sorting and formatting Tailwind CSS classes when using Tailwind Styled-Components.",
55
"license": "MIT",
66
"main": "dist/index.js",

src/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@ function transformLitteral(
158158
newValue = insertLineBreakAtEnd(newValue, options, withIndentationAtEnd)
159159
return newValue
160160
}
161+
if (withIndentationAtEnd) {
162+
let newValue = normalizeLitteral(value)
163+
newValue = insertLineBreakAtEnd(newValue, options, withIndentationAtEnd)
164+
return newValue
165+
}
161166
return value
162167
}
163168

tests/fixtures/basic/example.styles.formatted.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,15 @@ export const ContainerG = tw.div`
4343
`;
4444

4545
export const ContainerH = tw.div``;
46+
47+
export const ContainerI = tw.div`
48+
${() => fixedComponentCss}
49+
flex
50+
flex-row
51+
`;
52+
53+
export const ContainerJ = tw.div`
54+
${() => fixedComponentCss}
55+
flex
56+
flex-col
57+
`;

tests/fixtures/basic/example.styles.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,14 @@ export const ContainerG = tw.div`
3535
`;
3636

3737
export const ContainerH = tw.div``;
38+
39+
export const ContainerI = tw.div`
40+
${() => fixedComponentCss}
41+
flex
42+
flex-row
43+
`;
44+
45+
export const ContainerJ = tw.div`${() => fixedComponentCss}
46+
flex
47+
flex-col
48+
`;

tests/fixtures/cjs/example.styles.formatted.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,15 @@ export const ContainerG = tw.div`
4343
`;
4444

4545
export const ContainerH = tw.div``;
46+
47+
export const ContainerI = tw.div`
48+
${() => fixedComponentCss}
49+
flex
50+
flex-row
51+
`;
52+
53+
export const ContainerJ = tw.div`
54+
${() => fixedComponentCss}
55+
flex
56+
flex-col
57+
`;

tests/fixtures/cjs/example.styles.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,14 @@ export const ContainerG = tw.div`
3535
`;
3636

3737
export const ContainerH = tw.div``;
38+
39+
export const ContainerI = tw.div`
40+
${() => fixedComponentCss}
41+
flex
42+
flex-row
43+
`;
44+
45+
export const ContainerJ = tw.div`${() => fixedComponentCss}
46+
flex
47+
flex-col
48+
`;

tests/fixtures/no-prettier-config/example.styles.formatted.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,15 @@ export const ContainerG = tw.div`
4343
`;
4444

4545
export const ContainerH = tw.div``;
46+
47+
export const ContainerI = tw.div`
48+
${() => fixedComponentCss}
49+
flex
50+
flex-row
51+
`;
52+
53+
export const ContainerJ = tw.div`
54+
${() => fixedComponentCss}
55+
flex
56+
flex-col
57+
`;

tests/fixtures/no-prettier-config/example.styles.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,14 @@ export const ContainerG = tw.div`
3535
`;
3636

3737
export const ContainerH = tw.div``;
38+
39+
export const ContainerI = tw.div`
40+
${() => fixedComponentCss}
41+
flex
42+
flex-row
43+
`;
44+
45+
export const ContainerJ = tw.div`${() => fixedComponentCss}
46+
flex
47+
flex-col
48+
`;

tests/fixtures/plugins/example.styles.formatted.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,15 @@ export const ContainerG = tw.div`
4545
`;
4646

4747
export const ContainerH = tw.div``;
48+
49+
export const ContainerI = tw.div`
50+
${() => fixedComponentCss}
51+
flex
52+
flex-row
53+
`;
54+
55+
export const ContainerJ = tw.div`
56+
${() => fixedComponentCss}
57+
flex
58+
flex-col
59+
`;

tests/fixtures/plugins/example.styles.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,14 @@ export const ContainerG = tw.div`
3535
`;
3636

3737
export const ContainerH = tw.div``;
38+
39+
export const ContainerI = tw.div`
40+
${() => fixedComponentCss}
41+
flex
42+
flex-row
43+
`;
44+
45+
export const ContainerJ = tw.div`${() => fixedComponentCss}
46+
flex
47+
flex-col
48+
`;

0 commit comments

Comments
 (0)