Work around nvim script loading issue

Author: Your Name

autoload/coc/highlight.vim

@@ -237,38 +237,6 @@ function! coc#highlight#ranges(bufnr, key, hlGroup, ranges, ...) abort
   endfor
 endfunction
 
-if !s:is_vim
-  function! coc#highlight#add_highlight(bufnr, src_id, hl_group, line, col_start, col_end, ...) abort
-    let opts = get(a:, 1, {})
-    let priority = get(opts, 'priority', v:null)
-    if a:src_id == -1
-      call nvim_buf_add_highlight(a:bufnr, a:src_id, a:hl_group, a:line, a:col_start, a:col_end)
-    else
-      " get(opts, 'start_incl', 0) ? v:true : v:false,
-      try
-        call nvim_buf_set_extmark(a:bufnr, a:src_id, a:line, a:col_start, {
-              \ 'end_col': a:col_end,
-              \ 'hl_group': a:hl_group,
-              \ 'hl_mode': get(opts, 'combine', 1) ? 'combine' : 'replace',
-              \ 'right_gravity': v:true,
-              \ 'end_right_gravity': v:false,
-              \ 'priority': type(priority) == 0 ?  min([priority, 4096]) : 4096,
-              \ })
-      catch /^Vim\%((\a\+)\)\=:E5555/
-        " the end_col could be invalid, ignore this error
-      endtry
-    endif
-  endfunction
-else
-  def coc#highlight#add_highlight(bufnr: number, src_id: number, hl_group: string, line: number, col_start: number, col_end: number, ...list: list<dict<any>>)
-    const opts: dict<any> = get(list, 0, {})
-    if !hlexists(hl_group)
-      execute $'highlight {hl_group} ctermfg=NONE'
-    endif
-    coc#api#exec('buf_add_highlight', [bufnr, src_id, hl_group, line, col_start, col_end, opts])
-  enddef
-endif
-
 function! coc#highlight#clear_highlight(bufnr, key, start_line, end_line) abort
   let bufnr = a:bufnr == 0 ? bufnr('%') : a:bufnr
   if !bufloaded(bufnr)
@@ -679,3 +647,37 @@ function! s:group_hls(hls, linecount) abort
   call add(groups, {'start': start, 'end': a:linecount, 'highlights': highlights})
   return groups
 endfunction
+
+if !s:is_vim
+  function! coc#highlight#add_highlight(bufnr, src_id, hl_group, line, col_start, col_end, ...) abort
+    let opts = get(a:, 1, {})
+    let priority = get(opts, 'priority', v:null)
+    if a:src_id == -1
+      call nvim_buf_add_highlight(a:bufnr, a:src_id, a:hl_group, a:line, a:col_start, a:col_end)
+    else
+      " get(opts, 'start_incl', 0) ? v:true : v:false,
+      try
+        call nvim_buf_set_extmark(a:bufnr, a:src_id, a:line, a:col_start, {
+              \ 'end_col': a:col_end,
+              \ 'hl_group': a:hl_group,
+              \ 'hl_mode': get(opts, 'combine', 1) ? 'combine' : 'replace',
+              \ 'right_gravity': v:true,
+              \ 'end_right_gravity': v:false,
+              \ 'priority': type(priority) == 0 ?  min([priority, 4096]) : 4096,
+              \ })
+      catch /^Vim\%((\a\+)\)\=:E5555/
+        " the end_col could be invalid, ignore this error
+      endtry
+    endif
+  endfunction
+  " @workaround Prevent nvim running into the branch for vim below
+  finish
+else
+  def coc#highlight#add_highlight(bufnr: number, src_id: number, hl_group: string, line: number, col_start: number, col_end: number, ...list: list<dict<any>>)
+    const opts: dict<any> = get(list, 0, {})
+    if !hlexists(hl_group)
+      execute $'highlight {hl_group} ctermfg=NONE'
+    endif
+    coc#api#exec('buf_add_highlight', [bufnr, src_id, hl_group, line, col_start, col_end, opts])
+  enddef
+endif