Skip to content

Commit b3de842

Browse files
author
sakuraash
committed
fix lsp setting
1 parent 97441f4 commit b3de842

File tree

1 file changed

+5
-34
lines changed

1 file changed

+5
-34
lines changed

app/settings.js

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -404,35 +404,22 @@ const settings = observable({
404404
_keys: ['projectType', 'sourcePath'],
405405
requireConfirm: true,
406406
confirmCallBack ([lang, path]) {
407-
const prevFolder = config._ROOT_URI_
408407
const prevLang = config.mainLanguage
409408
config.mainLanguage = lang
410409
if (path !== '/') {
411410
config._WORKSPACE_SUB_FOLDER_ = path
412411
config._ROOT_URI_ = `/data/coding-ide-home/workspace/${config.spaceKey}/working-dir${path}`
413412
}
414-
const client = LanguageState.clients.get(prevLang)
415-
if (client) {
416-
if (lang !== prevLang) {
413+
if (lang === prevLang) {
414+
const client = LanguageState.clients.get(prevLang)
415+
if (client) {
417416
client.destory().then(() => createLanguageClient(lang))
418417
} else {
419-
client.workSpaceFoldersChange({
420-
event: {
421-
added: [
422-
{
423-
uri: `file://${config._ROOT_URI_}`,
424-
name: `JAVA-PROJECT-FOLDER-${config._ROOT_URI_}`
425-
}
426-
],
427-
removed: [{ uri: `file://${prevFolder}`, name: `JAVA-PROJECT-FOLDER-${prevFolder}` }]
428-
}
429-
})
418+
createLanguageClient(lang)
430419
}
431420
} else {
432421
setLanguageServerOne({ type: lang, srcPath: path }).then((res) => {
433422
if (res.code === 0) {
434-
const prevFolder = config._ROOT_URI_
435-
const prevLang = config.mainLanguage
436423
config.mainLanguage = lang
437424
if (path !== '/') {
438425
config._WORKSPACE_SUB_FOLDER_ = path
@@ -442,23 +429,7 @@ const settings = observable({
442429
}
443430
const client = LanguageState.clients.get(prevLang)
444431
if (client) {
445-
if (lang !== prevLang) {
446-
client.destory().then(() => createLanguageClient(lang))
447-
} else {
448-
client.workSpaceFoldersChange({
449-
event: {
450-
added: [
451-
{
452-
uri: `file://${config._ROOT_URI_}`,
453-
name: `JAVA-PROJECT-FOLDER-${config._ROOT_URI_}`
454-
}
455-
],
456-
removed: [
457-
{ uri: `file://${prevFolder}`, name: `JAVA-PROJECT-FOLDER-${prevFolder}` }
458-
]
459-
}
460-
})
461-
}
432+
client.destory().then(() => createLanguageClient(lang))
462433
} else {
463434
createLanguageClient(lang)
464435
}

0 commit comments

Comments
 (0)