Skip to content

Commit 1d774d0

Browse files
benz0libenz0li
authored
Update Code to 1.86.0 (#6655)
1 parent d6ef385 commit 1d774d0

11 files changed

+33
-33
lines changed

‎lib/vscode

Submodule vscode updated 1577 files

‎patches/disable-builtin-ext-update.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
77
===================================================================
88
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
99
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
10-
@@ -245,6 +245,10 @@ export class Extension implements IExten
10+
@@ -249,6 +249,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

‎patches/display-language.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
5353
export const LANGUAGE_DEFAULT = 'en';
5454

5555
let _isWindows = false;
56-
@@ -85,17 +83,21 @@ if (typeof navigator === 'object' && !is
56+
@@ -111,17 +109,21 @@ else if (typeof navigator === 'object' &
5757
_isMobile = _userAgent?.indexOf('Mobi') >= 0;
5858
_isWeb = true;
5959

@@ -83,7 +83,7 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
8383
+ }
8484
}
8585

86-
// Native environment
86+
// Unknown environment
8787
Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
8888
===================================================================
8989
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.html
@@ -249,7 +249,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
249249

250250
/* ----- server setup ----- */
251251

252-
@@ -101,6 +102,7 @@ export interface ServerParsedArgs {
252+
@@ -102,6 +103,7 @@ export interface ServerParsedArgs {
253253
'auth'?: string
254254
'disable-file-downloads'?: boolean;
255255
'disable-file-uploads'?: boolean;
@@ -348,7 +348,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
348348
===================================================================
349349
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
350350
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
351-
@@ -321,9 +321,6 @@ export class InstallAction extends Exten
351+
@@ -338,9 +338,6 @@ export class InstallAction extends Exten
352352
if (this.extension.isBuiltin) {
353353
return;
354354
}
@@ -358,7 +358,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
358358
if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) {
359359
this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
360360
this.updateLabel();
361-
@@ -591,7 +588,7 @@ export abstract class InstallInOtherServ
361+
@@ -608,7 +605,7 @@ export abstract class InstallInOtherServ
362362
}
363363

364364
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
367367
}
368368

369369
// Prefers to run on UI
370-
@@ -1751,17 +1748,6 @@ export class SetLanguageAction extends E
370+
@@ -1780,17 +1777,6 @@ export class SetLanguageAction extends E
371371
update(): void {
372372
this.enabled = false;
373373
this.class = SetLanguageAction.DisabledClass;
@@ -385,15 +385,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
385385
}
386386

387387
override async run(): Promise<any> {
388-
@@ -1778,7 +1764,6 @@ export class ClearLanguageAction extends
388+
@@ -1807,7 +1793,6 @@ export class ClearLanguageAction extends
389389
private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
390390

391391
constructor(
392392
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
393393
@ILocaleService private readonly localeService: ILocaleService,
394394
) {
395395
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
396-
@@ -1788,17 +1773,6 @@ export class ClearLanguageAction extends
396+
@@ -1817,17 +1802,6 @@ export class ClearLanguageAction extends
397397
update(): void {
398398
this.enabled = false;
399399
this.class = ClearLanguageAction.DisabledClass;

‎patches/external-file-actions.diff

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
2727
===================================================================
2828
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
2929
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
30-
@@ -281,6 +281,16 @@ export interface IWorkbenchConstructionO
30+
@@ -282,6 +282,16 @@ export interface IWorkbenchConstructionO
3131
*/
3232
readonly userDataPath?: string
3333

@@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9999

100100
/* ----- server setup ----- */
101101

102-
@@ -97,6 +99,8 @@ export interface ServerParsedArgs {
102+
@@ -98,6 +100,8 @@ export interface ServerParsedArgs {
103103
/* ----- code-server ----- */
104104
'disable-update-check'?: boolean;
105105
'auth'?: string
@@ -129,8 +129,8 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
129129
import { Disposable } from 'vs/base/common/lifecycle';
130130
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey';
131131
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys';
132-
-import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext } from 'vs/workbench/common/contextkeys';
133-
+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
132+
-import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorOriginalWriteableContext } from 'vs/workbench/common/contextkeys';
133+
+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, MainEditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, ActiveEditorCanToggleReadonlyContext, applyAvailableEditorIds, TitleBarVisibleContext, TitleBarStyleContext, MultipleEditorGroupsContext, IsAuxiliaryWindowFocusedContext, ActiveCompareEditorOriginalWriteableContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
134134
import { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
135135
import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom';
136136
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
@@ -140,7 +140,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
140140
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
141141
import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
142142
import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
143-
@@ -84,7 +84,7 @@ export class WorkbenchContextKeysHandler
143+
@@ -87,7 +87,7 @@ export class WorkbenchContextKeysHandler
144144
@IContextKeyService private readonly contextKeyService: IContextKeyService,
145145
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
146146
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -149,7 +149,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
149149
@IProductService private readonly productService: IProductService,
150150
@IEditorService private readonly editorService: IEditorService,
151151
@IEditorResolverService private readonly editorResolverService: IEditorResolverService,
152-
@@ -220,6 +220,10 @@ export class WorkbenchContextKeysHandler
152+
@@ -224,6 +224,10 @@ export class WorkbenchContextKeysHandler
153153
this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
154154
this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
155155

@@ -241,8 +241,8 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
241241
@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
242242
@IPathService protected readonly pathService: IPathService,
243243
@IKeybindingService private readonly keybindingService: IKeybindingService,
244-
@@ -287,20 +287,22 @@ export class SimpleFileDialog implements
245-
this.filePickBox.autoFocusOnList = false;
244+
@@ -286,20 +286,22 @@ export class SimpleFileDialog implements
245+
this.filePickBox.sortByLabel = false;
246246
this.filePickBox.ignoreFocusOut = true;
247247
this.filePickBox.ok = true;
248248
- if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
@@ -300,7 +300,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
300300
) {
301301
const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => {
302302
if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) {
303-
@@ -1283,15 +1285,17 @@ export class FileDragAndDrop implements
303+
@@ -1284,15 +1286,17 @@ export class FileDragAndDrop implements
304304

305305
// External file DND (Import/Upload file)
306306
if (data instanceof NativeDragAndDropData) {

0 commit comments

Comments
 (0)