add javascript && typescript lsp

Author: sakuraash

app/commons/File/actions.js

@@ -96,7 +96,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.default])
       } else {
         tryIdentificationWorkSpaceType(data)
           .then(setLanguageSetting)

app/components/MonacoEditor/MonacoReact/BaseEditor.jsx

@@ -105,7 +105,7 @@ class MonacoEditor extends React.PureComponent {
         if (!model) {
           model = monaco.editor.createModel(
             content,
-            lowerCase(this.language),
+            this.language.toLowerCase(),
             monaco.Uri.parse(path.startsWith('jdt://') || path.startsWith('omnisharp-metadata') ? path : `file://${languageClient._ROOT_URI_}${path}`)
           )
           this.uri = path.startsWith('jdt://') || path.startsWith('omnisharp-metadata') ? path : `file://${languageClient._ROOT_URI_}${path}`
@@ -118,17 +118,17 @@ class MonacoEditor extends React.PureComponent {
         monacoEditor.setModel(model)
         const { client, openeduri } = languageClient
         if (client && client.state === 3 && this.props.active && this.didmount) {
-          if (!openeduri.get(path)) {
-            languageClient.openTextDocument({
-              textDocument: {
-                uri: path.startsWith('jdt://') || path.startsWith('omnisharp-metadata') ? path : `file://${languageClient._ROOT_URI_}${path}`,
-                languageId: lowerCase(this.language),
-                text: content,
-                version: 1,
-              }
-            })
-            openeduri.set(path, content)
-          }
+          // if (!openeduri.get(path)) {
+          //   languageClient.openTextDocument({
+          //     textDocument: {
+          //       uri: path.startsWith('jdt://') || path.startsWith('omnisharp-metadata') ? path : `file://${languageClient._ROOT_URI_}${path}`,
+          //       languageId: this.language.toLowerCase(),
+          //       text: content,
+          //       version: 1,
+          //     }
+          //   })
+          //   openeduri.set(path, content)
+          // }
         }
       }
     })

app/components/MonacoEditor/codeEditorService.js

@@ -57,7 +57,7 @@ class CodeEditorService {
   openCodeEditor (input, source) {
     toDefinition(input)
     const editor = this.doOpenEditor(source, input)
-    return monaco.Promise.as(editor)
+    return monaco.Promise.as(null)
   }
 }
 

app/components/MonacoEditor/utils/languages.js

@@ -9,8 +9,9 @@ export default [
 export const supportLangServer = [
   { lang: 'Java', files: ['pom.xml', 'settings.gradle', 'build.gradle'], file: 'pom.xml' },
   { lang: 'Python', files: ['requirements.txt'], file: 'requirements.txt' },
-  // { lang: 'TypeScript', files: ['package.json'], file: 'package.json' },
-  { lang: 'C#', files: ['workspace.csproj'] },
+  { lang: 'TypeScript', files: ['package.json', 'tslint.json', 'tsconfig.json'], file: 'package.json' },
+  { lang: 'JavaScript', files: ['package.json', 'eslint.json', 'tsconfig.json'], file: 'package.json' },
+  // { lang: 'C#', files: ['workspace.csproj'] },
 ]
 
 export const documentSelectors = [

app/settings.js

@@ -11,7 +11,6 @@ import FolderSelector from 'components/Setting/FolderSelector'
 import { supportLangServer } from 'components/MonacoEditor/utils/languages'
 import { dismissModal } from 'components/Modal/actions'
 import { setLanguageServerOne, fetchLanguageServerSetting } from 'backendAPI/languageServerAPI'
-// import { projectState } from 'components/Setting/state'
 
 let LanguageState
 import('components/MonacoEditor/LanguageClientState').then(res => LanguageState = res.default)
@@ -34,11 +33,6 @@ const localStorage = window.localStorage
 let EditorState
 import('components/Editor/state').then(res => EditorState = res.default)
 
-const typeOptions = [
-  { name: 'Blank', value: 'blank' },
-  { name: 'Java', value: 'javac' }
-]
-
 if (JSON.parse(localStorage.getItem('switchOldEditor')) === null) {
   localStorage.setItem('switchOldEditor', false)
 }