Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/core-parts/finder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ export function findTargetClassNameNodes(ast: AST, options: ResolvedOptions): Cl
recursiveProps = ['body'];
break;
}
case 'AssignmentExpression':
case 'LogicalExpression': {
recursiveProps = ['right'];
break;
}
case 'BinaryExpression': {
recursiveProps = ['left', 'right'];
break;
Expand Down Expand Up @@ -190,10 +195,6 @@ export function findTargetClassNameNodes(ast: AST, options: ResolvedOptions): Cl
recursiveProps = ['attributes'];
break;
}
case 'LogicalExpression': {
recursiveProps = ['right'];
break;
}
case 'ObjectExpression': {
recursiveProps = ['properties'];
break;
Expand Down
25 changes: 25 additions & 0 deletions tests/babel/issue-104/__snapshots__/absolute.test.ts.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`'(1) JSX Assignment' > expectation 1`] = `
"//-----------------------------------------------------------------------------| printWidth=80 (in snapshot)
function Foo() {
let elem = (
<div
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex
massa hendrerit eu posuere eu volutpat id neque pellentesque"
>
content
</div>
);
elem = (
<div
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex
massa hendrerit eu posuere eu volutpat id neque pellentesque"
>
content
</div>
);
return elem;
}
"
`;
25 changes: 25 additions & 0 deletions tests/babel/issue-104/__snapshots__/relative.test.ts.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`'(1) JSX Assignment' > expectation 1`] = `
"//-----------------------------------------------------------------------------| printWidth=80 (in snapshot)
function Foo() {
let elem = (
<div
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit
eu posuere eu volutpat id neque pellentesque"
>
content
</div>
);
elem = (
<div
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit
eu posuere eu volutpat id neque pellentesque"
>
content
</div>
);
return elem;
}
"
`;
12 changes: 12 additions & 0 deletions tests/babel/issue-104/absolute.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { thisPlugin, testSnapshotEach } from '../../adaptor';
import { baseOptions } from '../../settings';
import { fixtures } from './fixtures';

const options = {
...baseOptions,
plugins: [thisPlugin],
parser: 'babel',
endingPosition: 'absolute',
};

testSnapshotEach(fixtures, options);
23 changes: 23 additions & 0 deletions tests/babel/issue-104/fixtures.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import type { Fixture } from '../../settings';

export const fixtures: Omit<Fixture, 'output'>[] = [
{
name: '(1) JSX Assignment',
input: `
//-----------------------------------------------------------------------------| printWidth=80 (in snapshot)
function Foo() {
let elem = (
<div className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque">
content
</div>
);
elem = (
<div className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque">
content
</div>
);
return elem;
}
`,
},
];
12 changes: 12 additions & 0 deletions tests/babel/issue-104/relative.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { thisPlugin, testSnapshotEach } from '../../adaptor';
import { baseOptions } from '../../settings';
import { fixtures } from './fixtures';

const options = {
...baseOptions,
plugins: [thisPlugin],
parser: 'babel',
endingPosition: 'relative',
};

testSnapshotEach(fixtures, options);
25 changes: 25 additions & 0 deletions tests/typescript/issue-104/__snapshots__/absolute.test.ts.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`'(1) JSX Assignment' > expectation 1`] = `
"//-----------------------------------------------------------------------------| printWidth=80 (in snapshot)
function Foo() {
let elem = (
<div
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex
massa hendrerit eu posuere eu volutpat id neque pellentesque"
>
content
</div>
);
elem = (
<div
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex
massa hendrerit eu posuere eu volutpat id neque pellentesque"
>
content
</div>
);
return elem;
}
"
`;
25 changes: 25 additions & 0 deletions tests/typescript/issue-104/__snapshots__/relative.test.ts.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`'(1) JSX Assignment' > expectation 1`] = `
"//-----------------------------------------------------------------------------| printWidth=80 (in snapshot)
function Foo() {
let elem = (
<div
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit
eu posuere eu volutpat id neque pellentesque"
>
content
</div>
);
elem = (
<div
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit
eu posuere eu volutpat id neque pellentesque"
>
content
</div>
);
return elem;
}
"
`;
12 changes: 12 additions & 0 deletions tests/typescript/issue-104/absolute.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { thisPlugin, testSnapshotEach } from '../../adaptor';
import { baseOptions } from '../../settings';
import { fixtures } from './fixtures';

const options = {
...baseOptions,
plugins: [thisPlugin],
parser: 'typescript',
endingPosition: 'absolute',
};

testSnapshotEach(fixtures, options);
23 changes: 23 additions & 0 deletions tests/typescript/issue-104/fixtures.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import type { Fixture } from '../../settings';

export const fixtures: Omit<Fixture, 'output'>[] = [
{
name: '(1) JSX Assignment',
input: `
//-----------------------------------------------------------------------------| printWidth=80 (in snapshot)
function Foo() {
let elem = (
<div className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque">
content
</div>
);
elem = (
<div className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque">
content
</div>
);
return elem;
}
`,
},
];
12 changes: 12 additions & 0 deletions tests/typescript/issue-104/relative.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { thisPlugin, testSnapshotEach } from '../../adaptor';
import { baseOptions } from '../../settings';
import { fixtures } from './fixtures';

const options = {
...baseOptions,
plugins: [thisPlugin],
parser: 'typescript',
endingPosition: 'relative',
};

testSnapshotEach(fixtures, options);