diff options
| author | Scott Little <50145141+CodeLongAndProsper90@users.noreply.github.com> | 2021-09-08 11:37:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 09:37:54 -0700 |
| commit | 9e8494b077536e8bb9b5dd6eadb8d7fa167633d9 (patch) | |
| tree | a7db15428da7b6ef3a0eb240ad1cab007e07bcc0 /lua | |
| parent | [docgen] Update CONFIG.md (diff) | |
| download | nvim-lspconfig-9e8494b077536e8bb9b5dd6eadb8d7fa167633d9.tar nvim-lspconfig-9e8494b077536e8bb9b5dd6eadb8d7fa167633d9.tar.gz nvim-lspconfig-9e8494b077536e8bb9b5dd6eadb8d7fa167633d9.tar.bz2 nvim-lspconfig-9e8494b077536e8bb9b5dd6eadb8d7fa167633d9.tar.lz nvim-lspconfig-9e8494b077536e8bb9b5dd6eadb8d7fa167633d9.tar.xz nvim-lspconfig-9e8494b077536e8bb9b5dd6eadb8d7fa167633d9.tar.zst nvim-lspconfig-9e8494b077536e8bb9b5dd6eadb8d7fa167633d9.zip | |
feat(dartls): respect FLUTTER_SDK (#1097)
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lspconfig/dartls.lua | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lua/lspconfig/dartls.lua b/lua/lspconfig/dartls.lua index aaf9dcc3..9eff5436 100644 --- a/lua/lspconfig/dartls.lua +++ b/lua/lspconfig/dartls.lua @@ -5,10 +5,13 @@ local server_name = 'dartls' local bin_name = 'dart' local find_dart_sdk_root_path = function() - if vim.fn['executable'] 'flutter' == 1 then + if os.getenv 'FLUTTER_SDK' then + local flutter_path = os.getenv 'FLUTTER_SDK' + return util.path.path_join(flutter_path, 'cache', 'dart-sdk', 'bin', 'dart') + 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') - return flutter_bin .. '/cache/dart-sdk/bin/dart' + return util.path.path_join(flutter_bin, 'cache', 'dart-sdk', 'bin', 'dart') elseif vim.fn['executable'] 'dart' == 1 then return vim.fn['resolve'](vim.fn['exepath'] 'dart') else @@ -18,7 +21,7 @@ end local analysis_server_snapshot_path = function() local dart_sdk_root_path = vim.fn['fnamemodify'](find_dart_sdk_root_path(), ':h') - local snapshot = dart_sdk_root_path .. '/snapshots/analysis_server.dart.snapshot' + local snapshot = util.path.path_join(dart_sdk_root_path, 'snapshots', 'analysis_server.dart.snapshot') if vim.fn['has'] 'win32' == 1 or vim.fn['has'] 'win64' == 1 then snapshot = snapshot:gsub('/', '\\') |