Skip to content

Commit d40636d

Browse files
skovhusskovhus
authored
Merge pull request #217 from bash-lsp/update-dependencies
Upgrade LSP dependencies for server
2 parents f0211cc + 5020a34 commit d40636d

File tree

9 files changed

+71
-65
lines changed

9 files changed

+71
-65
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"prettier": "^1.19.1",
3131
"ts-jest": "^25.2.1",
3232
"typescript": "^3.8.3",
33-
"vscode-languageserver": "^5.2.1"
33+
"vscode-languageserver": "^6.1.1"
3434
},
3535
"dependencies": {},
3636
"resolutions": {

‎server/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"request-promise-native": "^1.0.5",
2525
"turndown": "^4.0.2",
2626
"urijs": "^1.19.1",
27-
"vscode-languageserver": "^5.2.1",
27+
"vscode-languageserver": "^6.1.1",
28+
"vscode-languageserver-textdocument": "^1.0.1",
2829
"web-tree-sitter": "^0.16.2"
2930
},
3031
"scripts": {

‎server/src/__tests__/server.test.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ describe('server', () => {
6464
},
6565
},
6666
{} as any,
67+
{} as any,
6768
)
6869

6970
expect(result).toBeDefined()
@@ -93,6 +94,7 @@ describe('server', () => {
9394
},
9495
},
9596
{} as any,
97+
{} as any,
9698
)
9799

98100
// TODO: there is a superfluous range here on line 0:
@@ -149,6 +151,7 @@ describe('server', () => {
149151
},
150152
},
151153
{} as any,
154+
{} as any,
152155
)
153156

154157
expect(result2).toMatchInlineSnapshot(`Array []`)
@@ -166,6 +169,7 @@ describe('server', () => {
166169
query,
167170
},
168171
{} as any,
172+
{} as any,
169173
)
170174

171175
expect(result).toEqual([
@@ -217,6 +221,7 @@ describe('server', () => {
217221
},
218222
},
219223
{} as any,
224+
{} as any,
220225
)
221226

222227
// Limited set (not using snapshot due to different executables on CI and locally)
@@ -253,6 +258,7 @@ describe('server', () => {
253258
},
254259
},
255260
{} as any,
261+
{} as any,
256262
)
257263

258264
// Entire list
@@ -277,6 +283,7 @@ describe('server', () => {
277283
},
278284
},
279285
{} as any,
286+
{} as any,
280287
)
281288

282289
expect(result).toEqual([])
@@ -300,6 +307,7 @@ describe('server', () => {
300307
},
301308
},
302309
{} as any,
310+
{} as any,
303311
)
304312

305313
expect(resultVariable).toMatchInlineSnapshot(`
@@ -328,6 +336,7 @@ describe('server', () => {
328336
},
329337
},
330338
{} as any,
339+
{} as any,
331340
)
332341

333342
expect(resultFunction).toMatchInlineSnapshot(`
@@ -363,6 +372,7 @@ describe('server', () => {
363372
},
364373
},
365374
{} as any,
375+
{} as any,
366376
)
367377

368378
expect(result).toMatchInlineSnapshot(`

‎server/src/index.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,16 @@ export function listen() {
1515
)
1616

1717
connection.onInitialize(
18-
(params: LSP.InitializeParams): Promise<LSP.InitializeResult> => {
18+
async (params: LSP.InitializeParams): Promise<LSP.InitializeResult> => {
1919
connection.console.log(`Initialized server v. ${pkg.version} for ${params.rootUri}`)
2020

21-
return BashServer.initialize(connection, params)
22-
.then(server => {
23-
server.register(connection)
24-
return server
25-
})
26-
.then(server => ({
27-
capabilities: server.capabilities(),
28-
}))
21+
const server = await BashServer.initialize(connection, params)
22+
23+
server.register(connection)
24+
25+
return {
26+
capabilities: server.capabilities(),
27+
}
2928
},
3029
)
3130

‎server/src/server.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as path from 'path'
22
import * as TurndownService from 'turndown'
33
import * as LSP from 'vscode-languageserver'
4+
import { TextDocument } from 'vscode-languageserver-textdocument'
45

56
import Analyzer from './analyser'
67
import * as Builtins from './builtins'
@@ -39,7 +40,7 @@ export default class BashServer {
3940
private executables: Executables
4041
private analyzer: Analyzer
4142

42-
private documents: LSP.TextDocuments = new LSP.TextDocuments()
43+
private documents: LSP.TextDocuments<TextDocument> = new LSP.TextDocuments(TextDocument)
4344
private connection: LSP.Connection
4445

4546
private constructor(
@@ -89,7 +90,7 @@ export default class BashServer {
8990
return {
9091
// For now we're using full-sync even though tree-sitter has great support
9192
// for partial updates.
92-
textDocumentSync: this.documents.syncKind,
93+
textDocumentSync: LSP.TextDocumentSyncKind.Full,
9394
completionProvider: {
9495
resolveProvider: true,
9596
},

‎server/yarn.lock

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -740,36 +740,35 @@ verror@1.10.0:
740740
core-util-is "1.0.2"
741741
extsprintf "^1.2.0"
742742

743-
vscode-jsonrpc@^4.0.0:
744-
version "4.0.0"
745-
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
746-
integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==
743+
vscode-jsonrpc@^5.0.1:
744+
version "5.0.1"
745+
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794"
746+
integrity sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==
747747

748-
vscode-languageserver-protocol@3.14.1:
749-
version "3.14.1"
750-
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
751-
integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==
748+
vscode-languageserver-protocol@^3.15.3:
749+
version "3.15.3"
750+
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz#3fa9a0702d742cf7883cb6182a6212fcd0a1d8bb"
751+
integrity sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==
752752
dependencies:
753-
vscode-jsonrpc "^4.0.0"
754-
vscode-languageserver-types "3.14.0"
753+
vscode-jsonrpc "^5.0.1"
754+
vscode-languageserver-types "3.15.1"
755+
756+
vscode-languageserver-textdocument@^1.0.1:
757+
version "1.0.1"
758+
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
759+
integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==
755760

756-
vscode-languageserver-types@3.14.0:
757-
version "3.14.0"
758-
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
759-
integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
761+
vscode-languageserver-types@3.15.1:
762+
version "3.15.1"
763+
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
764+
integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
760765

761-
vscode-languageserver@^5.2.1:
762-
version "5.2.1"
763-
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
764-
integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==
766+
vscode-languageserver@^6.1.1:
767+
version "6.1.1"
768+
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz#d76afc68172c27d4327ee74332b468fbc740d762"
769+
integrity sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==
765770
dependencies:
766-
vscode-languageserver-protocol "3.14.1"
767-
vscode-uri "^1.0.6"
768-
769-
vscode-uri@^1.0.6:
770-
version "1.0.8"
771-
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
772-
integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
771+
vscode-languageserver-protocol "^3.15.3"
773772

774773
w3c-hr-time@^1.0.1:
775774
version "1.0.1"

‎testing/mocks.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export function getMockConnection(): jest.Mocked<lsp.Connection> {
1212
client: {} as any,
1313
console,
1414
dispose: jest.fn(),
15+
languages: {} as any,
1516
listen: jest.fn(),
1617
onCodeAction: jest.fn(),
1718
onCodeLens: jest.fn(),
@@ -44,9 +45,11 @@ export function getMockConnection(): jest.Mocked<lsp.Connection> {
4445
onInitialized: jest.fn(),
4546
onNotification: jest.fn(),
4647
onPrepareRename: jest.fn(),
48+
onProgress: jest.fn(),
4749
onReferences: jest.fn(),
4850
onRenameRequest: jest.fn(),
4951
onRequest: jest.fn(),
52+
onSelectionRanges: jest.fn(),
5053
onShutdown: jest.fn(),
5154
onSignatureHelp: jest.fn(),
5255
onTypeDefinition: jest.fn(),
@@ -55,6 +58,7 @@ export function getMockConnection(): jest.Mocked<lsp.Connection> {
5558
onWorkspaceSymbol: jest.fn(),
5659
sendDiagnostics: jest.fn(),
5760
sendNotification: jest.fn(),
61+
sendProgress: jest.fn(),
5862
sendRequest: jest.fn(),
5963
telemetry: {} as any,
6064
tracer: {} as any,

‎vscode-client/src/extension.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ export async function activate(context: ExtensionContext) {
5555

5656
const client = new LanguageClient('Bash IDE', 'Bash IDE', serverOptions, clientOptions)
5757

58-
// client.registerProposedFeatures();
59-
6058
// Push the disposable to the context's subscriptions so that the
6159
// client can be deactivated on extension deactivation
6260
context.subscriptions.push(client.start())

‎yarn.lock

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3833,36 +3833,30 @@ verror@1.10.0:
38333833
core-util-is "1.0.2"
38343834
extsprintf "^1.2.0"
38353835

3836-
vscode-jsonrpc@^4.0.0:
3837-
version "4.0.0"
3838-
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
3839-
integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==
3836+
vscode-jsonrpc@^5.0.1:
3837+
version "5.0.1"
3838+
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794"
3839+
integrity sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==
38403840

3841-
vscode-languageserver-protocol@3.14.1:
3842-
version "3.14.1"
3843-
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
3844-
integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==
3841+
vscode-languageserver-protocol@^3.15.3:
3842+
version "3.15.3"
3843+
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz#3fa9a0702d742cf7883cb6182a6212fcd0a1d8bb"
3844+
integrity sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==
38453845
dependencies:
3846-
vscode-jsonrpc "^4.0.0"
3847-
vscode-languageserver-types "3.14.0"
3846+
vscode-jsonrpc "^5.0.1"
3847+
vscode-languageserver-types "3.15.1"
38483848

3849-
vscode-languageserver-types@3.14.0:
3850-
version "3.14.0"
3851-
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
3852-
integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
3849+
vscode-languageserver-types@3.15.1:
3850+
version "3.15.1"
3851+
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
3852+
integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
38533853

3854-
vscode-languageserver@^5.2.1:
3855-
version "5.2.1"
3856-
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
3857-
integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==
3854+
vscode-languageserver@^6.1.1:
3855+
version "6.1.1"
3856+
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz#d76afc68172c27d4327ee74332b468fbc740d762"
3857+
integrity sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==
38583858
dependencies:
3859-
vscode-languageserver-protocol "3.14.1"
3860-
vscode-uri "^1.0.6"
3861-
3862-
vscode-uri@^1.0.6:
3863-
version "1.0.8"
3864-
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
3865-
integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
3859+
vscode-languageserver-protocol "^3.15.3"
38663860

38673861
w3c-hr-time@^1.0.1:
38683862
version "1.0.1"

0 commit comments

Comments
 (0)