Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Support for Volar Labs #15

Merged
merged 1 commit into from Jun 2, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion package.json
Expand Up @@ -27,7 +27,9 @@
"lint-staged": "^13.2.2",
"nx": "16.2.2",
"nx-cloud": "latest",
"simple-git-hooks": "^2.8.1"
"simple-git-hooks": "^2.8.1",
"tslib": "^2.5.2",
"typescript": "^5.1.3"
},
"simple-git-hooks": {
"pre-commit": "pnpm lint-staged"
Expand Down
12 changes: 6 additions & 6 deletions packages/language-server/package.json
Expand Up @@ -12,13 +12,13 @@
"out/**/*.d.ts"
],
"dependencies": {
"@volar/language-core": "1.5.4",
"@volar/language-server": "1.5.4",
"@volar/language-service": "1.5.4",
"@volar/language-core": "1.6.9",
"@volar/language-server": "1.6.9",
"@volar/language-service": "1.6.9",
"@vue-vine/compiler": "workspace:*",
"volar-service-css": "0.0.2",
"volar-service-emmet": "0.0.2",
"volar-service-html": "0.0.2",
"volar-service-css": "0.0.4",
"volar-service-emmet": "0.0.4",
"volar-service-html": "0.0.4",
"vscode-html-languageservice": "^5.0.3",
"vscode-languageserver-textdocument": "^1.0.8"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/language-server/src/language.ts
Expand Up @@ -33,6 +33,7 @@ export class VineFile implements VirtualFile {

fileName!: string
mappings!: VirtualFile['mappings']
codegenStacks = []
embeddedFiles!: VirtualFile['embeddedFiles']
textDocument!: TextDocument

Expand Down Expand Up @@ -114,6 +115,7 @@ export class VineFile implements VirtualFile {
generatedRange: [0, source.length],
data: FileRangeCapabilities.full,
}],
codegenStacks: [],
capabilities: FileCapabilities.full,
embeddedFiles: [],
})
Expand Down
4 changes: 2 additions & 2 deletions packages/vscode-ext/package.json
Expand Up @@ -78,8 +78,8 @@
"@types/vscode": "^1.78.0",
"@typescript-eslint/eslint-plugin": "^5.59.1",
"@typescript-eslint/parser": "^5.59.1",
"@volar/language-server": "1.5.4",
"@volar/vscode": "1.5.4",
"@volar/language-server": "1.6.9",
"@volar/vscode": "1.6.9",
"@vscode/test-electron": "^2.3.0",
"esbuild": "^0.15.18",
"eslint": "^8.39.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/vscode-ext/src/extension.ts
@@ -1,7 +1,10 @@
import type { InitializationOptions } from '@volar/language-server'
import { DiagnosticModel } from '@volar/language-server'
import * as protocol from '@volar/language-server/protocol'
import * as vscode from 'vscode'
import * as lsp from 'vscode-languageclient/node'
import type { ExportsInfoForLabs } from '@volar/vscode'
import { supportLabsVersion } from '@volar/vscode'

let client: lsp.BaseLanguageClient

Expand Down Expand Up @@ -42,6 +45,14 @@ export async function activate(context: vscode.ExtensionContext) {
() => vscode.window.showInformationMessage('Hello World from Vue Vine syntax highlight!'),
)
context.subscriptions.push(disposable)

return {
volarLabs: {
version: supportLabsVersion,
languageClients: [client],
languageServerProtocol: protocol,
},
} satisfies ExportsInfoForLabs
}

// This method is called when your extension is deactivated
Expand Down