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/upgrade-lsp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"sql-language-server": minor
---

Upgrade `vscode-languageserver` from the `8.0.0-next.8` pre-release to 10.x (LSP 3.18) and stop importing its internal `lib/` paths.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"publisher": "joe-re",
"scripts": {
"lint": "eslint .",
"typecheck": "pnpm --filter sqlint --filter sql-language-server typecheck",
"typecheck": "pnpm --filter sqlint --filter sql-language-server --filter sql-language-server_vsc typecheck",
"vsc-compile": "pnpm vsc-compile:client && pnpm vsc-compile:server",
"vsc-compile:client": "pnpm --filter sql-language-server_vsc compile",
"vsc-compile:server": "pnpm build:sqlint && pnpm --filter sql-language-server prepare-vsc-extension",
Expand All @@ -48,7 +48,7 @@
},
"engines": {
"node": "^22.13.0 || >=24",
"vscode": "^1.45.1"
"vscode": "^1.91.0"
},
"activationEvents": [
"onLanguage:sql",
Expand Down
35 changes: 20 additions & 15 deletions packages/client/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import {
CompletionList,
} from 'vscode'
import {
ExecuteCommandParams,
LanguageClient,
LanguageClientOptions,
ServerOptions,
TransportKind,
} from 'vscode-languageclient/node'
import { ExecuteCommandParams } from 'vscode-languageserver-protocol'
import { rebuild } from './rebuild'

const NOTEBOOK_CELL_SCHEME = 'vscode-notebook-cell'
Expand Down Expand Up @@ -114,6 +114,8 @@ export function getNotebookDocument(
)
}

let client: LanguageClient | undefined

export function activate(context: ExtensionContext) {
// console.log("sql-language-server extension activated")
monitorJupyterCells()
Expand Down Expand Up @@ -184,14 +186,24 @@ export function activate(context: ExtensionContext) {
},
}

const client = new LanguageClient(
client = new LanguageClient(
'sqlLanguageServer',
'SQL Language Server',
serverOptions,
clientOptions
)
client.registerProposedFeatures()
const disposable = client.start()
// Register notification handlers before start() so that notifications sent
// right after initialization (e.g. finishSetup) are not missed.
client.onNotification('sqlLanguageServer.finishSetup', (params) => {
connectionNames = params.personalConfig?.connections
?.map((v: { name: string }) => v.name)
.filter((v: string) => !!v)
connectedConnectionName = params.config?.name || ''
})
client.onNotification('sqlLanguageServer.error', (params) => {
Window.showErrorMessage(params.message)
})

const switchConnection = commands.registerCommand(
'extension.switchDatabaseConnection',
Expand Down Expand Up @@ -257,16 +269,9 @@ export function activate(context: ExtensionContext) {
context.subscriptions.push(switchConnection)
context.subscriptions.push(fixAllFixableProblem)
context.subscriptions.push(rebuildSqlite3)
context.subscriptions.push(disposable)
client.onReady().then(() => {
client.onNotification('sqlLanguageServer.finishSetup', (params) => {
connectionNames = params.personalConfig?.connections
?.map((v: { name: string }) => v.name)
.filter((v: string) => !!v)
connectedConnectionName = params.config?.name || ''
})
client.onNotification('sqlLanguageServer.error', (params) => {
Window.showErrorMessage(params.message)
})
})
return client.start()
}

export function deactivate(): Thenable<void> | undefined {
return client?.stop()
}
11 changes: 5 additions & 6 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,23 @@
"publisher": "joe-re",
"scripts": {
"compile": "esbuild ./extension.ts --bundle --platform=node --external:vscode --outfile=out/extension.js",
"watch": "pnpm compile --watch"
"watch": "pnpm compile --watch",
"typecheck": "tsc -p ."
},
"engines": {
"vscode": "^1.52.0"
"vscode": "^1.91.0"
},
"activationEvents": [
"onLanguage:sql",
"onLanguage:python",
"onNotebook:jupyter-notebook"
],
"dependencies": {
"vscode-languageclient": "^7.0.0",
"vscode-languageserver-protocol": "3.16.0",
"vscode-test": "^1.3.0"
"vscode-languageclient": "^10.1.1"
},
"devDependencies": {
"@types/node": "^22.18.0",
"@types/vscode": "^1.76.0",
"@types/vscode": "~1.91.0",
"esbuild": "^0.28.2",
"tslib": "^2.0.0",
"typescript": "~6.0.3"
Expand Down
7 changes: 6 additions & 1 deletion packages/client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
"moduleResolution": "bundler",
"esModuleInterop": true,
"sourceMap": true,
"outDir": "out"
"outDir": "out",
"types": [
"node",
"vscode"
],
"noEmit": true
},
"exclude": [
"node_modules"
Expand Down
9 changes: 3 additions & 6 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,9 @@
"pg": "~8.10.0",
"sqlint": "workspace:^",
"sqlite3": "^5.0.3",
"vscode-jsonrpc": "8.0.0-next.6",
"vscode-languageclient": "^6.1.3",
"vscode-languageserver": "8.0.0-next.8",
"vscode-languageserver-protocol": "~3.16.0",
"vscode-languageserver-textdocument": "^1.0.1",
"vscode-languageserver-types": "3.17.0-next.7",
"vscode-languageserver": "^10.1.1",
"vscode-languageserver-textdocument": "^1.0.12",
"vscode-languageserver-types": "^3.18.3",
"yargs": "^17.3.1"
},
"devDependencies": {
Expand Down
4 changes: 1 addition & 3 deletions packages/server/src/createConnection.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import {
createConnection as _createConnection,
Connection,
} from 'vscode-languageserver/lib/node/main'
import {
IPCMessageReader,
IPCMessageWriter,
} from 'vscode-jsonrpc/lib/node/main'
} from 'vscode-languageserver/node'
import log4js from 'log4js'
import { ConnectionMethod } from './createServer'
const logger = log4js.getLogger()
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/createServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import {
InitializeResult,
CompletionItem,
CompletionParams,
CompletionTriggerKind,
TextDocuments,
} from 'vscode-languageserver/node'
import { TextDocuments } from 'vscode-languageserver'
import { CompletionTriggerKind } from 'vscode-languageserver-protocol/lib/common/protocol'
import { TextDocument } from 'vscode-languageserver-textdocument'
import {
CodeAction,
Expand Down
Loading
Loading