diff --git a/extensions/vscode/src/common.ts b/extensions/vscode/src/common.ts index 6d30017df..a3a61030e 100644 --- a/extensions/vscode/src/common.ts +++ b/extensions/vscode/src/common.ts @@ -21,7 +21,7 @@ type CreateLanguageClient = ( outputChannel: vscode.OutputChannel, ) => lsp.BaseLanguageClient; -export async function activate(context: vscode.ExtensionContext, createLc: CreateLanguageClient) { +export function activate(context: vscode.ExtensionContext, createLc: CreateLanguageClient) { const stopCheck = vscode.window.onDidChangeActiveTextEditor(tryActivate); tryActivate(); diff --git a/package.json b/package.json index e066a1734..624399b93 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "@tsslint/cli": "latest", "@tsslint/config": "latest", "@volar/language-service": "~2.3.0-alpha.15", - "@volar/tsslint-config": "latest", "typescript": "latest", "vite": "latest", "vitest": "latest" diff --git a/packages/language-server/lib/hybridModeProject.ts b/packages/language-server/lib/hybridModeProject.ts index c72976fd6..4a015f363 100644 --- a/packages/language-server/lib/hybridModeProject.ts +++ b/packages/language-server/lib/hybridModeProject.ts @@ -52,7 +52,7 @@ export function createHybridModeProject( ...sys, version: 0, async sync() { - return 0; + return await 0; }, dispose() { }, }, @@ -72,7 +72,7 @@ export function createHybridModeProject( return await simpleLs; } }, - async getExistingLanguageServices() { + getExistingLanguageServices() { return Promise.all([ ...tsconfigProjects.values(), simpleLs, diff --git a/packages/language-service/lib/ideFeatures/nameCasing.ts b/packages/language-service/lib/ideFeatures/nameCasing.ts index cfa8848d8..4201d27b5 100644 --- a/packages/language-service/lib/ideFeatures/nameCasing.ts +++ b/packages/language-service/lib/ideFeatures/nameCasing.ts @@ -1,11 +1,11 @@ -import type { LanguageServiceContext, VirtualCode } from '@volar/language-service'; +import type { LanguageServiceContext, ProviderResult, VirtualCode } from '@volar/language-service'; import type { CompilerDOM } from '@vue/language-core'; import * as vue from '@vue/language-core'; import { VueVirtualCode, hyphenateAttr, hyphenateTag } from '@vue/language-core'; import { computed } from 'computeds'; import type * as vscode from 'vscode-languageserver-protocol'; -import { AttrNameCasing, TagNameCasing } from '../types'; import type { URI } from 'vscode-uri'; +import { AttrNameCasing, TagNameCasing } from '../types'; export async function convertTagName( context: LanguageServiceContext, @@ -170,7 +170,7 @@ export async function detect( return result; } - async function getTagNameCase(file: VueVirtualCode): Promise { + function getTagNameCase(file: VueVirtualCode): ProviderResult { const result = new Set(); diff --git a/packages/language-service/lib/plugins/vue-extract-file.ts b/packages/language-service/lib/plugins/vue-extract-file.ts index 313605fc5..af6ea5179 100644 --- a/packages/language-service/lib/plugins/vue-extract-file.ts +++ b/packages/language-service/lib/plugins/vue-extract-file.ts @@ -27,7 +27,7 @@ export function create( create(context) { const tsPluginClient = getTsPluginClient?.(context); return { - async provideCodeActions(document, range, _context) { + provideCodeActions(document, range, _context) { const startOffset = document.offsetAt(range.start); const endOffset = document.offsetAt(range.end); diff --git a/packages/language-service/lib/plugins/vue-template.ts b/packages/language-service/lib/plugins/vue-template.ts index 7f6d0e7eb..d6fee0c65 100644 --- a/packages/language-service/lib/plugins/vue-template.ts +++ b/packages/language-service/lib/plugins/vue-template.ts @@ -647,7 +647,7 @@ export function create( }; } - async function afterHtmlCompletion(completionList: vscode.CompletionList, sourceDocument: TextDocument) { + function afterHtmlCompletion(completionList: vscode.CompletionList, sourceDocument: TextDocument) { const replacement = getReplacement(completionList, sourceDocument); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index df38e730c..ab842ddc4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,16 +16,13 @@ importers: version: 3.5.1(typescript@5.4.5) '@tsslint/cli': specifier: latest - version: 0.0.12(typescript@5.4.5) + version: 0.0.13(typescript@5.4.5) '@tsslint/config': specifier: latest - version: 0.0.12 + version: 0.0.13 '@volar/language-service': specifier: ~2.3.0-alpha.15 version: 2.3.0-alpha.15 - '@volar/tsslint-config': - specifier: latest - version: 0.0.0-20240602(@tsslint/config@0.0.12) typescript: specifier: latest version: 5.4.5 @@ -1064,17 +1061,17 @@ packages: resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} engines: {node: '>=18'} - '@tsslint/cli@0.0.12': - resolution: {integrity: sha512-Tk93hP6eoPYHoQMGqrmrTas8gfX5CLSqaX9KZBUkx9A3U9/9B2KowOe1bo2vZjXZCIvFKa/8dovr61nmsvFylg==} + '@tsslint/cli@0.0.13': + resolution: {integrity: sha512-xFroVmBYgjidMBhdZ53AWF0KfbiNgfpvSd45y5GBzB2Ir15iG3yqWjU+3peBB9wEkJ1Uq/DSDjGXIJhWSvX2FA==} hasBin: true peerDependencies: typescript: '*' - '@tsslint/config@0.0.12': - resolution: {integrity: sha512-SCgNA7y4tCvRVGZrb0kTd/XkEyhs11zu4awC9CzFLyzj6DKlJR82oOqPQo6xKM0xEuyl6h2rysF2LJwFPL3PHA==} + '@tsslint/config@0.0.13': + resolution: {integrity: sha512-WlxkTJYrL+NJyqrn3gVwhVxe5O+//HOKqsepiXHBIs7VIqv/To1vOTk6MmyU+BUD4yniMXrYog33gB6YSiVx7Q==} - '@tsslint/core@0.0.12': - resolution: {integrity: sha512-UkNNGzoX0Kd2FlVO2qzGXd4ZZzBuz34WVrWR+gBTJMo2K1fDV/sSjgNF7tjdeikJg/tgcKk4O6xkBbzdrchESQ==} + '@tsslint/core@0.0.13': + resolution: {integrity: sha512-BDVT485ibIFkZim2ia0EIvU7U4OyZjKvoHonDqAC/HZX7guT/9H6RKo21nkPfNzwjK1jgBzF3dLSp1I1rZKLpg==} '@tufjs/canonical-json@2.0.0': resolution: {integrity: sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==} @@ -1140,11 +1137,6 @@ packages: '@volar/source-map@2.3.0-alpha.15': resolution: {integrity: sha512-DQr3FwhRxtxX4W6BoJkwajWjj6BAF5H/SgtzFaUP9z8txn6Y5oFxZPPDG+3Xwu3pTV3gvVlE7AL5E/G1jUr5Yg==} - '@volar/tsslint-config@0.0.0-20240602': - resolution: {integrity: sha512-dSiDDiFExwKKD+N0cl9hLHL76+X+/a4qltbdb6ayEwu7G5H4aw5Qlm99beDyvO9bpFZFSPdkR5XXqyRYZPKLtA==} - peerDependencies: - '@tsslint/config': latest - '@volar/typescript@2.3.0-alpha.15': resolution: {integrity: sha512-sTzUyqGC1wkzVyY0XZBO5smCPDRvIqxlMTUw7bZebuD/7sGaVfyk9ryE29aG6CLpuYDev/ugpQsKoFVhFaQQ8A==} @@ -4016,19 +4008,19 @@ snapshots: '@sindresorhus/merge-streams@2.3.0': {} - '@tsslint/cli@0.0.12(typescript@5.4.5)': + '@tsslint/cli@0.0.13(typescript@5.4.5)': dependencies: '@clack/prompts': 0.7.0 - '@tsslint/config': 0.0.12 - '@tsslint/core': 0.0.12 + '@tsslint/config': 0.0.13 + '@tsslint/core': 0.0.13 glob: 10.4.1 typescript: 5.4.5 - '@tsslint/config@0.0.12': + '@tsslint/config@0.0.13': dependencies: esbuild: 0.19.12 - '@tsslint/core@0.0.12': + '@tsslint/core@0.0.13': dependencies: error-stack-parser: 2.1.4 source-map-support: 0.5.21 @@ -4127,10 +4119,6 @@ snapshots: dependencies: muggle-string: 0.4.1 - '@volar/tsslint-config@0.0.0-20240602(@tsslint/config@0.0.12)': - dependencies: - '@tsslint/config': 0.0.12 - '@volar/typescript@2.3.0-alpha.15': dependencies: '@volar/language-core': 2.3.0-alpha.15 diff --git a/tsslint.config.ts b/tsslint.config.ts index d8cb58a99..5e3b34dee 100644 --- a/tsslint.config.ts +++ b/tsslint.config.ts @@ -1,8 +1,7 @@ import { defineConfig } from '@tsslint/config'; -import VolarLintConfig from '@volar/tsslint-config'; export default defineConfig({ - ...VolarLintConfig, + ...(await import('https://raw.githubusercontent.com/volarjs/volar.js/master/tsslint.config.ts')).default, plugins: [ ({ tsconfig }) => ({ resolveRules(rules) {