Merge pull request #242 from h-michael/docgen

18 files changed, 56 insertions, 47 deletions

diff --git a/README.md b/README.md
index 8a1b60f5..231439da 100644
--- a/README.md
+++ b/README.md
@@ -970,11 +970,11 @@ This server accepts configuration via the `settings` key.
 
 - **`dart.debugExternalLibraries`**: `boolean`
 
-  Whether to mark external pub package libraries as debuggable, enabling stepping into them while debugging.
+  Whether to mark external pub package libraries (including package:flutter) as debuggable, enabling stepping into them while debugging.
 
 - **`dart.debugSdkLibraries`**: `boolean`
 
-  Whether to mark SDK libraries as debuggable, enabling stepping into them while debugging.
+  Whether to mark Dart SDK libraries (dart:*) as debuggable, enabling stepping into them while debugging.
 
 - **`dart.devToolsLogFile`**: `null|string`
 
@@ -1892,6 +1892,14 @@ require'nvim_lsp'.html.setup{}
     capabilities = {
       offsetEncoding = { "utf-8", "utf-16" },
       textDocument = {
+        codeAction = {
+          codeActionLiteralSupport = {
+            codeActionKind = {
+              valueSet = {}
+            }
+          },
+          dynamicRegistration = false
+        },
         completion = {
           completionItem = {
             commitCharactersSupport = false,
@@ -2053,6 +2061,14 @@ require'nvim_lsp'.jsonls.setup{}
     capabilities = {
       offsetEncoding = { "utf-8", "utf-16" },
       textDocument = {
+        codeAction = {
+          codeActionLiteralSupport = {
+            codeActionKind = {
+              valueSet = {}
+            }
+          },
+          dynamicRegistration = false
+        },
         completion = {
           completionItem = {
             commitCharactersSupport = false,
@@ -2314,8 +2330,6 @@ This server accepts configuration via the `settings` key.
 
 - **`julia.useCustomSysimage`**: `boolean`
 
-  Default: `"false"`
-  
   Use an existing custom sysimage when starting the REPL
 
 - **`julia.usePlotPane`**: `boolean`
@@ -2983,6 +2997,14 @@ require'nvim_lsp'.purescriptls.setup{}
     capabilities = {
       offsetEncoding = { "utf-8", "utf-16" },
       textDocument = {
+        codeAction = {
+          codeActionLiteralSupport = {
+            codeActionKind = {
+              valueSet = {}
+            }
+          },
+          dynamicRegistration = false
+        },
         completion = {
           completionItem = {
             commitCharactersSupport = false,
@@ -3908,6 +3930,14 @@ require'nvim_lsp'.rust_analyzer.setup{}
     capabilities = {
       offsetEncoding = { "utf-8", "utf-16" },
       textDocument = {
+        codeAction = {
+          codeActionLiteralSupport = {
+            codeActionKind = {
+              valueSet = {}
+            }
+          },
+          dynamicRegistration = false
+        },
         completion = {
           completionItem = {
             commitCharactersSupport = false,
@@ -4004,7 +4034,7 @@ This server accepts configuration via the `settings` key.
 
   Default: `"bundle"`
   
-  Path to the bundle executable, defaults to 'bundle'
+  Path to the bundle executable, defaults to 'bundle'. Needs to be an absolute path for the 'bundle' exec/shim
 
 - **`solargraph.checkGemVersion`**: `enum { true, false }`
 
@@ -4777,6 +4807,14 @@ require'nvim_lsp'.yamlls.setup{}
     capabilities = {
       offsetEncoding = { "utf-8", "utf-16" },
       textDocument = {
+        codeAction = {
+          codeActionLiteralSupport = {
+            codeActionKind = {
+              valueSet = {}
+            }
+          },
+          dynamicRegistration = false
+        },
         completion = {
           completionItem = {
             commitCharactersSupport = false,
diff --git a/lua/nvim_lsp/als.lua b/lua/nvim_lsp/als.lua
index 33e44ec8..60605718 100755
--- a/lua/nvim_lsp/als.lua
+++ b/lua/nvim_lsp/als.lua
@@ -74,7 +74,6 @@ configs[server_name] = {
     installer.configure(config)
   end;
   docs = {
-    vscode = "AdaCore.ada";
     package_json = "https://raw.githubusercontent.com/AdaCore/ada_language_server/master/integration/vscode/ada/package.json";
     description = [[
 https://github.com/AdaCore/ada_language_server
diff --git a/lua/nvim_lsp/ccls.lua b/lua/nvim_lsp/ccls.lua
index 43d26722..67b65eda 100644
--- a/lua/nvim_lsp/ccls.lua
+++ b/lua/nvim_lsp/ccls.lua
@@ -8,7 +8,7 @@ configs.ccls = {
     root_dir = util.root_pattern("compile_commands.json", "compile_flags.txt", ".git");
   };
   docs = {
-    vscode = "ccls-project.ccls";
+    package_json = "https://raw.githubusercontent.com/MaskRay/vscode-ccls/master/package.json";
     description = [[
 https://github.com/MaskRay/ccls/wiki
 
diff --git a/lua/nvim_lsp/dartls.lua b/lua/nvim_lsp/dartls.lua
index 01581a13..1f059bc5 100644
--- a/lua/nvim_lsp/dartls.lua
+++ b/lua/nvim_lsp/dartls.lua
@@ -47,7 +47,7 @@ configs[server_name] = {
     };
   };
   docs = {
-    vscode = "Dart-Code.dart-code";
+    package_json = "https://raw.githubusercontent.com/Dart-Code/Dart-Code/master/package.json";
     description = [[
 https://github.com/dart-lang/sdk/tree/master/pkg/analysis_server/tool/lsp_spec
 
diff --git a/lua/nvim_lsp/elmls.lua b/lua/nvim_lsp/elmls.lua
index 15ce4e7d..94e1b25d 100644
--- a/lua/nvim_lsp/elmls.lua
+++ b/lua/nvim_lsp/elmls.lua
@@ -51,7 +51,7 @@ configs[server_name] = {
     end
   end;
   docs = {
-    vscode = "Elmtooling.elm-ls-vscode";
+    package_json = "https://raw.githubusercontent.com/elm-tooling/elm-language-client-vscode/master/package.json";
     description = [[
 https://github.com/elm-tooling/elm-language-server#installation
 
diff --git a/lua/nvim_lsp/fortls.lua b/lua/nvim_lsp/fortls.lua
index 54d26a45..a94e4dd3 100644
--- a/lua/nvim_lsp/fortls.lua
+++ b/lua/nvim_lsp/fortls.lua
@@ -11,7 +11,7 @@ configs.fortls = {
     };
   };
   docs = {
-    vscode = 'hansec.fortran-ls';
+    package_json = "https://raw.githubusercontent.com/hansec/vscode-fortran-ls/master/package.json";
     description = [[
 https://github.com/hansec/fortran-language-server
 
diff --git a/lua/nvim_lsp/ghcide.lua b/lua/nvim_lsp/ghcide.lua
index 5ec8d583..ee801de6 100644
--- a/lua/nvim_lsp/ghcide.lua
+++ b/lua/nvim_lsp/ghcide.lua
@@ -9,7 +9,7 @@ configs.ghcide = {
   };
 
   docs = {
-    vscode = "DigitalAssetHoldingsLLC.ghcide";
+    package_json = "https://raw.githubusercontent.com/digital-asset/ghcide/master/extension/package.json";
     description = [[
 https://github.com/digital-asset/ghcide
 
diff --git a/lua/nvim_lsp/hie.lua b/lua/nvim_lsp/hie.lua
index 21c62d24..ef3b0d92 100644
--- a/lua/nvim_lsp/hie.lua
+++ b/lua/nvim_lsp/hie.lua
@@ -9,7 +9,7 @@ configs.hie = {
   };
 
   docs = {
-    vscode = "alanz.vscode-hie-server";
+    package_json = "https://raw.githubusercontent.com/alanz/vscode-hie-server/master/package.json";
     description = [[
 https://github.com/haskell/haskell-ide-engine
 
diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua
index a5a96637..947fdea1 100644
--- a/lua/nvim_lsp/julials.lua
+++ b/lua/nvim_lsp/julials.lua
@@ -17,7 +17,7 @@ configs.julials = {
     end;
   };
   docs = {
-    vscode = "julialang.language-julia";
+    package_json = "https://raw.githubusercontent.com/julia-vscode/julia-vscode/master/package.json";
     description = [[
 https://github.com/julia-vscode/julia-vscode
 `LanguageServer.jl` can be installed via `:LspInstall julials` or by yourself the `julia` and `Pkg`:
diff --git a/lua/nvim_lsp/leanls.lua b/lua/nvim_lsp/leanls.lua
index 13400297..894f318b 100644
--- a/lua/nvim_lsp/leanls.lua
+++ b/lua/nvim_lsp/leanls.lua
@@ -8,7 +8,7 @@ configs.leanls = {
     root_dir = util.root_pattern(".git");
   };
   docs = {
-    vscode = "jroesch.lean";
+    package_json = "https://raw.githubusercontent.com/leanprover/vscode-lean/master/package.json";
     description = [[
 https://github.com/leanprover/lean-client-js/tree/master/lean-language-server
 
diff --git a/lua/nvim_lsp/nimls.lua b/lua/nvim_lsp/nimls.lua
index 2e10eb97..5e91c760 100644
--- a/lua/nvim_lsp/nimls.lua
+++ b/lua/nvim_lsp/nimls.lua
@@ -10,7 +10,7 @@ configs.nimls = {
     end;
   };
   docs = {
-    vscode = "kosz78.nim";
+    package_json = "https://raw.githubusercontent.com/pragmagic/vscode-nim/master/package.json";
     description = [[
 https://github.com/PMunch/nimlsp
 `nimlsp` can be installed via `:LspInstall nimls` or by yourself the `nimble` package manager:
diff --git a/lua/nvim_lsp/purescriptls.lua b/lua/nvim_lsp/purescriptls.lua
index 82d8c1bc..d42c79bb 100644
--- a/lua/nvim_lsp/purescriptls.lua
+++ b/lua/nvim_lsp/purescriptls.lua
@@ -27,7 +27,7 @@ configs[server_name] = {
     end
   end;
   docs = {
-    vscode = "nwolverson.ide-purescript";
+    package_json = "https://raw.githubusercontent.com/nwolverson/vscode-ide-purescript/master/package.json";
     description = [[
 https://github.com/nwolverson/purescript-language-server
 `purescript-language-server` can be installed via `:LspInstall purescriptls` or by yourself with `npm`
diff --git a/lua/nvim_lsp/rls.lua b/lua/nvim_lsp/rls.lua
index f563b7b8..bf02986b 100644
--- a/lua/nvim_lsp/rls.lua
+++ b/lua/nvim_lsp/rls.lua
@@ -8,7 +8,6 @@ configs.rls = {
     root_dir = util.root_pattern("Cargo.toml");
   };
   docs = {
-    vscode = "rust-lang.rust";
     package_json = "https://raw.githubusercontent.com/rust-lang/rls-vscode/master/package.json";
     description = [[
 https://github.com/rust-lang/rls
diff --git a/lua/nvim_lsp/solargraph.lua b/lua/nvim_lsp/solargraph.lua
index 51de52ce..9532f21a 100644
--- a/lua/nvim_lsp/solargraph.lua
+++ b/lua/nvim_lsp/solargraph.lua
@@ -8,7 +8,6 @@ configs.solargraph = {
     root_dir = util.root_pattern("Gemfile", ".git");
   };
   docs = {
-    vscode = "castwide.solargraph";
     package_json = "https://raw.githubusercontent.com/castwide/vscode-solargraph/master/package.json";
     description = [[
 https://solargraph.org/
diff --git a/lua/nvim_lsp/sumneko_lua.lua b/lua/nvim_lsp/sumneko_lua.lua
index e3d0cacc..0342462a 100644
--- a/lua/nvim_lsp/sumneko_lua.lua
+++ b/lua/nvim_lsp/sumneko_lua.lua
@@ -103,7 +103,7 @@ configs[name] = {
     installer.configure(config)
   end;
   docs = {
-    vscode = "sumneko.lua";
+    package_json = "https://raw.githubusercontent.com/sumneko/vscode-lua/master/package.json";
     description = [[
 https://github.com/sumneko/lua-language-server
 
diff --git a/lua/nvim_lsp/terraformls.lua b/lua/nvim_lsp/terraformls.lua
index 3f94a036..a93113e1 100644
--- a/lua/nvim_lsp/terraformls.lua
+++ b/lua/nvim_lsp/terraformls.lua
@@ -8,7 +8,7 @@ configs.terraformls = {
     root_dir = util.root_pattern(".terraform", ".git");
   };
   docs = {
-    vscode = "mauve.terraform";
+    package_json = "https://raw.githubusercontent.com/hashicorp/vscode-terraform/master/package.json";
     description = [[
 https://github.com/juliosueiras/terraform-lsp
 
diff --git a/lua/nvim_lsp/yamlls.lua b/lua/nvim_lsp/yamlls.lua
index 5b1c9f82..fbe9950f 100644
--- a/lua/nvim_lsp/yamlls.lua
+++ b/lua/nvim_lsp/yamlls.lua
@@ -27,7 +27,7 @@ configs[server_name] = {
     end
   end;
   docs = {
-    vscode = "redhat.vscode-yaml";
+    package_json = "https://raw.githubusercontent.com/redhat-developer/vscode-yaml/master/package.json";
     description = [[
 https://github.com/redhat-developer/yaml-language-server
 
diff --git a/scripts/docgen.lua b/scripts/docgen.lua
index 21b9a7f8..331f0723 100644
--- a/scripts/docgen.lua
+++ b/scripts/docgen.lua
@@ -136,32 +136,6 @@ local function make_lsp_sections()
         end;
         function()
           local package_json_name = util.path.join(tempdir, template_name..'.package.json');
-          if docs.vscode then
-            docs.vspackage = util.format_vspackage_url(docs.vscode)
-          end
-          if docs.vspackage then
-            for i = 1, 5 do
-              local script = [[
-              curl -L -o {{vspackage_name}} {{vspackage_url}}
-              gzip -d {{vspackage_name}}
-              unzip -j {{vspackage_zip}} extension/package.json
-              mv package.json {{package_json_name}}
-              ]]
-              os.execute(template(script, {
-                package_json_name = package_json_name;
-                vspackage_name = util.path.join(tempdir, template_name..'.vspackage.zip.gz');
-                vspackage_zip = util.path.join(tempdir, template_name..'.vspackage.zip');
-                vspackage_url = docs.vspackage;
-              }))
-              if util.path.is_file(package_json_name) then
-                docs.package_json = true
-                break
-              else
-                print(string.format("Failed to download vspackage for %q at %q", template_name, docs.vspackage))
-                vim.api.nvim_command("sleep "..math.random(0, i))
-              end
-            end
-          end
           if docs.package_json then
             if not util.path.is_file(package_json_name) then
               os.execute(string.format("curl -L -o %q %q", package_json_name, docs.package_json))