bug fix: workspace.cwd -> workspace.root in getProjectRootPath()

I think workspace.cwd should become workspace.root, this fixes the tsserver behaviour in my projects (where I use paths, etc in my tsconfig.json), without this the getProjectRootPath method returns the 'source file' path .

Please correct me if I am wrong, I am still new to the code base and this took me hours to figure out ;)
This commit is contained in:
Jasper Poppe 2019-02-13 09:56:41 +01:00 committed by GitHub
parent cb75962a35
commit be81ec4e6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -815,7 +815,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
public getProjectRootPath(uri: string): string {
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
if (u.fsPath.startsWith(workspace.root) && workspace.root != os.homedir()) return workspace.root
let res = findUp.sync(['tsconfig.json', 'jsconfig.json'], { cwd: path.dirname(u.fsPath) })
return res ? path.dirname(res) : workspace.cwd
}