Skip to content

Commit

Permalink
Revert "workspaceFolder variable substitution in launch.json or tasks…
Browse files Browse the repository at this point in the history
….json should use URI for virtual filesystems (#235954)" (#239905)

This reverts commit d3145c5.

Fixes #239903
  • Loading branch information
alexr00 authored Feb 7, 2025
1 parent 86bc5fa commit a1d56fd
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions src/vs/workbench/api/common/extHostVariableResolverService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { IConfigurationResolverService } from '../../services/configurationResol
import { AbstractVariableResolverService } from '../../services/configurationResolver/common/variableResolver.js';
import * as vscode from 'vscode';
import { ExtHostConfigProvider, IExtHostConfiguration } from './extHostConfiguration.js';
import { Schemas } from '../../../base/common/network.js';

export interface IExtHostVariableResolverProvider {
readonly _serviceBrand: undefined;
Expand Down Expand Up @@ -84,11 +83,7 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
getFilePath: (): string | undefined => {
const activeUri = getActiveUri();
if (activeUri) {
if (activeUri.scheme === Schemas.file) {
return path.normalize(activeUri.fsPath);
} else {
return activeUri.toString();
}
return path.normalize(activeUri.fsPath);
}
return undefined;
},
Expand All @@ -98,11 +93,7 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
if (activeUri) {
const ws = workspaceService.getWorkspaceFolder(activeUri);
if (ws) {
if (activeUri.scheme === Schemas.file) {
return path.normalize(ws.uri.fsPath);
} else {
return ws.uri.toString();
}
return path.normalize(ws.uri.fsPath);
}
}
}
Expand Down

0 comments on commit a1d56fd

Please sign in to comment.