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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"cross-env": "^7.0.2",
"prettier": "~3.1.0",
"prettier": "~3.2.5",
"ts-node": "^10.0.0"
},
"packageManager": "pnpm@8.4.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/language-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
"estree-walker": "^2.0.1",
"fast-glob": "^3.2.7",
"lodash": "^4.17.21",
"prettier": "~3.1.0",
"prettier-plugin-svelte": "~3.1.1",
"prettier": "~3.2.5",
"prettier-plugin-svelte": "^3.2.2",
"svelte": "^3.57.0",
"svelte-preprocess": "~5.1.0",
"svelte-preprocess": "^5.1.3",
"svelte2tsx": "workspace:~",
"typescript": "^5.3.2",
"typescript-auto-import-cache": "^0.3.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,10 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
return [];
}

const codeActionsNotFilteredOut = codeActions.filter(
({ codeAction }) =>
codeAction.edit?.documentChanges?.every(
(change) => (<TextDocumentEdit>change).edits.length > 0
)
const codeActionsNotFilteredOut = codeActions.filter(({ codeAction }) =>
codeAction.edit?.documentChanges?.every(
(change) => (<TextDocumentEdit>change).edits.length > 0
)
);

const fixAllActions = this.getFixAllActions(
Expand Down
80 changes: 41 additions & 39 deletions packages/language-server/test/plugins/css/CSSPlugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,32 +133,33 @@ describe('CSS Plugin', () => {
const completions = await plugin.getCompletions(document, Position.create(0, 22), {
triggerKind: CompletionTriggerKind.Invoked
} as CompletionContext);
assert.deepStrictEqual(completions?.items.find((item) => item.label === 'none'), <
CompletionItem
>{
insertTextFormat: undefined,
kind: 12,
label: 'none',
documentation: {
kind: 'markdown',
value: 'The element and its descendants generates no boxes\\.'
},
sortText: ' ',
tags: [],
textEdit: {
newText: 'none',
range: {
start: {
line: 0,
character: 21
},
end: {
line: 0,
character: 22
assert.deepStrictEqual(
completions?.items.find((item) => item.label === 'none'),
<CompletionItem>{
insertTextFormat: undefined,
kind: 12,
label: 'none',
documentation: {
kind: 'markdown',
value: 'The element and its descendants generates no boxes\\.'
},
sortText: ' ',
tags: [],
textEdit: {
newText: 'none',
range: {
start: {
line: 0,
character: 21
},
end: {
line: 0,
character: 22
}
}
}
}
});
);
});

it('not for style attribute with interpolation', async () => {
Expand All @@ -183,25 +184,26 @@ describe('CSS Plugin', () => {
}
});
const completions = await plugin.getCompletions(document, Position.create(0, 16));
assert.deepStrictEqual(completions?.items.find((item) => item.label === 'foo.css'), <
CompletionItem
>{
label: 'foo.css',
kind: 17,
textEdit: {
newText: 'foo.css',
range: {
end: {
character: 18,
line: 0
},
start: {
character: 16,
line: 0
assert.deepStrictEqual(
completions?.items.find((item) => item.label === 'foo.css'),
<CompletionItem>{
label: 'foo.css',
kind: 17,
textEdit: {
newText: 'foo.css',
range: {
end: {
character: 18,
line: 0
},
start: {
character: 16,
line: 0
}
}
}
}
});
);
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,10 @@ describe('CompletionProviderImpl', function () {
);

assert.deepStrictEqual(
sortBy(completions?.items.map((item) => item.label), (x) => x),
sortBy(
completions?.items.map((item) => item.label),
(x) => x
),
sortBy(testfiles, (x) => x)
);
});
Expand Down Expand Up @@ -1372,7 +1375,10 @@ describe('CompletionProviderImpl', function () {
document,
Position.create(4, 14)
);
assert.deepStrictEqual(completions?.items.map((item) => item.label), ['s', 'm', 'l']);
assert.deepStrictEqual(
completions?.items.map((item) => item.label),
['s', 'm', 'l']
);
});

it('can auto import in workspace without tsconfig/jsconfig', async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte-check/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"import-fresh": "^3.2.1",
"picocolors": "^1.0.0",
"sade": "^1.7.4",
"svelte-preprocess": "^5.1.0",
"svelte-preprocess": "^5.1.3",
"typescript": "^5.0.3"
},
"peerDependencies": {
Expand Down
7 changes: 2 additions & 5 deletions packages/typescript-plugin/src/language-service/sveltekit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -649,11 +649,8 @@ function getProxiedLanguageService(info: ts.server.PluginCreateInfo, ts: _ts, lo
}

upsertKitFile(fileName: string) {
const result = internalHelpers.upsertKitFile(
ts,
fileName,
kitFilesSettings,
() => info.languageService.getProgram()?.getSourceFile(fileName)
const result = internalHelpers.upsertKitFile(ts, fileName, kitFilesSettings, () =>
info.languageService.getProgram()?.getSourceFile(fileName)
);
if (!result) {
return;
Expand Down
48 changes: 28 additions & 20 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.