From 93c34311581ed9db125b1c41c87b8d3af7dc4c41 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Mon, 28 Dec 2020 17:32:20 -0800 Subject: Remove all installers and install logic --- lua/lspconfig/angularls.lua | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'lua/lspconfig/angularls.lua') diff --git a/lua/lspconfig/angularls.lua b/lua/lspconfig/angularls.lua index f579909f..c714b310 100644 --- a/lua/lspconfig/angularls.lua +++ b/lua/lspconfig/angularls.lua @@ -2,20 +2,6 @@ local configs = require 'lspconfig/configs' local util = require 'lspconfig/util' local server_name = 'angularls' -local bin_name = server_name -local install_loc = util.base_install_dir .. '/' .. server_name -local script_loc = install_loc .. '/node_modules/@angular/language-server/index.js' -local bin_loc = install_loc .. '/node_modules/.bin/angularls' - -local installer = util.npm_installer { - server_name = server_name; - packages = { '@angular/language-server' }; - binaries = { bin_name }; - -- angular-language-service doesn't expose a binary, so we create an execution wrapper. - post_install_script = - 'echo "#! /bin/sh\n' .. 'node ' .. script_loc .. ' \\$*' .. '" > ' .. bin_loc .. '\n' .. - 'chmod +x ' .. bin_loc; -} -- Angular requires a node_modules directory to probe for @angular/language-service and typescript -- in order to use your projects configured versions. @@ -31,7 +17,7 @@ local default_probe_dir = get_probe_dir(vim.fn.getcwd()) configs[server_name] = { default_config = { cmd = { - bin_loc, + 'angularls', '--stdio', '--tsProbeLocations', default_probe_dir, '--ngProbeLocations', default_probe_dir @@ -47,7 +33,7 @@ configs[server_name] = { -- We need to check our probe directories because they may have changed. new_config.cmd = { - bin_loc, + 'angularls', '--stdio', '--tsProbeLocations', new_probe_dir, '--ngProbeLocations', new_probe_dir @@ -57,16 +43,11 @@ configs[server_name] = { description = [[ https://github.com/angular/vscode-ng-language-service -`angular-language-server` can be installed via `:LspInstall angularls` - -If you prefer to install this yourself you can through npm `npm install @angular/language-server`. -Be aware there is no global binary and must be run via `node_modules/@angular/language-server/index.js` +`angular-language-server` can be installed via npm `npm install @angular/language-server`. +Be aware there is no global binary and must be run via `node_modules/@angular/language-server/index.js` which can be added as the default cmd. ]]; default_config = { root_dir = [[root_pattern("angular.json", ".git")]]; }; } } - -configs[server_name].install = installer.install -configs[server_name].install_info = installer.info -- cgit v1.2.3-70-g09d2