Skip to content

Commit fc0f2a7

Browse files
mads-hartmannmads-hartmann
authored
Merge pull request #28 from mads-hartmann/update-dependencies
Update dependencies
2 parents d9e602d + 346e500 commit fc0f2a7

File tree

8 files changed

+101
-49
lines changed

8 files changed

+101
-49
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
},
1717
"devDependencies": {
1818
"@types/jest": "^22.2.2",
19-
"@types/node": "^9.4.7",
19+
"@types/node": "^9.6.2",
2020
"electron-rebuild": "^1.7.3",
2121
"jest": "^22.4.3",
2222
"prettier": "^1.11.1",
2323
"ts-jest": "^22.4.2",
2424
"tslint-config-prettier": "^1.10.0",
2525
"tslint-plugin-prettier": "^1.3.0",
2626
"tslint": "^5.9.1",
27-
"typescript": "^2.7.2"
27+
"typescript": "^2.8.1"
2828
},
2929
"jest": {
3030
"testEnvironment": "node",

‎server/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
},
1919
"dependencies": {
2020
"glob": "^7.1.2",
21-
"tree-sitter": "^0.10.0",
22-
"tree-sitter-bash": "^0.6.0",
23-
"vscode-languageserver": "^3.5.0"
21+
"tree-sitter": "^0.11.0",
22+
"tree-sitter-bash": "^0.11.0",
23+
"vscode-languageserver": "^4.1.1"
2424
},
2525
"scripts": {
2626
"compile": "rm -rf out && tsc -p ./",

‎server/src/__tests__/__snapshots__/analyzer.test.ts.snap

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,127 +114,127 @@ Array [
114114
"name": "ret",
115115
"type": "function",
116116
},
117-
"kind": undefined,
117+
"kind": 1,
118118
"label": "ret",
119119
},
120120
Object {
121121
"data": Object {
122122
"name": "configures",
123123
"type": "function",
124124
},
125-
"kind": undefined,
125+
"kind": 1,
126126
"label": "configures",
127127
},
128128
Object {
129129
"data": Object {
130130
"name": "npm_config_loglevel",
131131
"type": "function",
132132
},
133-
"kind": undefined,
133+
"kind": 1,
134134
"label": "npm_config_loglevel",
135135
},
136136
Object {
137137
"data": Object {
138138
"name": "node",
139139
"type": "function",
140140
},
141-
"kind": undefined,
141+
"kind": 1,
142142
"label": "node",
143143
},
144144
Object {
145145
"data": Object {
146146
"name": "TMP",
147147
"type": "function",
148148
},
149-
"kind": undefined,
149+
"kind": 1,
150150
"label": "TMP",
151151
},
152152
Object {
153153
"data": Object {
154154
"name": "BACK",
155155
"type": "function",
156156
},
157-
"kind": undefined,
157+
"kind": 1,
158158
"label": "BACK",
159159
},
160160
Object {
161161
"data": Object {
162162
"name": "tar",
163163
"type": "function",
164164
},
165-
"kind": undefined,
165+
"kind": 1,
166166
"label": "tar",
167167
},
168168
Object {
169169
"data": Object {
170170
"name": "MAKE",
171171
"type": "function",
172172
},
173-
"kind": undefined,
173+
"kind": 1,
174174
"label": "MAKE",
175175
},
176176
Object {
177177
"data": Object {
178178
"name": "make",
179179
"type": "function",
180180
},
181-
"kind": undefined,
181+
"kind": 1,
182182
"label": "make",
183183
},
184184
Object {
185185
"data": Object {
186186
"name": "clean",
187187
"type": "function",
188188
},
189-
"kind": undefined,
189+
"kind": 1,
190190
"label": "clean",
191191
},
192192
Object {
193193
"data": Object {
194194
"name": "node_version",
195195
"type": "function",
196196
},
197-
"kind": undefined,
197+
"kind": 1,
198198
"label": "node_version",
199199
},
200200
Object {
201201
"data": Object {
202202
"name": "t",
203203
"type": "function",
204204
},
205-
"kind": undefined,
205+
"kind": 1,
206206
"label": "t",
207207
},
208208
Object {
209209
"data": Object {
210210
"name": "url",
211211
"type": "function",
212212
},
213-
"kind": undefined,
213+
"kind": 1,
214214
"label": "url",
215215
},
216216
Object {
217217
"data": Object {
218218
"name": "ver",
219219
"type": "function",
220220
},
221-
"kind": undefined,
221+
"kind": 1,
222222
"label": "ver",
223223
},
224224
Object {
225225
"data": Object {
226226
"name": "isnpm10",
227227
"type": "function",
228228
},
229-
"kind": undefined,
229+
"kind": 1,
230230
"label": "isnpm10",
231231
},
232232
Object {
233233
"data": Object {
234234
"name": "NODE",
235235
"type": "function",
236236
},
237-
"kind": undefined,
237+
"kind": 1,
238238
"label": "NODE",
239239
},
240240
]

‎server/src/analyser.ts

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export default class Analyzer {
141141
return uniqueBasedOnHash(this.findSymbols(uri), hashFunction).map(
142142
(symbol: LSP.SymbolInformation) => ({
143143
label: symbol.name,
144-
kind: symbol.kind,
144+
kind: this.symbolKindToCompletionKind(symbol.kind),
145145
data: {
146146
name: symbol.name,
147147
type: 'function',
@@ -228,4 +228,56 @@ export default class Analyzer {
228228

229229
return name
230230
}
231+
232+
private symbolKindToCompletionKind(s: LSP.SymbolKind): LSP.CompletionItemKind {
233+
switch (s) {
234+
case LSP.SymbolKind.File:
235+
return LSP.CompletionItemKind.File
236+
case LSP.SymbolKind.Module:
237+
case LSP.SymbolKind.Namespace:
238+
case LSP.SymbolKind.Package:
239+
return LSP.CompletionItemKind.Module
240+
case LSP.SymbolKind.Class:
241+
return LSP.CompletionItemKind.Class
242+
case LSP.SymbolKind.Method:
243+
return LSP.CompletionItemKind.Method
244+
case LSP.SymbolKind.Property:
245+
return LSP.CompletionItemKind.Property
246+
case LSP.SymbolKind.Field:
247+
return LSP.CompletionItemKind.Field
248+
case LSP.SymbolKind.Constructor:
249+
return LSP.CompletionItemKind.Constructor
250+
case LSP.SymbolKind.Enum:
251+
return LSP.CompletionItemKind.Enum
252+
case LSP.SymbolKind.Interface:
253+
return LSP.CompletionItemKind.Interface
254+
case LSP.SymbolKind.Function:
255+
return LSP.CompletionItemKind.Function
256+
case LSP.SymbolKind.Variable:
257+
return LSP.CompletionItemKind.Variable
258+
case LSP.SymbolKind.Constant:
259+
return LSP.CompletionItemKind.Constant
260+
case LSP.SymbolKind.String:
261+
case LSP.SymbolKind.Number:
262+
case LSP.SymbolKind.Boolean:
263+
case LSP.SymbolKind.Array:
264+
case LSP.SymbolKind.Key:
265+
case LSP.SymbolKind.Null:
266+
return LSP.CompletionItemKind.Text
267+
case LSP.SymbolKind.Object:
268+
return LSP.CompletionItemKind.Module
269+
case LSP.SymbolKind.EnumMember:
270+
return LSP.CompletionItemKind.EnumMember
271+
case LSP.SymbolKind.Struct:
272+
return LSP.CompletionItemKind.Struct
273+
case LSP.SymbolKind.Event:
274+
return LSP.CompletionItemKind.Event
275+
case LSP.SymbolKind.Operator:
276+
return LSP.CompletionItemKind.Operator
277+
case LSP.SymbolKind.TypeParameter:
278+
return LSP.CompletionItemKind.TypeParameter
279+
default:
280+
return LSP.CompletionItemKind.Text
281+
}
282+
}
231283
}

‎server/yarn.lock

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,38 +63,38 @@ path-is-absolute@^1.0.0:
6363
version "1.0.1"
6464
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
6565

66-
tree-sitter-bash@^0.6.0:
67-
version "0.6.0"
68-
resolved "https://registry.yarnpkg.com/tree-sitter-bash/-/tree-sitter-bash-0.6.0.tgz#2f857b49e5fbce35504d3b6be33da18babc90d45"
66+
tree-sitter-bash@^0.11.0:
67+
version "0.11.0"
68+
resolved "https://registry.yarnpkg.com/tree-sitter-bash/-/tree-sitter-bash-0.11.0.tgz#ddc8c806da74f1d9d5bde53a6d6396cf26c57bab"
6969
dependencies:
7070
nan "^2.4.0"
7171

72-
tree-sitter@^0.10.0:
73-
version "0.10.0"
74-
resolved "https://registry.yarnpkg.com/tree-sitter/-/tree-sitter-0.10.0.tgz#576ab5d127cd3fe6af6bfb53808bddb2410f86bf"
72+
tree-sitter@^0.11.0:
73+
version "0.11.0"
74+
resolved "https://registry.yarnpkg.com/tree-sitter/-/tree-sitter-0.11.0.tgz#fb938603d94adf3820c7d1b56e9cd53bd0834d2d"
7575
dependencies:
7676
nan "^2.1.0"
7777

78-
vscode-jsonrpc@3.5.0:
79-
version "3.5.0"
80-
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
78+
vscode-jsonrpc@^3.6.0:
79+
version "3.6.1"
80+
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.1.tgz#3f9b8f902077da27f1ffd37c7317a77bd4696a49"
8181

82-
vscode-languageserver-protocol@3.5.1:
83-
version "3.5.1"
84-
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz#5144a3a9eeccbd83fe2745bd4ed75fad6cc45f0d"
82+
vscode-languageserver-protocol@^3.7.0:
83+
version "3.7.1"
84+
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.1.tgz#bb15ece97bc73bf8f0a02e9f358c4c61a7df4846"
8585
dependencies:
86-
vscode-jsonrpc "3.5.0"
87-
vscode-languageserver-types "3.5.0"
86+
vscode-jsonrpc "^3.6.0"
87+
vscode-languageserver-types "^3.7.0"
8888

89-
vscode-languageserver-types@3.5.0:
90-
version "3.5.0"
91-
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
89+
vscode-languageserver-types@^3.7.0:
90+
version "3.7.1"
91+
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.1.tgz#4835d1c1811f91dd5c92e9446e5b29edd2216969"
9292

93-
vscode-languageserver@^3.5.0:
94-
version "3.5.1"
95-
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz#e0044b7df4d2447ce12632dfc98f1ab0afacbdff"
93+
vscode-languageserver@^4.1.1:
94+
version "4.1.1"
95+
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.1.1.tgz#d49759fe58c240bcace7723dd828a054419db311"
9696
dependencies:
97-
vscode-languageserver-protocol "3.5.1"
97+
vscode-languageserver-protocol "^3.7.0"
9898
vscode-uri "^1.0.1"
9999

100100
vscode-uri@^1.0.1:

‎vscode-client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"postinstall": "node ./node_modules/vscode/bin/install"
3636
},
3737
"dependencies": {
38-
"vscode": "^1.1.13",
39-
"vscode-languageclient": "^4.0.0"
38+
"vscode": "^1.1.14",
39+
"vscode-languageclient": "^4.1.3"
4040
}
4141
}

‎vscode-client/yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,7 @@ vscode-jsonrpc@^3.6.0:
16701670
version "3.6.1"
16711671
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.1.tgz#3f9b8f902077da27f1ffd37c7317a77bd4696a49"
16721672

1673-
vscode-languageclient@^4.0.0:
1673+
vscode-languageclient@^4.1.3:
16741674
version "4.1.3"
16751675
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.1.3.tgz#65b0e068464261e9a02b3937833b5efe0068bf00"
16761676
dependencies:
@@ -1687,7 +1687,7 @@ vscode-languageserver-types@^3.7.0:
16871687
version "3.7.1"
16881688
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.1.tgz#4835d1c1811f91dd5c92e9446e5b29edd2216969"
16891689

1690-
vscode@^1.1.13:
1690+
vscode@^1.1.14:
16911691
version "1.1.14"
16921692
resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.14.tgz#f327f5fd45c085d12def616962af205b2bc75db5"
16931693
dependencies:

‎yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
version "22.2.2"
2121
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-22.2.2.tgz#afe5dacbd00d65325f52da0ed3e76e259629ac9d"
2222

23-
"@types/node@^9.4.7":
23+
"@types/node@^9.6.2":
2424
version "9.6.2"
2525
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.2.tgz#e49ac1adb458835e95ca6487bc20f916b37aff23"
2626

@@ -3398,7 +3398,7 @@ type-check@~0.3.2:
33983398
dependencies:
33993399
prelude-ls "~1.1.2"
34003400

3401-
typescript@^2.7.2:
3401+
typescript@^2.8.1:
34023402
version "2.8.1"
34033403
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
34043404

0 commit comments

Comments
 (0)