Merge branch 'main' into lszomoru/uniform-eel

microsoft · Sep 27, 2024 · 3ecda55 · 3ecda55
2 parents 2050705 + 2fd1512
commit 3ecda55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -19,6 +19,7 @@ import { ChatEditorInput } from '../chatEditorInput.js';
 import { ChatViewPane } from '../chatViewPane.js';
 import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED } from '../../common/chatContextKeys.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ChatAgentLocation } from '../../common/chatAgents.js';
 
 export const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
 
@@ -139,7 +140,7 @@ export function registerNewChatActions() {
  const viewsService = accessor.get(IViewsService);
 
  let widget = widgetService.lastFocusedWidget;
- if (!widget) {
+ if (!widget || widget.location !== ChatAgentLocation.EditingSession) {
  const chatView = await viewsService.openView(EDITS_VIEW_ID) as ChatViewPane;
  widget = chatView.widget;
  }

diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -251,7 +251,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
  ],
  'default': isLinux ? 'never' : 'auto',
  'scope': ConfigurationScope.APPLICATION,
- 'markdownDescription': localize('window.customTitleBarVisibility', "Adjust when the custom title bar should be shown. The custom title bar can be hidden when in full screen mode with `windowed`. The custom title bar can only be hidden in none full screen mode with `never` when {0} is set to `native`.", '`#window.titleBarStyle#`'),
+ 'markdownDescription': localize('window.customTitleBarVisibility', "Adjust when the custom title bar should be shown. The custom title bar can be hidden when in full screen mode with `windowed`. The custom title bar can only be hidden in non full screen mode with `never` when {0} is set to `native`.", '`#window.titleBarStyle#`'),
  },
  'window.dialogStyle': {
  'type': 'string',