From d6ea8034c46e193bcb8f1388d1d3eb44c87a4f0d Mon Sep 17 00:00:00 2001
From: rwxguo <10892928+rwxguo@users.noreply.github.com>
Date: Mon, 18 Dec 2023 13:22:33 +0800
Subject: [PATCH] update

---
 autoload/go/def.vim  |  6 ++++--
 autoload/go/lsp.vim  | 11 ++++++++++-
 autoload/go/path.vim |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/autoload/go/def.vim b/autoload/go/def.vim
index 83299e2d99..eeee07d4f4 100644
--- a/autoload/go/def.vim
+++ b/autoload/go/def.vim
@@ -126,8 +126,10 @@ function! go#def#jump_to_declaration(out, mode, bin_name) abort
   let out = split(final_out, go#util#LineEnding())[0]
   if go#util#IsWin()
     let parts = split(out, '\(^[a-zA-Z]\)\@<!:')
-  elseif (system('uname') =~ 'MINGW' || system('uname') =~ 'CYGWIN')
-    let l:out = l:out[0:1] . l:out[3:]
+  elseif system('uname') =~ 'MINGW' || system('uname') =~ 'CYGWIN'
+    if l:msguri[2:3] is# ':/'
+      let l:out = l:out[0:1] . l:out[3:]
+    endif
     let parts = split(out, ':')
   else
     let parts = split(out, ':')
diff --git a/autoload/go/lsp.vim b/autoload/go/lsp.vim
index 55761391f5..aa8e787b3a 100644
--- a/autoload/go/lsp.vim
+++ b/autoload/go/lsp.vim
@@ -616,7 +616,16 @@ function! s:definitionHandler(next, msg) abort dict
   " gopls returns a []Location; just take the first one.
   let l:msg = a:msg[0]
 
-  let l:line = s:lineinfile(go#path#FromURI(l:msg.uri), l:msg.range.start.line+1)
+  let l:msguri = go#path#FromURI(l:msg.uri)
+  " remove the comma in cygwin unix-like windwos path
+  " e.g. '/c:/path' to '/c/path'
+  if system('uname') =~ 'MINGW' || system('uname') =~ 'CYGWIN'
+    if l:msguri[2:3] is# ':/'
+      let l:msguri = l:msguri[0:1] . l:msguri[3:]
+    endif
+  endif
+
+  let l:line = s:lineinfile(l:msguri, l:msg.range.start.line+1)
   if l:line is -1
     call go#util#Warn('could not find definition')
     return
diff --git a/autoload/go/path.vim b/autoload/go/path.vim
index d5ed5207a0..08ba85d1db 100644
--- a/autoload/go/path.vim
+++ b/autoload/go/path.vim
@@ -164,7 +164,7 @@ function! go#path#ToURI(path)
     let l:absolute = 1
     let l:prefix = '/' . l:path[0:1]
     let l:path = l:path[2:]
-  elseif (system('uname') =~ 'MINGW' || system('uname') =~ 'CYGWIN')
+  elseif system('uname') =~ 'MINGW' || system('uname') =~ 'CYGWIN'
     let l:absolute = 1
     let l:prefix = l:path[0:1] . ':'
     let l:path = l:path[2:3] is# ':/' ? l:path[3:] : l:path[2:]