refactor(util): add workaround for jdt uri on win32

neoclide · Dec 21, 2020 · bf94769 · bf94769
1 parent f09ba2b
commit bf94769
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/util/index.ts b/src/util/index.ts
@@ -27,7 +27,8 @@ export function wait(ms: number): Promise<any> {
 
 export function getUri(fullpath: string, id: number, buftype: string, isCygwin: boolean): string {
   if (!fullpath) return `untitled:${id}`
-  if (platform.isWindows && !isCygwin) fullpath = path.win32.normalize(fullpath)
+  // https://github.com/neoclide/coc-java/issues/82
+  if (platform.isWindows && !isCygwin && !fullpath.startsWith('jdt://')) fullpath = path.win32.normalize(fullpath)
   if (path.isAbsolute(fullpath)) return URI.file(fullpath).toString()
   if (isuri.isValid(fullpath)) return URI.parse(fullpath).toString()
   if (buftype != '') return `${buftype}:${id}`

diff --git a/src/workspace.ts b/src/workspace.ts
@@ -820,6 +820,9 @@ export class Workspace implements IWorkspace {
         let bufname = fixDriver(path.normalize(fsPath))
         await this.nvim.call('coc#util#jump', [jumpCommand, bufname, pos])
       } else {
+        if (os.platform() == 'win32') {
+          uri = uri.replace(/\/?/, '?')
+        }
         await this.nvim.call('coc#util#jump', [jumpCommand, uri, pos])
       }
     }