Skip to content

Commit 6e411ad

Browse files
authored
Update Code to 1.77.1 (#6135)
1 parent 36ba646 commit 6e411ad

14 files changed

+100
-69
lines changed

lib/vscode

Submodule vscode updated 1180 files

patches/base-path.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
250250
===================================================================
251251
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
252252
+++ code-server/lib/vscode/src/vs/base/common/product.ts
253-
@@ -33,6 +33,7 @@ export type ExtensionVirtualWorkspaceSup
253+
@@ -56,6 +56,7 @@ export type ExtensionVirtualWorkspaceSup
254254

255255
export interface IProductConfiguration {
256256
readonly codeServerVersion?: string

patches/disable-downloads.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
4040
}
4141

4242
export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvironmentService {
43-
@@ -104,6 +109,13 @@ export class BrowserWorkbenchEnvironment
43+
@@ -101,6 +106,13 @@ export class BrowserWorkbenchEnvironment
4444
return this.options.userDataPath;
4545
}
4646

@@ -92,10 +92,10 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
9292
+++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
9393
@@ -7,12 +7,11 @@ import { Event } from 'vs/base/common/ev
9494
import { Disposable } from 'vs/base/common/lifecycle';
95-
import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
95+
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey';
9696
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys';
97-
-import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, EditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext } from 'vs/workbench/common/contextkeys';
98-
+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, EditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, IsEnabledFileDownloads } from 'vs/workbench/common/contextkeys';
97+
-import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, EditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext } from 'vs/workbench/common/contextkeys';
98+
+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, EditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, IsEnabledFileDownloads } from 'vs/workbench/common/contextkeys';
9999
import { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
100100
import { trackFocus, addDisposableListener, EventType } from 'vs/base/browser/dom';
101101
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
@@ -121,7 +121,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
121121
@IProductService private readonly productService: IProductService,
122122
@IEditorService private readonly editorService: IEditorService,
123123
@IEditorResolverService private readonly editorResolverService: IEditorResolverService,
124-
@@ -202,6 +202,9 @@ export class WorkbenchContextKeysHandler
124+
@@ -205,6 +205,9 @@ export class WorkbenchContextKeysHandler
125125
this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
126126
this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
127127

@@ -144,7 +144,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
144144
import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
145145
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
146146
import { ThemeIcon } from 'vs/base/common/themables';
147-
@@ -484,13 +484,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
147+
@@ -485,13 +485,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
148148
id: DOWNLOAD_COMMAND_ID,
149149
title: DOWNLOAD_LABEL
150150
},
@@ -172,9 +172,9 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
172172
===================================================================
173173
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
174174
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
175-
@@ -33,6 +33,8 @@ export const IsFullscreenContext = new R
175+
@@ -35,6 +35,8 @@ export const HasWebFileSystemAccess = ne
176176

177-
export const HasWebFileSystemAccess = new RawContextKey<boolean>('hasWebFileSystemAccess', false, true); // Support for FileSystemAccess web APIs (https://wicg.github.io/file-system-access)
177+
export const EmbedderIdentifierContext = new RawContextKey<string | undefined>('embedderIdentifier', undefined, localize('embedderIdentifier', 'The identifier of the embedder according to the product service, if one is defined'));
178178

179179
+export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);
180180
+

patches/display-language.diff

+13-11
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
2121
===================================================================
2222
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
2323
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
24-
@@ -234,6 +234,9 @@ export async function setupServerService
24+
@@ -233,6 +233,9 @@ export async function setupServerService
2525
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2626
socketServer.registerChannel('extensions', channel);
2727

@@ -44,7 +44,7 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
4444
export const LANGUAGE_DEFAULT = 'en';
4545

4646
let _isWindows = false;
47-
@@ -86,17 +84,19 @@ if (typeof navigator === 'object' && !is
47+
@@ -90,17 +88,21 @@ if (typeof navigator === 'object' && !is
4848
_isMobile = _userAgent?.indexOf('Mobi') >= 0;
4949
_isWeb = true;
5050

@@ -58,16 +58,18 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
5858
-
5959
- _locale = configuredLocale || LANGUAGE_DEFAULT;
6060
+ _locale = LANGUAGE_DEFAULT;
61-
6261
_language = _locale;
62+
_platformLocale = navigator.language;
6363
+ const el = typeof document !== 'undefined' && document.getElementById('vscode-remote-nls-configuration');
6464
+ const rawNlsConfig = el && el.getAttribute('data-settings');
6565
+ if (rawNlsConfig) {
6666
+ try {
6767
+ const nlsConfig: NLSConfig = JSON.parse(rawNlsConfig);
68+
+ const resolved = nlsConfig.availableLanguages['*'];
6869
+ _locale = nlsConfig.locale;
70+
+ _platformLocale = nlsConfig.osLocale;
71+
+ _language = resolved ? resolved : LANGUAGE_DEFAULT;
6972
+ _translationsConfigFile = nlsConfig._translationsConfigFile;
70-
+ _language = nlsConfig.availableLanguages['*'] || LANGUAGE_DEFAULT;
7173
+ } catch (error) { /* Oh well. */ }
7274
+ }
7375
}
@@ -127,7 +129,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ
127129
===================================================================
128130
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
129131
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
130-
@@ -107,7 +107,7 @@ export abstract class AbstractNativeEnvi
132+
@@ -101,7 +101,7 @@ export abstract class AbstractNativeEnvi
131133
return URI.file(join(vscodePortable, 'argv.json'));
132134
}
133135

@@ -337,17 +339,17 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
337339
===================================================================
338340
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
339341
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
340-
@@ -318,9 +318,6 @@ export abstract class AbstractInstallAct
342+
@@ -335,9 +335,6 @@ export abstract class AbstractInstallAct
341343
if (this.extension.isBuiltin) {
342344
return;
343345
}
344346
- if (this.extensionsWorkbenchService.canSetLanguage(this.extension)) {
345347
- return;
346348
- }
347349
if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) {
348-
this.enabled = this.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
350+
this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
349351
this.updateLabel();
350-
@@ -697,7 +694,7 @@ export abstract class InstallInOtherServ
352+
@@ -715,7 +712,7 @@ export abstract class InstallInOtherServ
351353
}
352354

353355
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -356,7 +358,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
356358
}
357359

358360
// Prefers to run on UI
359-
@@ -1785,17 +1782,6 @@ export class SetLanguageAction extends E
361+
@@ -1803,17 +1800,6 @@ export class SetLanguageAction extends E
360362
update(): void {
361363
this.enabled = false;
362364
this.class = SetLanguageAction.DisabledClass;
@@ -374,15 +376,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
374376
}
375377

376378
override async run(): Promise<any> {
377-
@@ -1812,7 +1798,6 @@ export class ClearLanguageAction extends
379+
@@ -1830,7 +1816,6 @@ export class ClearLanguageAction extends
378380
private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
379381

380382
constructor(
381383
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
382384
@ILocaleService private readonly localeService: ILocaleService,
383385
) {
384386
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
385-
@@ -1822,17 +1807,6 @@ export class ClearLanguageAction extends
387+
@@ -1840,17 +1825,6 @@ export class ClearLanguageAction extends
386388
update(): void {
387389
this.enabled = false;
388390
this.class = ClearLanguageAction.DisabledClass;

0 commit comments

Comments
 (0)