Skip to content

Commit 0a5a4d6

Browse files
authored
Revert "workspaceFolder variable substitution in launch.json or tasks.json should use URI for virtual filesystems (#235954)" (#239904)
This reverts commit d3145c5. Fixes #239903
1 parent 08e269b commit 0a5a4d6

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

src/vs/workbench/api/common/extHostVariableResolverService.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { IConfigurationResolverService } from '../../services/configurationResol
1818
import { AbstractVariableResolverService } from '../../services/configurationResolver/common/variableResolver.js';
1919
import * as vscode from 'vscode';
2020
import { ExtHostConfigProvider, IExtHostConfiguration } from './extHostConfiguration.js';
21-
import { Schemas } from '../../../base/common/network.js';
2221

2322
export interface IExtHostVariableResolverProvider {
2423
readonly _serviceBrand: undefined;
@@ -84,11 +83,7 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
8483
getFilePath: (): string | undefined => {
8584
const activeUri = getActiveUri();
8685
if (activeUri) {
87-
if (activeUri.scheme === Schemas.file) {
88-
return path.normalize(activeUri.fsPath);
89-
} else {
90-
return activeUri.toString();
91-
}
86+
return path.normalize(activeUri.fsPath);
9287
}
9388
return undefined;
9489
},
@@ -98,11 +93,7 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
9893
if (activeUri) {
9994
const ws = workspaceService.getWorkspaceFolder(activeUri);
10095
if (ws) {
101-
if (activeUri.scheme === Schemas.file) {
102-
return path.normalize(ws.uri.fsPath);
103-
} else {
104-
return ws.uri.toString();
105-
}
96+
return path.normalize(ws.uri.fsPath);
10697
}
10798
}
10899
}

0 commit comments

Comments
 (0)