Merge branch 'master' into bugfix/update-document-symbol-request

sublimelsp · Feb 28, 2019 · 1a6a3fc · 1a6a3fc
2 parents 48663f9 + ee2211a
commit 1a6a3fc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/LSP.sublime-settings b/LSP.sublime-settings
@@ -48,7 +48,17 @@
       "command": ["pyls"],
       "scopes": ["source.python"],
       "syntaxes": ["Packages/Python/Python.sublime-syntax", "Packages/Djaneiro/Syntaxes/Python Django.tmLanguage"],
-      "languageId": "python"
+      "languageId": "python",
+      // "settings": {
+      //   "pyls": {
+      //       "configurationSources": ["flake8"],
+      //       "plugins": {
+      //           "pyflakes": {
+      //               "enabled": false
+      //           }
+      //       },
+      //   }
+      // },
     },
     "rls":
     {

diff --git a/docs/index.md b/docs/index.md
@@ -161,16 +161,16 @@ See: [github:felixfbecker/php-language-server](https://github.com/felixfbecker/p
 
 #### Intelephense
 
-See [bmewburn/intelephense-server/](https://github.com/bmewburn/intelephense-server/)
+See [bmewburn/intelephense-docs](https://github.com/bmewburn/intelephense-docs)
 
 ```json
  "intelephense-ls":
   {
-      // npm i -g intelephense-server
+      // npm i -g intelephense
       "enabled": true,
       "command": [
           "node",
-          "PATH_TO_GLOBAL_NODE_MODULES/intelephense-server/lib/server.js",
+          "PATH_TO_GLOBAL_NODE_MODULES/intelephense/lib/intelephense.js",
           "--stdio",
       ],
       "scopes": ["source.php", "embedding.php"],