Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-10-02 04:24:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

sessions: fix unified workspace picker setting references (#334677)

Browse Source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 557c3448-77ae-43aa-9ac8-785c2c42b9a7
This commit is contained in:
Megan Rogge
2026-09-05 00:57:09 +00:00
committed by GitHub
co-authored by Copilot
parent 42b37b7a64
commit d4471383bd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts
+2 -1
View File
@@ -61,6 +61,7 @@ import { isCloudSandboxEnabled } from '../../../../../platform/agentHost/common/
import { getWorkbenchContribution } from '../../../../../workbench/common/contributions.js';
import { CloudSandboxAgentHostContribution, type ICloudSandboxProvisionedSession } from '../../remoteAgentHost/browser/cloudSandboxAgentHostContribution.js';
import { IPathService } from '../../../../../workbench/services/path/common/pathService.js';
import { UNIFIED_WORKSPACE_PICKER_SETTING } from '../../../chat/common/constants.js';
/** Copilot Cloud session type - cloud-hosted agent. */
export const CopilotCloudSessionType: ISessionType = {
@@ -1542,7 +1543,7 @@ export class CopilotChatSessionsProvider extends Disposable implements ISessions
}
get browseActions(): readonly ISessionWorkspaceBrowseAction[] {
const useConsolidatedRemoteWorkspaces = this.configurationService.getValue<boolean>(ChatConfiguration.ConsolidatedRemoteWorkspaces);
const useConsolidatedRemoteWorkspaces = this.configurationService.getValue<boolean>(UNIFIED_WORKSPACE_PICKER_SETTING);
const repositoryActions: ISessionWorkspaceBrowseAction[] = useConsolidatedRemoteWorkspaces
? [
...(!isWeb && this.pathService.defaultUriScheme === Schemas.file ? [
src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts
+3 -2
View File
@@ -60,6 +60,7 @@ import { IGitHubService } from '../../../../github/browser/githubService.js';
import { GitHubPullRequestModel } from '../../../../github/browser/models/githubPullRequestModel.js';
import { IPullRequestIconCache } from '../../../../github/browser/pullRequestIconCache.js';
import { computePullRequestIcon, GitHubPullRequestState, IGitHubPullRequest } from '../../../../github/common/types.js';
import { UNIFIED_WORKSPACE_PICKER_SETTING } from '../../../../chat/common/constants.js';
// ---- Helpers ----------------------------------------------------------------
@@ -287,7 +288,7 @@ function createProviderWithConfig(
const configService = new TestConfigurationService();
configService.setUserConfiguration('sessions.github.copilot.multiChatSessions', opts?.multiChatEnabled ?? true);
configService.setUserConfiguration(ChatConfiguration.ConsolidatedRemoteWorkspaces, opts?.consolidatedRemoteWorkspaces ?? false);
configService.setUserConfiguration(UNIFIED_WORKSPACE_PICKER_SETTING, opts?.consolidatedRemoteWorkspaces ?? false);
const agentHostEnabled = observableValue('agentHostEnabled', opts?.agentHostEnabled ?? true);
instantiationService.stub(IConfigurationService, configService);
@@ -526,7 +527,7 @@ suite('CopilotChatSessionsProvider', () => {
const { provider, configService } = createProviderWithConfig(disposables, model);
const legacyActions = provider.browseActions.map(action => ({ label: action.label, icon: action.icon.id }));
configService.setUserConfiguration(ChatConfiguration.ConsolidatedRemoteWorkspaces, true);
configService.setUserConfiguration(UNIFIED_WORKSPACE_PICKER_SETTING, true);
const unifiedActions = provider.browseActions.map(action => ({ label: action.label, icon: action.icon.id }));
assert.deepStrictEqual({