Skip to content

Commit

Permalink
Undo using cwd for remote terminal
Browse files Browse the repository at this point in the history
  • Loading branch information
First committed Apr 19, 2023
1 parent ac3d156 commit 0dc2f48
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/vs/server/node/remoteTerminalChannel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
}
const envVariableCollections = new Map<string, IEnvironmentVariableCollection>(entries);
const mergedCollection = new MergedEnvironmentVariableCollection(envVariableCollections);
const cwdUri = typeof shellLaunchConfig.cwd === 'string' ? URI.parse(shellLaunchConfig.cwd) : shellLaunchConfig.cwd;
const workspaceFolder = cwdUri ? withNullAsUndefined(activeWorkspaceFolder) : undefined;
const workspaceFolder = activeWorkspaceFolder ? withNullAsUndefined(activeWorkspaceFolder) : undefined;
await mergedCollection.applyToProcessEnvironment(env, { workspaceFolder }, variableResolver);
}

Expand Down

0 comments on commit 0dc2f48

Please sign in to comment.