From 6ec2c7e634cdeb23693f3833e9b7e78328bdd07c Mon Sep 17 00:00:00 2001 From: Justin Su Date: Fri, 27 Sep 2024 17:41:18 -0400 Subject: [PATCH 1/3] Fix "in none full screen mode" typo (#229914) --- src/vs/workbench/electron-sandbox/desktop.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts index f6bae665b130d..72527bf9ba539 100644 --- 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', From 1d3cc0a9bc720565b6d1ce673dfea1f08fc7f769 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Fri, 27 Sep 2024 14:43:15 -0700 Subject: [PATCH 2/3] fix: New Edit Session doesn't work if panel chat is active (#230021) --- .../workbench/contrib/chat/browser/actions/chatClearActions.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts index cb5c64f760b2e..c9c0311cc8d95 100644 --- 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; } From 2fd1512a579e4f41c76305a90d7011f4a5aea7a0 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Sat, 28 Sep 2024 00:31:11 +0200 Subject: [PATCH 3/3] SCM - first colored badge is being rendered independently (#230022) --- .../contrib/scm/browser/scmHistoryViewPane.ts | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts index 4de2e1841eb22..ff5fc1818fafb 100644 --- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts @@ -365,17 +365,27 @@ class HistoryItemRenderer implements ITreeRenderer { const labelConfig = this._badgesConfig.read(reader); - const firstColoredRef = historyItem.references?.find(ref => ref.color); templateData.labelContainer.textContent = ''; + const references = historyItem.references ? + historyItem.references.slice(0) : []; + + // If the first reference is colored, we render it + // separately since we have to show the description + // for the first colored reference. + if (references.length > 0 && references[0].color) { + this._renderBadge(references[0], true, templateData); + + // Remove the rendered reference from the collection + references.splice(0, 1); + } + // Group history item references by color - const historyItemRefsByColor = groupBy2( - (historyItem.references ?? []), - ref => ref.color ? ref.color : ''); + const historyItemRefsByColor = groupBy2(references, ref => ref.color ? ref.color : ''); for (const [key, historyItemRefs] of Object.entries(historyItemRefsByColor)) { - // Skip badges with no color + // If needed skip badges with no color if (key === '' && labelConfig !== 'all') { continue; } @@ -387,7 +397,7 @@ class HistoryItemRenderer implements ITreeRenderer