Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-21 10:49:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make RelativeWorkspacePathResolver a static class

Browse Source
This commit is contained in:
Matt Bierner
2019-06-24 16:27:17 -07:00
parent 8119b4aee7
commit e32e2a90c5
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/typescript-language-features/src/utils/pluginPathsProvider.ts
View File

@@ -9,7 +9,6 @@ import { RelativeWorkspacePathResolver } from './relativePathResolver';
export class TypeScriptPluginPathsProvider {
public readonly relativePathResolver: RelativeWorkspacePathResolver = new RelativeWorkspacePathResolver();
public constructor(
private configuration: TypeScriptServiceConfiguration
@@ -32,7 +31,7 @@ export class TypeScriptPluginPathsProvider {
return [pluginPath];
}
const workspacePath = this.relativePathResolver.asAbsoluteWorkspacePath(pluginPath);
const workspacePath = RelativeWorkspacePathResolver.asAbsoluteWorkspacePath(pluginPath);
if (workspacePath !== undefined) {
return [workspacePath];
}

2
extensions/typescript-language-features/src/utils/relativePathResolver.ts
View File

@@ -6,7 +6,7 @@ import * as path from 'path';
import * as vscode from 'vscode';
export class RelativeWorkspacePathResolver {
public asAbsoluteWorkspacePath(relativePath: string): string | undefined {
public static asAbsoluteWorkspacePath(relativePath: string): string | undefined {
for (const root of vscode.workspace.workspaceFolders || []) {
const rootPrefixes = [`./${root.name}/`, `${root.name}/`, `.\\${root.name}\\`, `${root.name}\\`];
for (const rootPrefix of rootPrefixes) {

3
extensions/typescript-language-features/src/utils/versionProvider.ts
View File

@@ -88,7 +88,6 @@ export class TypeScriptVersion {
}
export class TypeScriptVersionProvider {
private readonly relativePathResolver: RelativeWorkspacePathResolver = new RelativeWorkspacePathResolver();
public constructor(
private configuration: TypeScriptServiceConfiguration
@@ -179,7 +178,7 @@ export class TypeScriptVersionProvider {
return [new TypeScriptVersion(tsdkPathSetting)];
}
const workspacePath = this.relativePathResolver.asAbsoluteWorkspacePath(tsdkPathSetting);
const workspacePath = RelativeWorkspacePathResolver.asAbsoluteWorkspacePath(tsdkPathSetting);
if (workspacePath !== undefined) {
return [new TypeScriptVersion(workspacePath, tsdkPathSetting)];
}