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

resolve local tsserver from workspaceFolders

Browse source
This commit is contained in:
chemzqm 2019-04-19 17:58:26 +08:00
parent f29a6f424b
commit fe5c4d84dd
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/typescriptServiceClient.ts
View file

@ -242,7 +242,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
} }
private async startService(resendModels = false): Promise<ForkedTsServerProcess> { private async startService(resendModels = false): Promise<ForkedTsServerProcess> {
let currentVersion = this.versionProvider.getLocalVersion(workspace.root) let currentVersion = this.versionProvider.getLocalVersion()
if (!currentVersion || !fs.existsSync(currentVersion.tsServerPath)) { if (!currentVersion || !fs.existsSync(currentVersion.tsServerPath)) {
currentVersion = await this.versionProvider.getDefaultVersion() currentVersion = await this.versionProvider.getDefaultVersion()
} }

11
src/server/utils/versionProvider.ts
View file

@ -5,7 +5,7 @@
import fs from 'fs' import fs from 'fs'
import path from 'path' import path from 'path'
import { getParentDirs } from './fs' import { getParentDirs } from './fs'
import { workspace } from 'coc.nvim' import { workspace, Uri } from 'coc.nvim'
import API from './api' import API from './api'
import { TypeScriptServiceConfiguration } from './configuration' import { TypeScriptServiceConfiguration } from './configuration'
@ -101,11 +101,10 @@ export class TypeScriptVersionProvider {
return undefined return undefined
} }
public getLocalVersion(root): TypeScriptVersion | undefined { public getLocalVersion(): TypeScriptVersion | undefined {
let paths = getParentDirs(root) let folders = workspace.workspaceFolders.map(f => Uri.parse(f.uri).fsPath)
paths.unshift(root) for (let p of folders) {
for (let p of paths) { if (fs.existsSync(path.join(p, 'node_modules/typescript/lib'))) {
if (fs.existsSync(path.join(p, 'node_modules'))) {
let lib = path.join(p, 'node_modules/typescript/lib') let lib = path.join(p, 'node_modules/typescript/lib')
return new TypeScriptVersion(lib) return new TypeScriptVersion(lib)
} }