From 806297eb1adc8347cc37b800ab313aa6d8dc827b Mon Sep 17 00:00:00 2001 From: wolfsilver Date: Tue, 3 Mar 2026 08:46:44 +0000 Subject: [PATCH] feat: update version to 1.109.5 --- vscode-web/.VERSION | 2 +- vscode-web/scripts/.patch | 10 +++++----- vscode-web/src/vs/base/common/network.ts | 5 +++++ .../browser/parts/titlebar/media/titlebarpart.css | 5 +---- vscode-web/src/vs/workbench/browser/web.main.ts | 12 +++++++++++- .../workbench/services/label/common/labelService.ts | 4 ++++ .../services/textfile/browser/textFileService.ts | 12 ++++++++++++ 7 files changed, 39 insertions(+), 11 deletions(-) diff --git a/vscode-web/.VERSION b/vscode-web/.VERSION index 496a2a102..0eb7b9858 100644 --- a/vscode-web/.VERSION +++ b/vscode-web/.VERSION @@ -1 +1 @@ -1.108.2 \ No newline at end of file +1.109.5 \ No newline at end of file diff --git a/vscode-web/scripts/.patch b/vscode-web/scripts/.patch index ece772f3e..37a0e3efe 100644 --- a/vscode-web/scripts/.patch +++ b/vscode-web/scripts/.patch @@ -1,12 +1,12 @@ { "src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "3edda05b7b7cf235bc0d51f066aa8d57c447ea784ccd507316327150a4bb880c", - "src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "26cdde234b2811b42166224f3b0f12eb6d78d519d5262cc2b12ec08653b3df39", - "src/vs/workbench/browser/web.main.ts": "a7c43beaa0f873ce0f9edc1aa03db3e9150fb1ac6dc6479a08e0ea5c8a3b2e76", + "src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "f87409af0f50e021ac0880863da50ccfc738728367228af595675f6d12f1ad1b", + "src/vs/workbench/browser/web.main.ts": "c28f5afce7e37992262b827afcc98b25dc0ea9805fb84bfb3e2641d94ddaa885", "src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "e986095a30dbea54af56c25fa1b184b55f34f8914129b27e2f20d8c4ea9fd16b", "src/vs/workbench/contrib/webview/browser/pre/index.html": "8b2e27b411b4fa493fe003c5312378ca0c7164fee99ed288c6e4f47c43dbca1f", "src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "16fc1f8830432097a2de87ba04f9f11e930408df8f672bb7a4bbbe3c1a7c509d", - "src/vs/workbench/services/label/common/labelService.ts": "ac42f60193b50a4668384787468758e4b093f9f2da74a7c9604de5c455886e98", - "src/vs/workbench/services/textfile/browser/textFileService.ts": "c384a6ec5991888fb09cdbf482a6747fa15d486e1cd8967560da3ca1df65944e", - "src/vs/base/common/network.ts": "e8679d4499a7bf7474f31e3dcf61db40be3c0c5c81837cf7adf8e7ea2b656fa1", + "src/vs/workbench/services/label/common/labelService.ts": "d9a00bb4644ffdaee5b22261389ade4cc2c0d0c37ba7a46c779f8fb9c7db1866", + "src/vs/workbench/services/textfile/browser/textFileService.ts": "886566605815367d3866be243994829729fd0b85c04ab7450b9de22ee93053eb", + "src/vs/base/common/network.ts": "059af1f9d8671226e6636bed2a28a6d91a15c1a26f5c826336ce0dedacb3cafb", "src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "40d576ad2307d28012b34b86858ba36ba49ae10e5aedb394bd06b14a35b869a5" } \ No newline at end of file diff --git a/vscode-web/src/vs/base/common/network.ts b/vscode-web/src/vs/base/common/network.ts index 188855dc0..009c1dead 100644 --- a/vscode-web/src/vs/base/common/network.ts +++ b/vscode-web/src/vs/base/common/network.ts @@ -100,6 +100,11 @@ export namespace Schemas { */ export const vscodeWebview = 'vscode-webview'; + /** + * Scheme used for integrated browser tabs using WebContentsView. + */ + export const vscodeBrowser = 'vscode-browser'; + /** * Scheme used for extension pages */ diff --git a/vscode-web/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/vscode-web/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css index d13c4db0c..78a3559db 100644 --- a/vscode-web/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css +++ b/vscode-web/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css @@ -168,10 +168,7 @@ border: 1px solid var(--vscode-commandCenter-border); overflow: hidden; margin: 0 6px; - border-top-left-radius: 6px; - border-bottom-left-radius: 6px; - border-top-right-radius: 6px; - border-bottom-right-radius: 6px; + border-radius: 4px; height: 22px; width: 38vw; max-width: 600px; diff --git a/vscode-web/src/vs/workbench/browser/web.main.ts b/vscode-web/src/vs/workbench/browser/web.main.ts index ec4bd029a..31c77e4de 100644 --- a/vscode-web/src/vs/workbench/browser/web.main.ts +++ b/vscode-web/src/vs/workbench/browser/web.main.ts @@ -96,8 +96,10 @@ import { TunnelSource } from '../services/remote/common/tunnelModel.js'; import { mainWindow } from '../../base/browser/window.js'; import { INotificationService, Severity } from '../../platform/notification/common/notification.js'; import { IDefaultAccountService } from '../../platform/defaultAccount/common/defaultAccount.js'; -import { DefaultAccountService } from '../services/accounts/common/defaultAccount.js'; +import { DefaultAccountService } from '../services/accounts/browser/defaultAccount.js'; import { AccountPolicyService } from '../services/policies/common/accountPolicyService.js'; +import { WorkbenchModeService } from '../services/layout/browser/workbenchModeService.js'; +import { IWorkbenchModeService } from '../services/layout/common/workbenchModeService.js'; export class BrowserMain extends Disposable { @@ -387,6 +389,14 @@ export class BrowserMain extends Disposable { // // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + // Layout Mode + const workbenchModeService: WorkbenchModeService = this._register(new WorkbenchModeService(configurationService, fileService, environmentService, uriIdentityService, logService, storageService)); + serviceCollection.set(IWorkbenchModeService, workbenchModeService); + try { + await workbenchModeService.initialize(); + } catch (error) { + logService.error('Error while initializing workbench mode service', error); + } // Workspace Trust Service const workspaceTrustEnablementService = new WorkspaceTrustEnablementService(configurationService, environmentService); diff --git a/vscode-web/src/vs/workbench/services/label/common/labelService.ts b/vscode-web/src/vs/workbench/services/label/common/labelService.ts index 9059d8ff8..f2d0971a7 100644 --- a/vscode-web/src/vs/workbench/services/label/common/labelService.ts +++ b/vscode-web/src/vs/workbench/services/label/common/labelService.ts @@ -314,6 +314,10 @@ export class LabelService extends Disposable implements ILabelService { /* above codes are changed by github1s */ if (isWorkspace(workspace)) { + if (workspace.isAgentSessionsWorkspace) { + return localize('agentSessionsWorkspace', "Agent Sessions"); + } + const identifier = toWorkspaceIdentifier(workspace); if (isSingleFolderWorkspaceIdentifier(identifier) || isWorkspaceIdentifier(identifier)) { return this.getWorkspaceLabel(identifier, options); diff --git a/vscode-web/src/vs/workbench/services/textfile/browser/textFileService.ts b/vscode-web/src/vs/workbench/services/textfile/browser/textFileService.ts index 3d8612143..f37b1b816 100644 --- a/vscode-web/src/vs/workbench/services/textfile/browser/textFileService.ts +++ b/vscode-web/src/vs/workbench/services/textfile/browser/textFileService.ts @@ -593,6 +593,18 @@ export abstract class AbstractTextFileService extends Disposable implements ITex targetTextModel.setLanguage(sourceLanguageId); // only use if more specific than plain/text } + // indentation options (preserve tabs vs spaces, tab size, indent size) + const sourceOptions = sourceTextModel.getOptions(); + targetTextModel.updateOptions({ + tabSize: sourceOptions.tabSize, + indentSize: sourceOptions.indentSize, + insertSpaces: sourceOptions.insertSpaces + }); + + // end of line sequence (preserve LF vs CRLF) + const sourceEOL = sourceTextModel.getEndOfLineSequence(); + targetTextModel.setEOL(sourceEOL); + // transient properties const sourceTransientProperties = this.codeEditorService.getTransientModelProperties(sourceTextModel); if (sourceTransientProperties) {