Skip to content

Commit 5357682

Browse files
author
Loïc Mangeonjean
committed
cleanup: remove unused option
1 parent c555a77 commit 5357682

File tree

2 files changed

+8
-32
lines changed

2 files changed

+8
-32
lines changed

src/languageClientOptions.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import staticOptions, { StaticLanguageClientId } from './staticOptions'
55
import { MonacoLanguageClient } from './createLanguageClient'
66

77
export type LanguageClientOptions = Pick<BaseLanguageClientOptions, 'documentSelector' | 'synchronize' | 'initializationOptions' | 'middleware' | 'errorHandler'> & {
8-
vscodeExtensionIds?: string[]
98
defaultConfigurationOverride?: Record<string, unknown>
109
/**
1110
* Is this language server mutualizable by the CodinGame mutualized proxy

src/staticOptions.ts

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ const staticOptions = asLanguageClientOptionsById({
2727
pattern: '**/*.ts'
2828
}
2929
],
30-
mutualizable: true,
31-
vscodeExtensionIds: ['typescript-language-features', 'angular']
30+
mutualizable: true
3231
},
3332
bash: {
3433
documentSelector: [
@@ -47,15 +46,12 @@ const staticOptions = asLanguageClientOptionsById({
4746
],
4847
middleware: clangdHotfixMiddleware,
4948
mutualizable: false
50-
// The extension is cpptools BUT the language server is unable to use the client configuration (it requires client code)
51-
// vscodeExtensionIds: ['cpptools']
5249
},
5350
csharp: {
5451
documentSelector: [
5552
{ scheme: 'file', language: 'csharp' }
5653
],
5754
mutualizable: true,
58-
vscodeExtensionIds: ['omnisharp'],
5955
middleware: {
6056
async provideDefinition (document, position, token, next) {
6157
const definition = await next(document, position, token)
@@ -88,8 +84,6 @@ const staticOptions = asLanguageClientOptionsById({
8884
],
8985
middleware: clangdHotfixMiddleware,
9086
mutualizable: false
91-
// The extension is cpptools BUT the language server is unable to use the client configuration (it requires client code)
92-
// vscodeExtensionIds: ['cpptools']
9387
},
9488
clojure: {
9589
documentSelector: [
@@ -107,7 +101,6 @@ const staticOptions = asLanguageClientOptionsById({
107101
configurationSection: 'cobol-lsp'
108102
},
109103
mutualizable: false,
110-
vscodeExtensionIds: ['cobol'],
111104
defaultConfigurationOverride: {
112105
'cobol-lsp.subroutine-manager.paths-local': ['/tmp/project']
113106
},
@@ -126,8 +119,7 @@ const staticOptions = asLanguageClientOptionsById({
126119
language: 'dart'
127120
}
128121
],
129-
mutualizable: true,
130-
vscodeExtensionIds: ['dart']
122+
mutualizable: true
131123
},
132124
go: {
133125
documentSelector: [
@@ -138,7 +130,6 @@ const staticOptions = asLanguageClientOptionsById({
138130
{ language: 'tmpl', scheme: 'file' }
139131
],
140132
mutualizable: true,
141-
vscodeExtensionIds: ['vscode-go'],
142133
defaultConfigurationOverride: {
143134
gopls: {
144135
'ui.navigation.importShortcut': 'Definition'
@@ -152,8 +143,7 @@ const staticOptions = asLanguageClientOptionsById({
152143
synchronize: {
153144
configurationSection: 'groovy'
154145
},
155-
mutualizable: true,
156-
vscodeExtensionIds: ['vscode-groovy']
146+
mutualizable: true
157147
},
158148
java: {
159149
documentSelector: [
@@ -165,7 +155,6 @@ const staticOptions = asLanguageClientOptionsById({
165155
configurationSection: ['java', 'editor.insertSpaces', 'editor.tabSize']
166156
},
167157
mutualizable: true,
168-
vscodeExtensionIds: ['java'],
169158
async createAdditionalFeatures (client) {
170159
const { JavaExtensionFeature } = await import('./extensions/java')
171160
return [
@@ -198,8 +187,7 @@ const staticOptions = asLanguageClientOptionsById({
198187
language: 'javascript'
199188
}
200189
],
201-
mutualizable: true,
202-
vscodeExtensionIds: ['typescript-language-features']
190+
mutualizable: true
203191
},
204192
kotlin: {
205193
// https://github.com/fwcd/vscode-kotlin/blob/db5916080868a6a8e064c60d49624926c2fa61bd/src/languageSetup.ts#L104
@@ -221,7 +209,6 @@ const staticOptions = asLanguageClientOptionsById({
221209
configurationSection: 'Lua'
222210
},
223211
mutualizable: true,
224-
vscodeExtensionIds: ['lua'],
225212
defaultConfigurationOverride: {
226213
'Lua.runtime.version': 'Lua 5.4',
227214
'Lua.diagnostics.enable': true,
@@ -256,8 +243,6 @@ const staticOptions = asLanguageClientOptionsById({
256243
],
257244
middleware: clangdHotfixMiddleware,
258245
mutualizable: false
259-
// The extension is cpptools BUT the language server is unable to use the client configuration (it requires client code)
260-
// vscodeExtensionIds: ['cpptools']
261246
},
262247
'php-serenata': {
263248
// https://gitlab.com/Serenata/visual-studio-code-client/-/blob/master/src/extension.ts#L120
@@ -315,8 +300,7 @@ const staticOptions = asLanguageClientOptionsById({
315300
synchronize: {
316301
configurationSection: 'python'
317302
},
318-
mutualizable: true,
319-
vscodeExtensionIds: ['vscode-python']
303+
mutualizable: true
320304
},
321305
r: {
322306
// https://github.com/REditorSupport/vscode-R/blob/96ed4740101d8cd82f908b415df1dd205b4be824/src/languageService.ts#L186
@@ -328,7 +312,6 @@ const staticOptions = asLanguageClientOptionsById({
328312
configurationSection: 'r.lsp'
329313
},
330314
mutualizable: true,
331-
vscodeExtensionIds: ['vscode-R'],
332315
defaultConfigurationOverride: {
333316
'r.lsp.diagnostics': false
334317
}
@@ -341,16 +324,14 @@ const staticOptions = asLanguageClientOptionsById({
341324
}
342325
],
343326
synchronize: {},
344-
mutualizable: true,
345-
vscodeExtensionIds: ['typescript-language-features']
327+
mutualizable: true
346328
},
347329
ruby: {
348330
// https://github.com/castwide/vscode-solargraph/blob/3ebd9241f013305a84ec64334fca45b487bde904/src/language-client.ts#L56
349331
documentSelector: [
350332
{ scheme: 'file', language: 'ruby' }
351333
],
352334
mutualizable: true,
353-
vscodeExtensionIds: ['solargraph'],
354335
defaultConfigurationOverride: {
355336
'solargraph.diagnostics': true,
356337
'solargraph.formatting': true
@@ -374,7 +355,6 @@ const staticOptions = asLanguageClientOptionsById({
374355
configurationSection: 'metals'
375356
},
376357
mutualizable: false,
377-
vscodeExtensionIds: ['scalameta'],
378358
maxInitializeDuration: 60_000,
379359
readinessMessageMatcher: /compiled scala-project in/
380360
},
@@ -407,8 +387,7 @@ const staticOptions = asLanguageClientOptionsById({
407387
}
408388
],
409389
synchronize: {},
410-
mutualizable: true,
411-
vscodeExtensionIds: ['typescript-language-features']
390+
mutualizable: true
412391
},
413392
verilog: {
414393
documentSelector: [
@@ -418,7 +397,6 @@ const staticOptions = asLanguageClientOptionsById({
418397
}
419398
],
420399
mutualizable: false,
421-
vscodeExtensionIds: ['svlangserver'],
422400
defaultConfigurationOverride: {
423401
'systemverilog.linter': 'icarus',
424402
'systemverilog.launchConfiguration': 'iverilog -g2012 -t null'
@@ -433,8 +411,7 @@ const staticOptions = asLanguageClientOptionsById({
433411
}
434412
],
435413
synchronize: {},
436-
mutualizable: true,
437-
vscodeExtensionIds: ['typescript-language-features']
414+
mutualizable: true
438415
}
439416
})
440417

0 commit comments

Comments
 (0)