Merge branch 'master' into fix/windows-native-py3

1 files changed, 101 insertions, 65 deletions

diff --git a/settings.json b/settings.json
index 27d76d6..bf6c978 100644
--- a/settings.json
+++ b/settings.json
@@ -5,91 +5,109 @@
       "requires": []
     }
   ],
-  "cpp": [
+  "clojure": [
     {
-      "command": "clangd",
+      "command": "clojure-lsp",
       "requires": []
     }
   ],
-  "clojure": [
+  "cobol": [
     {
-      "command": "clojure-lsp",
+      "command": "cobol-language-support",
+      "requires": [
+        "java"
+      ]
+    }
+  ],
+  "cpp": [
+    {
+      "command": "clangd",
       "requires": []
     }
   ],
-  "typescript": [
+  "cs": [
     {
-      "command": "typescript-language-server",
+      "command": "omnisharp-lsp",
       "requires": [
         "npm"
       ]
     }
   ],
-  "javascript": [
+  "css": [
     {
-      "command": "javascript-typescript-langserver",
+      "command": "css-languageserver",
       "requires": [
         "npm"
       ]
-    },
+    }
+  ],
+  "dockerfile": [
     {
-      "command": "typescript-language-server",
+      "command": "docker-langserver",
       "requires": [
         "npm"
       ]
     }
   ],
-  "python": [
+  "elm": [
     {
-      "command": "pyls",
+      "command": "elm-language-server",
       "requires": [
-        "py"
+        "npm"
       ]
-    },
+    }
+  ],
+  "fortran": [
     {
-      "command": "pyls",
+      "command": "fortls",
       "requires": [
         "python3"
       ]
     }
   ],
-  "rust": [
+  "go": [
     {
-      "command": "rls",
+      "command": "gopls",
       "requires": [
-        "rustup"
+        "go"
       ]
     }
   ],
-  "go": [
+  "html": [
     {
-      "command": "gopls",
+      "command": "html-languageserver",
       "requires": [
-        "go"
+        "npm"
       ]
     }
   ],
-  "ruby": [
+  "java": [
     {
-      "command": "solargraph",
+      "command": "eclipse-jdt-ls",
       "requires": [
-        "gem"
+        "java"
       ]
     }
   ],
-  "php": [
+  "javascript": [
     {
-      "command": "intelephense",
+      "command": "javascript-typescript-langserver",
+      "requires": [
+        "npm"
+      ]
+    },
+    {
+      "command": "typescript-language-server",
       "requires": [
         "npm"
       ]
     }
   ],
-  "java": [
+  "json": [
     {
-      "command": "eclipse-jdt-ls",
+      "command": "json-languageserver",
       "requires": [
-        "java"
+        "npm"
       ]
     }
   ],
@@ -101,6 +119,14 @@
       ]
     }
   ],
+  "less": [
+    {
+      "command": "css-languageserver",
+      "requires": [
+        "npm"
+      ]
+    }
+  ],
   "lua": [
     {
       "command": "emmylua-ls",
@@ -109,103 +135,113 @@
       ]
     }
   ],
-  "vim": [
+  "php": [
     {
-      "command": "vim-language-server",
+      "command": "intelephense",
       "requires": [
         "npm"
       ]
     }
   ],
-  "html": [
+  "python": [
     {
-      "command": "html-languageserver",
+      "command": "pyls",
       "requires": [
-        "npm"
+        "py"
       ]
-    }
-  ],
-  "css": [
+    },
     {
-      "command": "css-languageserver",
+      "command": "pyls",
       "requires": [
-        "npm"
+        "python3"
       ]
     }
   ],
-  "cs": [
+  "reason": [
     {
-      "command": "omnisharp-lsp",
+      "command": "reason-language-server",
+      "requires": []
+    }
+  ],
+  "ruby": [
+    {
+      "command": "solargraph",
       "requires": [
-        "npm"
+        "gem"
       ]
     }
   ],
-  "terraform": [
+  "rust": [
     {
-      "command": "terraform-lsp",
+      "command": "rls",
       "requires": []
     }
   ],
-  "dockerfile": [
+  "sass": [
     {
-      "command": "docker-langserver",
+      "command": "css-languageserver",
       "requires": [
         "npm"
       ]
     }
   ],
-  "sh": [
+  "scala": [
     {
-      "command": "bash-language-server",
+      "command": "metals",
       "requires": [
-        "npm"
+        "java"
       ]
     }
   ],
-  "yaml": [
+  "sh": [
     {
-      "command": "yaml-language-server",
+      "command": "bash-language-server",
       "requires": [
         "npm"
       ]
     }
   ],
-  "xml": [
+  "swift": [
     {
-      "command": "lsp4xml",
+      "command": "sourcekit-lsp",
       "requires": [
-        "java"
+        "sourcekit-lsp"
       ]
     }
   ],
-  "fortran": [
+  "terraform": [
     {
-      "command": "fortls",
+      "command": "terraform-lsp",
+      "requires": []
+    }
+  ],
+  "typescript": [
+    {
+      "command": "typescript-language-server",
       "requires": [
-        "python3"
+        "npm"
       ]
     }
   ],
-  "scala": [
+  "vim": [
     {
-      "command": "metals",
+      "command": "vim-language-server",
       "requires": [
-        "java"
+        "npm"
       ]
     }
   ],
-  "elm": [
+  "xml": [
     {
-      "command": "elm-language-server",
+      "command": "lsp4xml",
       "requires": [
-        "npm"
+        "java"
       ]
     }
   ],
-  "json": [
+  "yaml": [
     {
-      "command": "json-languageserver",
+      "command": "yaml-language-server",
       "requires": [
         "npm"
       ]