Skip to content

Commit 2594225

Browse files
authored
Fix false positives for import brace in indent rule (#103)
1 parent 2c374af commit 2594225

File tree

4 files changed

+64
-3
lines changed

4 files changed

+64
-3
lines changed

src/rules/indent-helpers/es.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -644,10 +644,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
644644
{ filter: isClosingBraceToken, includeComments: false },
645645
)!
646646
offsets.setOffsetElementList(namedSpecifiers, leftBrace, rightBrace, 1)
647-
for (const token of sourceCode.getTokensBetween(
648-
leftBrace,
647+
for (const token of [
648+
...sourceCode.getTokensBetween(leftBrace, rightBrace),
649649
rightBrace,
650-
)) {
650+
]) {
651651
const i = beforeTokens.indexOf(token)
652652
if (i >= 0) {
653653
beforeTokens.splice(i, 1)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[
2+
{
3+
"message": "Expected indentation of 2 spaces but found 0 spaces.",
4+
"line": 3,
5+
"column": 1
6+
},
7+
{
8+
"message": "Expected indentation of 4 spaces but found 0 spaces.",
9+
"line": 4,
10+
"column": 1
11+
},
12+
{
13+
"message": "Expected indentation of 2 spaces but found 0 spaces.",
14+
"line": 5,
15+
"column": 1
16+
},
17+
{
18+
"message": "Expected indentation of 2 spaces but found 0 spaces.",
19+
"line": 6,
20+
"column": 1
21+
},
22+
{
23+
"message": "Expected indentation of 4 spaces but found 0 spaces.",
24+
"line": 7,
25+
"column": 1
26+
},
27+
{
28+
"message": "Expected indentation of 6 spaces but found 0 spaces.",
29+
"line": 8,
30+
"column": 1
31+
},
32+
{
33+
"message": "Expected indentation of 4 spaces but found 0 spaces.",
34+
"line": 9,
35+
"column": 1
36+
}
37+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!-- prettier-ignore -->
2+
<script>
3+
import Def, {
4+
foo
5+
} from 'mod';
6+
import
7+
Def2, {
8+
bar
9+
} from 'mod';
10+
</script>
11+
12+
<!-- import-declaration01-input.svelte -->
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!-- prettier-ignore -->
2+
<script>
3+
import Def, {
4+
foo
5+
} from 'mod';
6+
import
7+
Def2, {
8+
bar
9+
} from 'mod';
10+
</script>
11+
12+
<!-- import-declaration01-input.svelte -->

0 commit comments

Comments
 (0)