Merge pull request #469 from Coding/fix-lsp-default-setting

fix lsp setting

Author: xunfeng1980

.travis.yml

@@ -1,7 +1,7 @@
 dist: trusty
 language: node_js
 node_js:
-- '7'
+- '10.14.1'
 
 cache: yarn
 

app/commons/File/actions.js

@@ -95,7 +95,7 @@ export const fetchProjectRoot = registerAction('fs:init', () =>
     }
     fetchLanguageServerSetting(config.spaceKey).then((res) => {
       if (res.code === 0 && res.data) {
-        setLanguageSetting([res.data.default])
+        setLanguageSetting([res.data])
       } else {
         tryIdentificationWorkSpaceType(data)
           .then(setLanguageSetting)

app/components/MonacoEditor/state.js

@@ -67,8 +67,8 @@ class EditorInfo {
       this.languageMode = findLanguageByextensions(this.filePath.split('.').pop()).id
     }
     const model =
-      monaco.editor.getModel(monaco.Uri.parse(this.uri).toString()) ||
-      monaco.editor.createModel(this.content || '', this.languageMode, monaco.Uri.parse(this.uri))
+    monaco.editor.getModel(monaco.Uri.parse(this.uri).toString()) ||
+    monaco.editor.createModel(this.content || '', this.languageMode, monaco.Uri.parse(this.uri))
     this.uri = model.uri._formatted
     const monacoEditor = monaco.editor.create(
       this.monacoElement,

app/settings.js

@@ -404,35 +404,22 @@ const settings = observable({
     _keys: ['projectType', 'sourcePath'],
     requireConfirm: true,
     confirmCallBack ([lang, path]) {
-      const prevFolder = config._ROOT_URI_
       const prevLang = config.mainLanguage
       config.mainLanguage = lang
       if (path !== '/') {
         config._WORKSPACE_SUB_FOLDER_ = path
         config._ROOT_URI_ = `/data/coding-ide-home/workspace/${config.spaceKey}/working-dir${path}`
       }
-      const client = LanguageState.clients.get(prevLang)
-      if (client) {
-        if (lang !== prevLang) {
+      if (lang === prevLang) {
+        const client = LanguageState.clients.get(prevLang)
+        if (client) {
           client.destory().then(() => createLanguageClient(lang))
         } else {
-          client.workSpaceFoldersChange({
-            event: {
-              added: [
-                {
-                  uri: `file://${config._ROOT_URI_}`,
-                  name: `JAVA-PROJECT-FOLDER-${config._ROOT_URI_}`
-                }
-              ],
-              removed: [{ uri: `file://${prevFolder}`, name: `JAVA-PROJECT-FOLDER-${prevFolder}` }]
-            }
-          })
+          createLanguageClient(lang)
         }
       } else {
         setLanguageServerOne({ type: lang, srcPath: path }).then((res) => {
           if (res.code === 0) {
-            const prevFolder = config._ROOT_URI_
-            const prevLang = config.mainLanguage
             config.mainLanguage = lang
             if (path !== '/') {
               config._WORKSPACE_SUB_FOLDER_ = path
@@ -442,23 +429,7 @@ const settings = observable({
             }
             const client = LanguageState.clients.get(prevLang)
             if (client) {
-              if (lang !== prevLang) {
-                client.destory().then(() => createLanguageClient(lang))
-              } else {
-                client.workSpaceFoldersChange({
-                  event: {
-                    added: [
-                      {
-                        uri: `file://${config._ROOT_URI_}`,
-                        name: `JAVA-PROJECT-FOLDER-${config._ROOT_URI_}`
-                      }
-                    ],
-                    removed: [
-                      { uri: `file://${prevFolder}`, name: `JAVA-PROJECT-FOLDER-${prevFolder}` }
-                    ]
-                  }
-                })
-              }
+              client.destory().then(() => createLanguageClient(lang))
             } else {
               createLanguageClient(lang)
             }