upgrade vscode-languageserver to 8.0.0-next.8 (joe-re#119)

Author: joe-re

.gitignore

@@ -14,3 +14,4 @@ packages/server/dist/*
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
+.node-version

packages/server/package.json

@@ -50,7 +50,7 @@
  "sqlint": "^1.2.0",
  "sqlite3": "^5.0.2",
  "vscode-languageclient": "^6.1.3",
- "vscode-languageserver": "^8.0.0-next.3",
+ "vscode-languageserver": "8.0.0-next.8",
  "vscode-languageserver-protocol": "^3.15.3",
  "vscode-languageserver-textdocument": "^1.0.1",
  "yargs": "^17.3.1"

packages/server/src/createServer.ts

@@ -4,15 +4,15 @@ import {
  CompletionItem,
  CompletionParams,
 } from 'vscode-languageserver/node'
-import { TextDocuments } from 'vscode-languageserver/lib/common/server'
+import { LSPObject, TextDocuments } from 'vscode-languageserver'
 import { CompletionTriggerKind } from 'vscode-languageserver-protocol/lib/common/protocol'
 import { TextDocument } from 'vscode-languageserver-textdocument'
 import { CodeAction, TextDocumentEdit, TextEdit, Position, CodeActionKind } from 'vscode-languageserver-types'
 import cache from './cache'
 import { complete } from './complete'
 import createDiagnostics from './createDiagnostics'
 import createConnection from './createConnection'
-import SettingStore from './SettingStore'
+import SettingStore, { Connection as SettingConnection } from './SettingStore'
 import { Schema } from './database_libs/AbstractClient'
 import getDatabaseClient from './database_libs/getDatabaseClient'
 import initializeLogging from './initializeLogging'
@@ -186,13 +186,19 @@ export function createServerWithConnection(connection: Connection, debug = false
  if (!hasConfigurationCapability) {
  return
  }
- const connections = change.settings?.sqlLanguageServer?.connections ?? []
+ if (!Object.prototype.hasOwnProperty.call(change.settings, 'sqlLanguageServer')) {
+ logger.debug('onDidChangeConfiguration', "it doesn't have sqlLanguageServer property")
+ return 
+ }
+ const sqlLanguageServerSetting = ((change.settings as LSPObject).sqlLanguageServer) as LSPObject
+
+ const connections = (sqlLanguageServerSetting.connections ?? []) as SettingConnection[]
  if (connections.length > 0) {
  SettingStore.getInstance().setSettingFromWorkspaceConfig(connections)
  }
 
  // On configuration changes we retrieve the lint config
- const lint = change.settings?.sqlLanguageServer?.lint
+ const lint = ((sqlLanguageServerSetting).lint) as RawConfig
  lintConfig = lint
  if (lint?.rules) {
  documents.all().forEach(v => {
@@ -272,7 +278,7 @@ export function createServerWithConnection(connection: Connection, debug = false
  ) {
  try {
  SettingStore.getInstance().changeConnection(
- request.arguments && request.arguments[0] || ''
+ request.arguments && request.arguments[0]?.toString() || ''
  )
  } catch (e) {
  const err = e as NodeJS.ErrnoException
@@ -291,7 +297,7 @@ export function createServerWithConnection(connection: Connection, debug = false
  })
  return
  }
- const document = documents.get(uri)
+ const document = documents.get(uri.toString())
  const text = document?.getText()
  if (!text) {
  logger.debug('Failed to get text')
@@ -305,7 +311,7 @@ export function createServerWithConnection(connection: Connection, debug = false
  logger.debug('Fix all fixable problems', text, result[0].fixedText)
  connection.workspace.applyEdit({
  documentChanges: [
- TextDocumentEdit.create({ uri, version: document!.version }, [
+ TextDocumentEdit.create({ uri: uri.toString(), version: document!.version }, [
  TextEdit.replace({
  start: Position.create(0, 0),
  end: Position.create(Number.MAX_VALUE, Number.MAX_VALUE)

yarn.lock

@@ -9695,10 +9695,10 @@ vscode-jsonrpc@6.0.0, vscode-jsonrpc@^6.0.0:
  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
  integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
 
-vscode-jsonrpc@8.0.0-next.3:
- version "8.0.0-next.3"
- resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.3.tgz#b55edff0e550b03f3804aade44aca2699af27255"
- integrity sha512-2wRiBR5tZAXZ4UxIO4F0cT/zN6OpruoWO0vc7EpQZxVfumb0pYiSegB+PaOzXCuFQzh7YEshW/XMg4zTz3FGVQ==
+vscode-jsonrpc@8.0.0-next.6:
+ version "8.0.0-next.6"
+ resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.6.tgz#981f7c065ecc7e7e8595f9da6d073ac592b34114"
+ integrity sha512-6Ld3RYjygn5Ih7CkAtcAwiDQC+rakj2O+PnASfNyYv3sLmm44eJpEKzuPUN30Iy2UB09AZg8T6LBKWTJTEJDVw==
 
 vscode-jsonrpc@^5.0.0, vscode-jsonrpc@^5.0.1:
  version "5.0.1"
@@ -9738,13 +9738,13 @@ vscode-languageserver-protocol@3.16.0, vscode-languageserver-protocol@^3.15.3:
  vscode-jsonrpc "6.0.0"
  vscode-languageserver-types "3.16.0"
 
-vscode-languageserver-protocol@3.17.0-next.9:
- version "3.17.0-next.9"
- resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.9.tgz#0fd4ad43611c96acd83d8d998dbe76668f60e604"
- integrity sha512-DGkRmbI1hRBMY6HU6MOyza5AvYp0+HcbMf2qdmI98luyQJ26dOfHY5K38OS4hlTHhdJg9RypTQ/uBbLZehmn1Q==
+vscode-languageserver-protocol@3.17.0-next.14:
+ version "3.17.0-next.14"
+ resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.14.tgz#d3500bef2ad2889385cda4802acfe6549842164d"
+ integrity sha512-iangobY8dL6sFZkOx4OhRPJM9gN0I1caUsOVR+MnPozsqQUtwMXmbIcfaIf0Akp0pd3KhJDPf/tdwRX68QGeeA==
  dependencies:
- vscode-jsonrpc "8.0.0-next.3"
- vscode-languageserver-types "3.17.0-next.4"
+ vscode-jsonrpc "8.0.0-next.6"
+ vscode-languageserver-types "3.17.0-next.7"
 
 vscode-languageserver-textdocument@^1.0.1:
  version "1.0.1"
@@ -9761,17 +9761,17 @@ vscode-languageserver-types@3.16.0:
  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
 
-vscode-languageserver-types@3.17.0-next.4:
- version "3.17.0-next.4"
- resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.4.tgz#f6788b375ec163da8b381f2f3e3f547cbc7fbeec"
- integrity sha512-MraVkZDhfqa3ftnKW9rEDeqsV+ji8OrtEjx6mVjzVGm5U2XXT+mdqDWyQ+y0Gvb2/aa2oJJQyTAaDmRTUKiUbg==
+vscode-languageserver-types@3.17.0-next.7:
+ version "3.17.0-next.7"
+ resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.7.tgz#3e41ebb290c95bb38595f568a9963212626290cc"
+ integrity sha512-KH4zdG1qBXxoso61ChgpeoZYyHGJo8bV7Jv4I+fwQ1Ryy59JAxoZ9GAbhR5TeeafHctLcg6RFvY3m8Jqfu17cg==
 
-vscode-languageserver@^8.0.0-next.3:
- version "8.0.0-next.3"
- resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.0-next.3.tgz#36c701a6844ec269505539e3b84a37693760a52f"
- integrity sha512-uxL/tKUa/gRdvQINVmMnK32d6LwfTPTvF7l1iZIFDuAdhGrQ+Po+4lS3w4hwQSeUmapM1WMELXNBFca/u3H5Uw==
+vscode-languageserver@8.0.0-next.8:
+ version "8.0.0-next.8"
+ resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.0-next.8.tgz#86ef42fb296ab338b800e83e478d0f687805c170"
+ integrity sha512-Gq0uqKbOgw7YNwPxMoNCeh7mHKMhG5j6EuoSh+w5pnKd7Eu9a74cagqf9aZDVFWW6GRpqR/Z+1o6EXqDK+g2Tg==
  dependencies:
- vscode-languageserver-protocol "3.17.0-next.9"
+ vscode-languageserver-protocol "3.17.0-next.14"
 
 vscode-test@^0.4.1:
  version "0.4.3"