From be98522b631e2a41e72bfae076ec3762c0d74c75 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Mon, 3 Feb 2020 09:54:55 +0900 Subject: Add powershell-languageserver --- installer/install-powershell-languageserver.cmd | 17 +++++++++++++++++ settings.json | 8 ++++++++ settings/powershell-languageserver.vim | 13 +++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 installer/install-powershell-languageserver.cmd create mode 100644 settings/powershell-languageserver.vim diff --git a/installer/install-powershell-languageserver.cmd b/installer/install-powershell-languageserver.cmd new file mode 100644 index 0000000..a9e3cc0 --- /dev/null +++ b/installer/install-powershell-languageserver.cmd @@ -0,0 +1,17 @@ +@echo off + +curl -o PowerShellEditorServices.zip "https://github.com/PowerShell/PowerShellEditorServices/releases/download/2.0.0-preview.8/PowerShellEditorServices.zip" +call "%~dp0\run_unzip.cmd" PowerShellEditorServices.zip +del PowerShellEditorServices.zip + +echo @echo off ^ + +setlocal ^ + +set PSES_BUNDLE_PATH=%%~dp0PowerShellEditorServices ^ + +set SESSION_TEMP_PATH=%%~dp0session ^ + +powershell -NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command "%%PSES_BUNDLE_PATH:\=/%%/PowerShellEditorServices/Start-EditorServices.ps1 -BundledModulesPath %%PSES_BUNDLE_PATH:\=/%% -LogPath %%SESSION_TEMP_PATH:\=/%%/logs.log -SessionDetailsPath %%SESSION_TEMP_PATH:\=/%%/session.json -FeatureFlags @() -AdditionalModules @() -HostName 'My Client' -HostProfileId 'myclient' -HostVersion 1.0.0 -Stdio -LogLevel Normal" ^ + +> powershell-languageserver.cmd diff --git a/settings.json b/settings.json index d7bf7bd..a90989a 100644 --- a/settings.json +++ b/settings.json @@ -342,6 +342,14 @@ ] } ], + "ps1": [ + { + "command": "powershell-languageserver", + "requires": [ + "powershell" + ] + } + ], "python": [ { "command": "pyls", diff --git a/settings/powershell-languageserver.vim b/settings/powershell-languageserver.vim new file mode 100644 index 0000000..380a7ba --- /dev/null +++ b/settings/powershell-languageserver.vim @@ -0,0 +1,13 @@ +augroup vimlsp_settings_powershell_languageserver + au! + LspRegisterServer { + \ 'name': 'powershell-languageserver', + \ 'cmd': {server_info->lsp_settings#get('powershell-languageserver', 'cmd', [lsp_settings#exec_path('powershell-languageserver')])}, + \ 'root_uri':{server_info->lsp_settings#get('powershell-languageserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'initialization_options': lsp_settings#get('powershell-languageserver', 'initialization_options', v:null), + \ 'whitelist': lsp_settings#get('powershell-languageserver', 'whitelist', ['ps1']), + \ 'blacklist': lsp_settings#get('powershell-languageserver', 'blacklist', []), + \ 'config': lsp_settings#get('powershell-languageserver', 'config', {}), + \ 'workspace_config': lsp_settings#get('powershell-languageserver', 'workspace_config', {}), + \ } +augroup END -- cgit v1.2.3-54-g00ecf From 0cfdb045bcc9664dbafd41d72aa49ac58c7105e2 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Mon, 3 Feb 2020 10:03:01 +0900 Subject: Add plugin suggestion --- settings.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/settings.json b/settings.json index a90989a..4787e08 100644 --- a/settings.json +++ b/settings.json @@ -347,7 +347,13 @@ "command": "powershell-languageserver", "requires": [ "powershell" - ] + ], + "vim-plugin": { + "extensions": [ + "ps1" + ], + "name": "PProvost/vim-ps1" + } } ], "python": [ -- cgit v1.2.3-54-g00ecf From 3a0970d7afa93bcfcbca7c0cdda837916b5ea6a7 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Mon, 3 Feb 2020 10:36:38 +0900 Subject: Add installer for pwsh --- installer/install-powershell-languageserver.cmd | 3 ++- installer/install-powershell-languageserver.sh | 19 +++++++++++++++++++ settings.json | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 installer/install-powershell-languageserver.sh diff --git a/installer/install-powershell-languageserver.cmd b/installer/install-powershell-languageserver.cmd index a9e3cc0..ae63ef4 100644 --- a/installer/install-powershell-languageserver.cmd +++ b/installer/install-powershell-languageserver.cmd @@ -1,8 +1,9 @@ @echo off -curl -o PowerShellEditorServices.zip "https://github.com/PowerShell/PowerShellEditorServices/releases/download/2.0.0-preview.8/PowerShellEditorServices.zip" +curl -L -o PowerShellEditorServices.zip "https://github.com/PowerShell/PowerShellEditorServices/releases/download/2.0.0-preview.8/PowerShellEditorServices.zip" call "%~dp0\run_unzip.cmd" PowerShellEditorServices.zip del PowerShellEditorServices.zip +mkdir %~dp0session echo @echo off ^ diff --git a/installer/install-powershell-languageserver.sh b/installer/install-powershell-languageserver.sh new file mode 100755 index 0000000..f9f823f --- /dev/null +++ b/installer/install-powershell-languageserver.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -e + +curl -L -o PowerShellEditorServices.zip "https://github.com/PowerShell/PowerShellEditorServices/releases/download/2.0.0-preview.8/PowerShellEditorServices.zip" +unzip PowerShellEditorServices.zip +rm PowerShellEditorServices.zip +mkdir session + +cat <powershell-languageserver +#!/usr/bin/env bash + +DIR=\$(cd \$(dirname \$0); pwd) +PSES_BUNDLE_PATH=\$DIR/PowerShellEditorServices +SESSION_TEMP_PATH=\$DIR/session +pwsh -NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command "\$PSES_BUNDLE_PATH/PowerShellEditorServices/Start-EditorServices.ps1 -BundledModulesPath \$PSES_BUNDLE_PATH -LogPath \$SESSION_TEMP_PATH/logs.log -SessionDetailsPath \$SESSION_TEMP_PATH/session.json -FeatureFlags @() -AdditionalModules @() -HostName 'My Client' -HostProfileId 'myclient' -HostVersion 1.0.0 -Stdio -LogLevel Normal" +EOF + +chmod +x powershell-languageserver diff --git a/settings.json b/settings.json index 4787e08..17dd92e 100644 --- a/settings.json +++ b/settings.json @@ -346,7 +346,7 @@ { "command": "powershell-languageserver", "requires": [ - "powershell" + "pwsh" ], "vim-plugin": { "extensions": [ -- cgit v1.2.3-54-g00ecf