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

fix getProjectRootPath, fix #15

Browse source
This commit is contained in:
chemzqm 2019-03-23 18:38:17 +08:00
parent 395828b23e
commit d6ebd2b613
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/server/features/fileConfigurationManager.ts
View file

@ -148,6 +148,7 @@ export default class FileConfigurationManager {
disableSuggestions: !config.get<boolean>('suggest.enabled', true), disableSuggestions: !config.get<boolean>('suggest.enabled', true),
importModuleSpecifierPreference: getImportModuleSpecifier(config) as any, importModuleSpecifierPreference: getImportModuleSpecifier(config) as any,
quotePreference: config.get<'single' | 'double'>('preferences.quoteStyle', 'single'), quotePreference: config.get<'single' | 'double'>('preferences.quoteStyle', 'single'),
allowRenameOfImportPath: true,
allowTextChangesInNewFiles: true, allowTextChangesInNewFiles: true,
} }
} }

12
src/server/typescriptServiceClient.ts
View file

@ -793,8 +793,16 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
public getProjectRootPath(uri: string): string { public getProjectRootPath(uri: string): string {
let u = Uri.parse(uri) let u = Uri.parse(uri)
if (u.scheme != 'file') return workspace.cwd let { cwd } = workspace
if (u.fsPath.startsWith(workspace.root) && workspace.root != os.homedir()) return workspace.root if (u.scheme != 'file') return cwd
if (u.fsPath.startsWith(cwd) && cwd != os.homedir()) {
let files = fs.readdirSync(cwd)
if (files.indexOf('tsconfig.json') !== -1
|| files.indexOf('jsconfig.json') !== -1
|| files.indexOf('package.json') !== -1) {
return cwd
}
}
let res = findUp.sync(['tsconfig.json', 'jsconfig.json'], { cwd: path.dirname(u.fsPath) }) let res = findUp.sync(['tsconfig.json', 'jsconfig.json'], { cwd: path.dirname(u.fsPath) })
return res ? path.dirname(res) : workspace.cwd return res ? path.dirname(res) : workspace.cwd
} }