Skip to content

Commit 2294200

Browse files
conwnetconwnet
authored
chore: bump vscode to 1.97.2 (#624)
1 parent a7bb728 commit 2294200

File tree

12 files changed

+49
-64
lines changed

12 files changed

+49
-64
lines changed

Diff for: ‎package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"license": "ISC",
3131
"devDependencies": {
3232
"@cloudflare/workers-types": "^4.20250109.0",
33-
"@github1s/vscode-web": "0.23.3",
33+
"@github1s/vscode-web": "0.24.0",
3434
"chokidar": "^4.0.3",
3535
"clean-css": "^5.3.3",
3636
"copy-webpack-plugin": "^12.0.2",

Diff for: ‎vscode-web/.VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.96.4
1+
1.97.2

Diff for: ‎vscode-web/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vscode-web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@github1s/vscode-web",
3-
"version": "0.23.3",
3+
"version": "0.24.0",
44
"description": "VS Code web for GitHub1s",
55
"author": "github1s",
66
"license": "MIT",

Diff for: ‎vscode-web/scripts/.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "9d2f29791ba4e2447efd79dd326a3cff9df2c7957907ab3c820b1c5a37766589",
3-
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "34f062f1434649936adf8ea8a35f476d82bf70c42d0f1a4cc2ad4ee870744323",
4-
"src/vs/workbench/browser/web.main.ts": "ae303654beb3969350434c79a20bb756bae01de3e93c83e859fb2a344e76f8d5",
2+
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "533dd320519e7523e9bfd102ab35b2329223c1cf6fa909210d47ebbb75e7cf41",
3+
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "654fa16577a5fcf83f2601f1e22e0a6ac67a9710980d6a762ee68074423a74cc",
4+
"src/vs/workbench/browser/web.main.ts": "0cf354b9221fdb15a738366043fbf69d8f8373891faf9f5e66a033de935eba79",
55
"src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "e986095a30dbea54af56c25fa1b184b55f34f8914129b27e2f20d8c4ea9fd16b",
66
"src/vs/workbench/contrib/webview/browser/pre/index.html": "09664522d7c6b0fdb7728be06b1a1f6ec8bb82c4fd6f2d13a7e84a0fd7d667af",
77
"src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "c220568141adf6ed560bab754ea7769795465c6fa93ecd461e9b59f05ca56377",
8-
"src/vs/workbench/services/label/common/labelService.ts": "9eacdd41cbcf7f5e2ff7e0b524c495c59a8b4a940834385d486cb5c8b39b903d",
9-
"src/vs/workbench/services/textfile/browser/textFileService.ts": "64fde77a91847e9881f2a1823e0b12d8af15630602ec9b877b43a3a05ac11eef",
10-
"src/vs/base/common/network.ts": "e62486b9d0aec931812589c5bd239d7e8240423a3c80b1327afac4a32d44ef7a",
8+
"src/vs/workbench/services/label/common/labelService.ts": "72d72581bd521c2edadd60d4458de4d1c6a9a2cc2cf83820034c82815a2eae6a",
9+
"src/vs/workbench/services/textfile/browser/textFileService.ts": "b5ce3f8032cd2fe5a871b33d67f578d209bbae3f42007998559138326fd16b04",
10+
"src/vs/base/common/network.ts": "10cb07268d9805b102cf8ab9d5e03f97d935a42304c7bdc5e8c54013038bd9ad",
1111
"src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "1b7956deade55aa1420516b62251d412fb578bb1165e2580b21d3d8ace968a67"
1212
}

Diff for: ‎vscode-web/src/vs/base/common/network.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class RemoteAuthoritiesImpl {
173173
}
174174

175175
setServerRootPath(product: { quality?: string; commit?: string }, serverBasePath: string | undefined): void {
176-
this._serverRootPath = getServerRootPath(product, serverBasePath);
176+
this._serverRootPath = paths.posix.join(serverBasePath ?? '/', getServerProductSegment(product));
177177
}
178178

179179
getServerRootPath(): string {
@@ -228,8 +228,8 @@ class RemoteAuthoritiesImpl {
228228

229229
export const RemoteAuthorities = new RemoteAuthoritiesImpl();
230230

231-
export function getServerRootPath(product: { quality?: string; commit?: string }, basePath: string | undefined): string {
232-
return paths.posix.join(basePath ?? '/', `${product.quality ?? 'oss'}-${product.commit ?? 'dev'}`);
231+
export function getServerProductSegment(product: { quality?: string; commit?: string }) {
232+
return `${product.quality ?? 'oss'}-${product.commit ?? 'dev'}`;
233233
}
234234

235235
/**

Diff for: ‎vscode-web/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts

+13-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Part } from '../../part.js';
1111
import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position } from '../../../services/layout/browser/layoutService.js';
1212
import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
1313
import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
14-
import { ToggleSidebarPositionAction } from '../../actions/layoutActions.js';
14+
import { ToggleSidebarPositionAction, ToggleSidebarVisibilityAction } from '../../actions/layoutActions.js';
1515
import { IThemeService, IColorTheme, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
1616
import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER } from '../../../common/theme.js';
1717
import { activeContrastBorder, contrastBorder, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
@@ -399,10 +399,16 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
399399
getActivityBarContextMenuActions(): IAction[] {
400400
const activityBarPositionMenu = this.menuService.getMenuActions(MenuId.ActivityBarPositionMenu, this.contextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
401401
const positionActions = getContextMenuActions(activityBarPositionMenu).secondary;
402-
return [
402+
const actions = [
403403
new SubmenuAction('workbench.action.panel.position', localize('activity bar position', "Activity Bar Position"), positionActions),
404-
toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => new ToggleSidebarPositionAction().run(accessor)) })
404+
toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => new ToggleSidebarPositionAction().run(accessor)) }),
405405
];
406+
407+
if (this.part === Parts.SIDEBAR_PART) {
408+
actions.push(toAction({ id: ToggleSidebarVisibilityAction.ID, label: ToggleSidebarVisibilityAction.LABEL, run: () => this.instantiationService.invokeFunction(accessor => new ToggleSidebarVisibilityAction().run(accessor)) }));
409+
}
410+
411+
return actions;
406412
}
407413

408414
}
@@ -521,15 +527,10 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
521527
MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
522528
submenu: MenuId.ActivityBarPositionMenu,
523529
title: localize('positionActivituBar', "Activity Bar Position"),
524-
when: ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar)),
525-
group: '3_workbench_layout_move',
526-
order: 1
527-
});
528-
529-
MenuRegistry.appendMenuItem(MenuId.ViewTitleContext, {
530-
submenu: MenuId.ActivityBarPositionMenu,
531-
title: localize('positionActivituBar', "Activity Bar Position"),
532-
when: ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar)),
530+
when: ContextKeyExpr.or(
531+
ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar)),
532+
ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))
533+
),
533534
group: '3_workbench_layout_move',
534535
order: 1
535536
});

Diff for: ‎vscode-web/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css

-17
Original file line numberDiff line numberDiff line change
@@ -271,23 +271,6 @@
271271
display: none;
272272
}
273273

274-
.monaco-workbench .part.titlebar > .titlebar-container .window-appicon > .home-bar-icon-badge {
275-
position: absolute;
276-
right: 9px;
277-
bottom: 6px;
278-
width: 8px;
279-
height: 8px;
280-
z-index: 1;
281-
/* on top of home indicator */
282-
background-image: url('../../../media/code-icon.svg');
283-
background-repeat: no-repeat;
284-
background-position: center center;
285-
background-size: 8px;
286-
pointer-events: none;
287-
border-top: 1px solid transparent;
288-
border-left: 1px solid transparent;
289-
}
290-
291274
/* Window Controls Container */
292275
.monaco-workbench .part.titlebar .window-controls-container {
293276
display: flex;

Diff for: ‎vscode-web/src/vs/workbench/browser/web.main.ts

+4-12
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { isWorkspaceToOpen, isFolderToOpen } from '../../platform/window/common/
4040
import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from '../services/workspaces/browser/workspaces.js';
4141
import { InMemoryFileSystemProvider } from '../../platform/files/common/inMemoryFilesystemProvider.js';
4242
import { ICommandService } from '../../platform/commands/common/commands.js';
43-
import { IndexedDBFileSystemProviderErrorDataClassification, IndexedDBFileSystemProvider, IndexedDBFileSystemProviderErrorData } from '../../platform/files/browser/indexedDBFileSystemProvider.js';
43+
import { IndexedDBFileSystemProvider } from '../../platform/files/browser/indexedDBFileSystemProvider.js';
4444
import { BrowserRequestService } from '../services/request/browser/requestService.js';
4545
import { IRequestService } from '../../platform/request/common/request.js';
4646
import { IUserDataInitializationService, IUserDataInitializer, UserDataInitializationService } from '../services/userData/browser/userDataInit.js';
@@ -64,7 +64,6 @@ import { IOpenerService } from '../../platform/opener/common/opener.js';
6464
import { mixin, safeStringify } from '../../base/common/objects.js';
6565
import { IndexedDB } from '../../base/browser/indexedDB.js';
6666
import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js';
67-
import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
6867
import { IProgressService } from '../../platform/progress/common/progress.js';
6968
import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js';
7069
import { dirname, joinPath } from '../../base/common/resources.js';
@@ -77,7 +76,7 @@ import { UserDataProfileService } from '../services/userDataProfile/common/userD
7776
import { IUserDataProfileService } from '../services/userDataProfile/common/userDataProfile.js';
7877
import { BrowserUserDataProfilesService } from '../../platform/userDataProfile/browser/userDataProfile.js';
7978
import { DeferredPromise, timeout } from '../../base/common/async.js';
80-
import { windowLogId } from '../services/log/common/logConstants.js';
79+
import { windowLogGroup, windowLogId } from '../services/log/common/logConstants.js';
8180
import { LogService } from '../../platform/log/common/logService.js';
8281
import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from '../../platform/remote/common/remoteSocketFactoryService.js';
8382
import { BrowserSocketFactory } from '../../platform/remote/browser/browserSocketFactory.js';
@@ -137,13 +136,6 @@ export class BrowserMain extends Disposable {
137136
// Logging
138137
services.logService.trace('workbench#open with configuration', safeStringify(this.configuration));
139138

140-
instantiationService.invokeFunction(accessor => {
141-
const telemetryService = accessor.get(ITelemetryService);
142-
for (const indexedDbFileSystemProvider of this.indexedDBFileSystemProviders) {
143-
this._register(indexedDbFileSystemProvider.onReportError(e => telemetryService.publicLog2<IndexedDBFileSystemProviderErrorData, IndexedDBFileSystemProviderErrorDataClassification>('indexedDBFileSystemProviderError', e)));
144-
}
145-
});
146-
147139
// Return API Facade
148140
return instantiationService.invokeFunction(accessor => {
149141
const commandService = accessor.get(ICommandService);
@@ -298,7 +290,7 @@ export class BrowserMain extends Disposable {
298290
if (environmentService.isExtensionDevelopment && !!environmentService.extensionTestsLocationURI) {
299291
otherLoggers.push(new ConsoleLogInAutomationLogger(loggerService.getLogLevel()));
300292
}
301-
const logger = loggerService.createLogger(environmentService.logFile, { id: windowLogId, name: localize('rendererLog', "Window") });
293+
const logger = loggerService.createLogger(environmentService.logFile, { id: windowLogId, name: windowLogGroup.name, group: windowLogGroup });
302294
const logService = new LogService(logger, otherLoggers);
303295
serviceCollection.set(ILogService, logService);
304296

@@ -397,7 +389,7 @@ export class BrowserMain extends Disposable {
397389
this._register(workspaceTrustManagementService.onDidChangeTrust(() => configurationService.updateWorkspaceTrust(workspaceTrustManagementService.isWorkspaceTrusted())));
398390

399391
// Request Service
400-
const requestService = new BrowserRequestService(remoteAgentService, configurationService, logService);
392+
const requestService = new BrowserRequestService(remoteAgentService, configurationService, loggerService);
401393
serviceCollection.set(IRequestService, requestService);
402394

403395
// Userdata Sync Store Management Service

Diff for: ‎vscode-web/src/vs/workbench/services/label/common/labelService.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,23 @@ export class LabelService extends Disposable implements ILabelService {
208208
return bestResult ? bestResult.formatting : undefined;
209209
}
210210

211-
getUriLabel(resource: URI, options: { relative?: boolean; noPrefix?: boolean; separator?: '/' | '\\' } = {}): string {
211+
getUriLabel(resource: URI, options: { relative?: boolean; noPrefix?: boolean; separator?: '/' | '\\'; appendWorkspaceSuffix?: boolean } = {}): string {
212212
let formatting = this.findFormatting(resource);
213213
if (formatting && options.separator) {
214214
// mixin separator if defined from the outside
215215
formatting = { ...formatting, separator: options.separator };
216216
}
217217

218-
const label = this.doGetUriLabel(resource, formatting, options);
218+
let label = this.doGetUriLabel(resource, formatting, options);
219219

220220
// Without formatting we still need to support the separator
221221
// as provided in options (https://github.com/microsoft/vscode/issues/130019)
222222
if (!formatting && options.separator) {
223-
return label.replace(sepRegexp, options.separator);
223+
label = label.replace(sepRegexp, options.separator);
224+
}
225+
226+
if (options.appendWorkspaceSuffix && formatting?.workspaceSuffix) {
227+
label = this.appendWorkspaceSuffix(label, resource);
224228
}
225229

226230
return label;

Diff for: ‎vscode-web/src/vs/workbench/services/textfile/browser/textFileService.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
5757

5858
constructor(
5959
@IFileService protected readonly fileService: IFileService,
60-
@IUntitledTextEditorService private untitledTextEditorService: IUntitledTextEditorService,
60+
@IUntitledTextEditorService private untitledTextEditorService: IUntitledTextEditorModelManager,
6161
@ILifecycleService protected readonly lifecycleService: ILifecycleService,
6262
@IInstantiationService protected readonly instantiationService: IInstantiationService,
6363
@IModelService private readonly modelService: IModelService,
@@ -165,7 +165,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
165165
this._register(this.decorationsService.registerDecorationsProvider(provider));
166166
}
167167

168-
//#endregin
168+
//#endregion
169169

170170
//#region text file read / write / create
171171

@@ -455,6 +455,11 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
455455
this.logService.error(error);
456456
}
457457

458+
// Events
459+
if (source.scheme === Schemas.untitled) {
460+
this.untitled.notifyDidSave(source, target);
461+
}
462+
458463
return target;
459464
}
460465

0 commit comments

Comments
 (0)