Ctrl + O coming back to wrong location when jump was within the same file

diff --git a/autoload/symbol.vim b/autoload/symbol.vim
index 812fe0284529a1ac8d4e2414dd1870db1d2fc6e3..2bdb062f6f8d037f481ccfe439bd3ff27b443c1c 100644 (file)
--- a/autoload/symbol.vim
+++ b/autoload/symbol.vim
@@ -261,6 +261,7 @@ export def GotoSymbol(lspserver: dict<any>, location: dict<any>, type: string)
     var wid = fname->bufwinid()
     if wid != -1
       wid->win_gotoid()
+      normal! m`
     else
       var bnr: number = fname->bufnr()
       if bnr != -1
@@ -278,9 +279,9 @@ export def GotoSymbol(lspserver: dict<any>, location: dict<any>, type: string)
           exe 'edit  ' .. fname
         endif
       endif
+      setpos("'`", getcurpos())
     endif
     # Set the previous cursor location mark
-    setpos("'`", getcurpos())
     setcursorcharpos(location.range.start.line + 1,
                        location.range.start.character + 1)
   endif