Merge branch 'master' into tbruyelle/fix/apply_text_edits

prabirshrestha · Jun 27, 2024 · 0df9f18 · 0df9f18
2 parents 7fce3b8 + a8f244a
commit 0df9f18
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/.github/workflows/mac_neovim.yml b/.github/workflows/mac_neovim.yml
@@ -51,19 +51,11 @@ jobs:
           repository: thinca/vim-themis
           path: ./vim-themis
           ref: v1.5.5
-      - name: Cache gopls
-        id: cache-gopls
-        uses: actions/cache@v4
-        with:
-          path: bin/gopls
-          key: ${{ runner.os }}-${{ env.VIM_LSP_GO_VERSION }}-${{ env.VIM_LSP_GOPLS_VERSION }}-${{ env.VIM_LSP_GOPLS_CACHE_VER }}-gopls
       - name: Install Go for gopls
-        if: steps.cache-gopls.outputs.cache-hit != 'true'
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.VIM_LSP_GO_VERSION }}
       - name: Install gopls
-        if: steps.cache-gopls.outputs.cache-hit != 'true'
         shell: bash
         run: |
           go install golang.org/x/tools/gopls@v${{ env.VIM_LSP_GOPLS_VERSION }}

diff --git a/.github/workflows/mac_vim.yml b/.github/workflows/mac_vim.yml
@@ -27,19 +27,11 @@ jobs:
           repository: thinca/vim-themis
           path: ./vim-themis
           ref: v1.5.5
-      - name: Cache gopls
-        id: cache-gopls
-        uses: actions/cache@v4
-        with:
-          path: bin/gopls
-          key: ${{ runner.os }}-${{ env.VIM_LSP_GO_VERSION }}-${{ env.VIM_LSP_GOPLS_VERSION }}-${{ env.VIM_LSP_GOPLS_CACHE_VER }}-gopls
       - name: Install Go for gopls
-        if: steps.cache-gopls.outputs.cache-hit != 'true'
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.VIM_LSP_GO_VERSION }}
       - name: Install gopls
-        if: steps.cache-gopls.outputs.cache-hit != 'true'
         shell: bash
         run: |
           go install golang.org/x/tools/gopls@v${{ env.VIM_LSP_GOPLS_VERSION }}

diff --git a/doc/vim-lsp.txt b/doc/vim-lsp.txt
@@ -271,7 +271,7 @@ You can use tcp to connect to LSP servers that don't support stdio. Set host
 and port to tcp. The Godot game engine uses 6008 as its LSP port and godot
 ftplugins define gdscript or gdscript3 filetype: >
 
-	au User lsp_setup 
+	au User lsp_setup
 	    \ call lsp#register_server({
 	    \     'name': 'godot',
 	    \     'tcp': "localhost:6008",
@@ -290,7 +290,7 @@ vim-lsp supports the |:CheckHealth| command which can be useful when debugging
 lsp configuration issues.
 
 This command is implemented in vim with the
-[vim-healthcheck](https://github.com/rhysd/vim-healthcheck) plugin. 
+[vim-healthcheck](https://github.com/rhysd/vim-healthcheck) plugin.
 
 WIKI                                               *vim-lsp-configure-wiki*
 For documentation on how to configure other language servers refer
@@ -905,7 +905,7 @@ g:lsp_max_buffer_size                               *g:lsp_max_buffer_size*
     `g:lsp_max_buffer_size` (measured in bytes), the following features
     are disabled:
     * Semantic highlighting
-    
+
     This functionality can be disabled by setting `g:lsp_max_buffer_size`
     to a negative value.
 
@@ -1402,6 +1402,13 @@ The vim |dict| containing information about the server.
 	    Example: >
 		'config': { 'diagnostics': v:false }
 <
+  * env:
+    optional vim |dict|
+    Used to pass environment variables to the cmd.
+    Example: >
+	'env': { 'GOFLAGS': '-tags=wireinject' }
+<
+
 refresh_pattern                                    *vim-lsp-refresh_pattern*
     Type: |String| (|pattern|)
     Default: `'\k*$'`
@@ -2245,7 +2252,7 @@ Popup Formatting                                      *vim-lsp-popup-format*
 
 Popup windows use the |gq| operator for formatting content to the window.
 
-For customization, see 
+For customization, see
 |formatprg|.
 
 ==============================================================================