Skip to content

Commit 68653e8

Browse files
authored
feat: update version to 1.109.5 (#666)
1 parent 71ac760 commit 68653e8

File tree

7 files changed

+39
-11
lines changed

7 files changed

+39
-11
lines changed

vscode-web/.VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.108.2
1+
1.109.5

vscode-web/scripts/.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "3edda05b7b7cf235bc0d51f066aa8d57c447ea784ccd507316327150a4bb880c",
3-
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "26cdde234b2811b42166224f3b0f12eb6d78d519d5262cc2b12ec08653b3df39",
4-
"src/vs/workbench/browser/web.main.ts": "a7c43beaa0f873ce0f9edc1aa03db3e9150fb1ac6dc6479a08e0ea5c8a3b2e76",
3+
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "f87409af0f50e021ac0880863da50ccfc738728367228af595675f6d12f1ad1b",
4+
"src/vs/workbench/browser/web.main.ts": "c28f5afce7e37992262b827afcc98b25dc0ea9805fb84bfb3e2641d94ddaa885",
55
"src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "e986095a30dbea54af56c25fa1b184b55f34f8914129b27e2f20d8c4ea9fd16b",
66
"src/vs/workbench/contrib/webview/browser/pre/index.html": "8b2e27b411b4fa493fe003c5312378ca0c7164fee99ed288c6e4f47c43dbca1f",
77
"src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "16fc1f8830432097a2de87ba04f9f11e930408df8f672bb7a4bbbe3c1a7c509d",
8-
"src/vs/workbench/services/label/common/labelService.ts": "ac42f60193b50a4668384787468758e4b093f9f2da74a7c9604de5c455886e98",
9-
"src/vs/workbench/services/textfile/browser/textFileService.ts": "c384a6ec5991888fb09cdbf482a6747fa15d486e1cd8967560da3ca1df65944e",
10-
"src/vs/base/common/network.ts": "e8679d4499a7bf7474f31e3dcf61db40be3c0c5c81837cf7adf8e7ea2b656fa1",
8+
"src/vs/workbench/services/label/common/labelService.ts": "d9a00bb4644ffdaee5b22261389ade4cc2c0d0c37ba7a46c779f8fb9c7db1866",
9+
"src/vs/workbench/services/textfile/browser/textFileService.ts": "886566605815367d3866be243994829729fd0b85c04ab7450b9de22ee93053eb",
10+
"src/vs/base/common/network.ts": "059af1f9d8671226e6636bed2a28a6d91a15c1a26f5c826336ce0dedacb3cafb",
1111
"src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "40d576ad2307d28012b34b86858ba36ba49ae10e5aedb394bd06b14a35b869a5"
1212
}

vscode-web/src/vs/base/common/network.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ export namespace Schemas {
100100
*/
101101
export const vscodeWebview = 'vscode-webview';
102102

103+
/**
104+
* Scheme used for integrated browser tabs using WebContentsView.
105+
*/
106+
export const vscodeBrowser = 'vscode-browser';
107+
103108
/**
104109
* Scheme used for extension pages
105110
*/

vscode-web/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,7 @@
168168
border: 1px solid var(--vscode-commandCenter-border);
169169
overflow: hidden;
170170
margin: 0 6px;
171-
border-top-left-radius: 6px;
172-
border-bottom-left-radius: 6px;
173-
border-top-right-radius: 6px;
174-
border-bottom-right-radius: 6px;
171+
border-radius: 4px;
175172
height: 22px;
176173
width: 38vw;
177174
max-width: 600px;

vscode-web/src/vs/workbench/browser/web.main.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,10 @@ import { TunnelSource } from '../services/remote/common/tunnelModel.js';
9696
import { mainWindow } from '../../base/browser/window.js';
9797
import { INotificationService, Severity } from '../../platform/notification/common/notification.js';
9898
import { IDefaultAccountService } from '../../platform/defaultAccount/common/defaultAccount.js';
99-
import { DefaultAccountService } from '../services/accounts/common/defaultAccount.js';
99+
import { DefaultAccountService } from '../services/accounts/browser/defaultAccount.js';
100100
import { AccountPolicyService } from '../services/policies/common/accountPolicyService.js';
101+
import { WorkbenchModeService } from '../services/layout/browser/workbenchModeService.js';
102+
import { IWorkbenchModeService } from '../services/layout/common/workbenchModeService.js';
101103

102104
export class BrowserMain extends Disposable {
103105

@@ -387,6 +389,14 @@ export class BrowserMain extends Disposable {
387389
//
388390
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
389391

392+
// Layout Mode
393+
const workbenchModeService: WorkbenchModeService = this._register(new WorkbenchModeService(configurationService, fileService, environmentService, uriIdentityService, logService, storageService));
394+
serviceCollection.set(IWorkbenchModeService, workbenchModeService);
395+
try {
396+
await workbenchModeService.initialize();
397+
} catch (error) {
398+
logService.error('Error while initializing workbench mode service', error);
399+
}
390400

391401
// Workspace Trust Service
392402
const workspaceTrustEnablementService = new WorkspaceTrustEnablementService(configurationService, environmentService);

vscode-web/src/vs/workbench/services/label/common/labelService.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@ export class LabelService extends Disposable implements ILabelService {
314314
/* above codes are changed by github1s */
315315

316316
if (isWorkspace(workspace)) {
317+
if (workspace.isAgentSessionsWorkspace) {
318+
return localize('agentSessionsWorkspace', "Agent Sessions");
319+
}
320+
317321
const identifier = toWorkspaceIdentifier(workspace);
318322
if (isSingleFolderWorkspaceIdentifier(identifier) || isWorkspaceIdentifier(identifier)) {
319323
return this.getWorkspaceLabel(identifier, options);

vscode-web/src/vs/workbench/services/textfile/browser/textFileService.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,18 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
593593
targetTextModel.setLanguage(sourceLanguageId); // only use if more specific than plain/text
594594
}
595595

596+
// indentation options (preserve tabs vs spaces, tab size, indent size)
597+
const sourceOptions = sourceTextModel.getOptions();
598+
targetTextModel.updateOptions({
599+
tabSize: sourceOptions.tabSize,
600+
indentSize: sourceOptions.indentSize,
601+
insertSpaces: sourceOptions.insertSpaces
602+
});
603+
604+
// end of line sequence (preserve LF vs CRLF)
605+
const sourceEOL = sourceTextModel.getEndOfLineSequence();
606+
targetTextModel.setEOL(sourceEOL);
607+
596608
// transient properties
597609
const sourceTransientProperties = this.codeEditorService.getTransientModelProperties(sourceTextModel);
598610
if (sourceTransientProperties) {

0 commit comments

Comments
 (0)