aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirokazu Hata <h.hata.ai.t@gmail.com>2020-02-23 09:30:36 +0900
committerHirokazu Hata <h.hata.ai.t@gmail.com>2020-02-23 09:30:36 +0900
commitdfbe07edfc9f3b6001de7a2b4a78898ad7c2d84a (patch)
tree5b4c28e1cbb70d2b809158893565945ecd749f64
parent[docgen] Update README.md (diff)
downloadnvim-lspconfig-dfbe07edfc9f3b6001de7a2b4a78898ad7c2d84a.tar
nvim-lspconfig-dfbe07edfc9f3b6001de7a2b4a78898ad7c2d84a.tar.gz
nvim-lspconfig-dfbe07edfc9f3b6001de7a2b4a78898ad7c2d84a.tar.bz2
nvim-lspconfig-dfbe07edfc9f3b6001de7a2b4a78898ad7c2d84a.tar.lz
nvim-lspconfig-dfbe07edfc9f3b6001de7a2b4a78898ad7c2d84a.tar.xz
nvim-lspconfig-dfbe07edfc9f3b6001de7a2b4a78898ad7c2d84a.tar.zst
nvim-lspconfig-dfbe07edfc9f3b6001de7a2b4a78898ad7c2d84a.zip
dartls: remove calling error in detecting cmd
ref: #140
-rw-r--r--.github/workflows/docgen.yml7
-rw-r--r--lua/nvim_lsp/dartls.lua14
2 files changed, 4 insertions, 17 deletions
diff --git a/.github/workflows/docgen.yml b/.github/workflows/docgen.yml
index 4f24a6e6..38ecffa4 100644
--- a/.github/workflows/docgen.yml
+++ b/.github/workflows/docgen.yml
@@ -7,13 +7,6 @@ jobs:
runs-on: [ubuntu-latest]
if: github.ref != 'master'
steps:
- - name: Setup Dart
- run: |
- sudo apt install apt-transport-https
- sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -'
- sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
- sudo apt update
- sudo apt install dart
- uses: actions/checkout@v2
- run: date +%F > todays-date
- name: Restore cache for today's nightly.
diff --git a/lua/nvim_lsp/dartls.lua b/lua/nvim_lsp/dartls.lua
index 1f059bc5..5093294d 100644
--- a/lua/nvim_lsp/dartls.lua
+++ b/lua/nvim_lsp/dartls.lua
@@ -10,12 +10,10 @@ local find_dart_sdk_root_path = function()
elseif vim.fn["executable"]("flutter") == 1 then
local flutter_path = vim.fn["resolve"](vim.fn["exepath"]("flutter"))
local flutter_bin = vim.fn["fnamemodify"](flutter_path, ":h")
- local dart_sdk_root_path = flutter_bin.."/cache/dart-sdk/bin/dart"
- if vim.fn["executable"](dart_sdk_root_path) == 1 then
- return dart_sdk_root_path
- end
+ return flutter_bin.."/cache/dart-sdk/bin/dart"
+ else
+ return ''
end
- error("[LSP] Could not find Dart SDK root path")
end
local analysis_server_snapshot_path = function()
@@ -26,11 +24,7 @@ local analysis_server_snapshot_path = function()
snapshot = snapshot:gsub("/", "\\")
end
- if vim.fn["filereadable"](snapshot) == 1 then
- return snapshot
- else
- error("[LSP] Could not find analysis server snapshot")
- end
+ return snapshot
end
configs[server_name] = {