use node.js path#relative (for #31667)

microsoft · Nov 17, 2017 · 4a8327a · 4a8327a
1 parent 18d7e50
commit 4a8327a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -23,6 +23,7 @@ import * as extfs from 'vs/base/node/extfs';
 import { JSONEditingService } from 'vs/workbench/services/configuration/node/jsonEditingService';
 import { WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { relative } from 'path';
 
 // node.hs helper functions
 
@@ -332,7 +333,7 @@ export class FolderConfiguration extends Disposable {
 
 	private toFolderRelativePath(resource: URI, toOSPath?: boolean): string {
 		if (this.contains(resource)) {
-			return paths.normalize(paths.relative(this.folder.fsPath, resource.fsPath), toOSPath);
+			return paths.normalize(relative(this.folder.fsPath, resource.fsPath), toOSPath);
 		}
 
 		return null;

diff --git a/...workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/...workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
@@ -17,6 +17,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { toResource } from 'vs/workbench/common/editor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { relative } from 'path';
 
 export class ConfigurationResolverService implements IConfigurationResolverService {
 	_serviceBrand: any;
@@ -69,7 +70,7 @@ export class ConfigurationResolverService implements IConfigurationResolverServi
 	}
 
 	private get relativeFile(): string {
-		return (this.workspaceRoot) ? paths.relative(this.workspaceRoot, this.file) : this.file;
+		return (this.workspaceRoot) ? relative(this.workspaceRoot, this.file) : this.file;
 	}
 
 	private get fileBasename(): string {