Skip to content

Commit da6e5cc

Browse files
committed
fix
1 parent 95bca00 commit da6e5cc

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
},
6060
"peerDependencies": {
6161
"eslint": "^7.0.0 || ^8.0.0-0 || ^9.0.0-0",
62-
"svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.33"
62+
"svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.68"
6363
},
6464
"peerDependenciesMeta": {
6565
"svelte": {
@@ -166,7 +166,7 @@
166166
"stylelint": "^16.0.0",
167167
"stylelint-config-standard": "^36.0.0",
168168
"stylus": "^0.62.0",
169-
"svelte": "^5.0.0-next.33",
169+
"svelte": "^5.0.0-next.68",
170170
"svelte-adapter-ghpages": "0.2.2",
171171
"svelte-i18n": "^4.0.0",
172172
"tslib": "^2.5.0",

src/rules/indent-helpers/svelte.ts

+10-7
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ export function defineVisitor(context: IndentContext): NodeListener {
227227
const rightParenToken = sourceCode.getTokenBefore(sourceCode.getLastToken(node));
228228

229229
offsets.setOffsetToken(leftParenToken, 1, calleeToken);
230-
offsets.setOffsetElementList([node.argument], leftParenToken, rightParenToken, 1);
230+
offsets.setOffsetElementList(node.arguments, leftParenToken, rightParenToken, 1);
231231
},
232232
// ----------------------------------------------------------------------
233233
// BLOCKS
@@ -488,19 +488,22 @@ export function defineVisitor(context: IndentContext): NodeListener {
488488
offsets.setOffsetToken(id.firstToken, 1, snippetToken);
489489

490490
const leftParenToken = sourceCode.getTokenBefore(
491-
node.context || sourceCode.getLastToken(node),
491+
node.params[0] || sourceCode.getLastToken(node),
492492
{
493493
filter: isOpeningParenToken,
494494
includeComments: false
495495
}
496496
)!;
497497

498-
const rightParenToken = sourceCode.getTokenAfter(node.context || leftParenToken, {
499-
filter: isClosingParenToken,
500-
includeComments: false
501-
})!;
498+
const rightParenToken = sourceCode.getTokenAfter(
499+
node.params[node.params.length - 1] || leftParenToken,
500+
{
501+
filter: isClosingParenToken,
502+
includeComments: false
503+
}
504+
)!;
502505
offsets.setOffsetToken(leftParenToken, 1, id.firstToken);
503-
offsets.setOffsetElementList([node.context], leftParenToken, rightParenToken, 1);
506+
offsets.setOffsetElementList(node.params, leftParenToken, rightParenToken, 1);
504507
},
505508
// ----------------------------------------------------------------------
506509
// COMMENTS

src/rules/mustache-spacing.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,13 @@ export default createRule('mustache-spacing', {
400400
},
401401
SvelteSnippetBlock(node) {
402402
const openBlockOpeningToken = sourceCode.getFirstToken(node);
403-
const openBlockClosingToken = sourceCode.getTokenAfter(node.context || node.id, {
404-
includeComments: false,
405-
filter: isClosingBraceToken
406-
})!;
403+
const openBlockClosingToken = sourceCode.getTokenAfter(
404+
node.params[node.params.length - 1] || node.id,
405+
{
406+
includeComments: false,
407+
filter: isClosingBraceToken
408+
}
409+
)!;
407410
verifyBraces(
408411
openBlockOpeningToken,
409412
openBlockClosingToken,

0 commit comments

Comments
 (0)