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
5 changes: 5 additions & 0 deletions .changeset/stale-foxes-cheat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"eslint-plugin-svelte": patch
---

fix(svelte/indent): crash when using ts import type
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"@eslint-community/eslint-plugin-eslint-comments": "^4.5.0",
"@ota-meshi/eslint-plugin": "^0.18.0",
"@types/eslint": "^9.6.1",
"@typescript-eslint/eslint-plugin": "^8.42.0",
"@typescript-eslint/parser": "^8.42.0",
"@typescript-eslint/eslint-plugin": "^8.48.1",
"@typescript-eslint/parser": "^8.48.1",
"c8": "^10.1.3",
"env-cmd": "^11.0.0",
"eslint": "~9.39.0",
Expand All @@ -47,7 +47,7 @@
"prettier-plugin-svelte": "^3.4.0",
"rimraf": "^6.0.1",
"typescript": "~5.9.2",
"typescript-eslint": "^8.42.0",
"typescript-eslint": "^8.48.1",
"undici": "^6.21.3"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"@types/postcss-safe-parser": "^5.0.4",
"@types/semver": "^7.7.0",
"@types/stylus": "^0.48.43",
"@typescript-eslint/scope-manager": "^8.43.0",
"@typescript-eslint/types": "^8.43.0",
"@typescript-eslint/scope-manager": "^8.48.1",
"@typescript-eslint/types": "^8.48.1",
"acorn": "^8.15.0",
"assert": "^2.1.0",
"esbuild": "^0.27.0",
Expand Down
22 changes: 16 additions & 6 deletions packages/eslint-plugin-svelte/src/rules/indent-helpers/ts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -715,15 +715,25 @@ export function defineVisitor(context: IndentContext): NodeListener {
includeComments: false
})!;
offsets.setOffsetToken(leftParenToken, 1, firstToken);
const argument =
node.argument ||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- typescript-eslint<v6 node
(node as any).parameter;
const rightParenToken = sourceCode.getTokenAfter(argument, {
const args: (TSESTree.TypeNode | TSESTree.StringLiteral | TSESTree.ObjectExpression)[] = [];
if (node.source) {
args.push(node.source);
if (node.options) {
args.push(node.options);
}
} else {
// typescript-eslint<v8.48 node
args.push(
node.argument ||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- typescript-eslint<v6 node
(node as any).parameter
);
}
const rightParenToken = sourceCode.getTokenAfter(args[args.length - 1], {
filter: isClosingParenToken,
includeComments: false
})!;
offsets.setOffsetElementList([argument], leftParenToken, rightParenToken, 1);
offsets.setOffsetElementList(args, leftParenToken, rightParenToken, 1);
if (node.qualifier) {
const dotToken = sourceCode.getTokenBefore(node.qualifier)!;
const propertyToken = sourceCode.getTokenAfter(dotToken);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- message: Expected indentation of 2 spaces but found 0 spaces.
line: 7
column: 1
suggestions: null
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!-- prettier-ignore -->
<script lang="ts">
type Props = {
children: import('svelte').Snippet,
}

const { children }: Props = $props();
</script>

{@render children()}

<!-- tests/fixtures/rules/indent/valid/ts/ts-import-type01-input.svelte -->
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!-- prettier-ignore -->
<script lang="ts">
type Props = {
children: import('svelte').Snippet,
}

const { children }: Props = $props();
</script>

{@render children()}

<!-- tests/fixtures/rules/indent/valid/ts/ts-import-type01-input.svelte -->
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"svelte": ">=5"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!-- prettier-ignore -->
<script lang="ts">
type Props = {
children: import('svelte').Snippet,
}

const { children }: Props = $props();
</script>

{@render children()}

<!-- tests/fixtures/rules/indent/valid/ts/ts-import-type01-input.svelte -->
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"svelte": ">=5"
}
Loading
Loading