archived/coc-tsserver
1
0
Fork 0
Code Issues Pull requests Activity

use workspace.cwd when config file not resolved

Browse source
This commit is contained in:
chemzqm 2019-02-06 23:51:51 +08:00
parent da9f6cc3bd
commit 0473880f30
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/server/features/bufferSyncSupport.ts
View file

@ -101,7 +101,8 @@ export default class BufferSyncSupport {
}
}
if (this.client.apiVersion.gte(API.v230)) {
args.projectRootPath = this.client.getProjectRootPath(document.uri)
let root = this.client.getProjectRootPath(document.uri)
if (root) args.projectRootPath = root
}
this.client.execute('open', args, false) // tslint:disable-line

4
src/server/typescriptServiceClient.ts
View file

@ -816,8 +816,8 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
let u = Uri.parse(uri)
if (u.scheme != 'file') return workspace.cwd
if (u.fsPath.startsWith(workspace.root) && workspace.root != os.homedir()) return workspace.cwd
let res = findUp.sync(['package.json', 'tsconfig.json', 'jsconfig.json'], { cwd: path.dirname(u.fsPath) })
return res ? path.dirname(res) : workspace.rootPath
let res = findUp.sync(['tsconfig.json', 'jsconfig.json'], { cwd: path.dirname(u.fsPath) })
return res ? path.dirname(res) : workspace.cwd
}
}