Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4f57ab6

Browse files
benz0libenz0li
committedMay 3, 2024
Update Code to 1.89.0
1 parent fb2afbd commit 4f57ab6

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed
 

‎lib/vscode

Submodule vscode updated 1211 files

‎patches/base-path.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/base/common/network.ts
1212
+++ code-server/lib/vscode/src/vs/base/common/network.ts
13-
@@ -198,7 +198,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -205,7 +205,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,

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

Lines changed: 1 addition & 1 deletion
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-
@@ -283,6 +283,10 @@ export class Extension implements IExten
10+
@@ -284,6 +284,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

‎patches/display-language.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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-
@@ -342,9 +342,6 @@ export class InstallAction extends Exten
351+
@@ -341,9 +341,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-
@@ -615,7 +612,7 @@ export abstract class InstallInOtherServ
361+
@@ -614,7 +611,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-
@@ -1843,17 +1840,6 @@ export class SetLanguageAction extends E
370+
@@ -1842,17 +1839,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-
@@ -1870,7 +1856,6 @@ export class ClearLanguageAction extends
388+
@@ -1869,7 +1855,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-
@@ -1880,17 +1865,6 @@ export class ClearLanguageAction extends
396+
@@ -1879,17 +1864,6 @@ export class ClearLanguageAction extends
397397
update(): void {
398398
this.enabled = false;
399399
this.class = ClearLanguageAction.DisabledClass;

‎patches/external-file-actions.diff

Lines changed: 6 additions & 6 deletions
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-
@@ -289,6 +289,16 @@ export interface IWorkbenchConstructionO
30+
@@ -303,6 +303,16 @@ export interface IWorkbenchConstructionO
3131
*/
3232
readonly userDataPath?: string
3333

@@ -173,7 +173,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
173173
import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
174174
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
175175
import { ThemeIcon } from 'vs/base/common/themables';
176-
@@ -550,13 +550,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
176+
@@ -553,13 +553,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
177177
id: DOWNLOAD_COMMAND_ID,
178178
title: DOWNLOAD_LABEL
179179
},
@@ -197,7 +197,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
197197
)
198198
}));
199199

200-
@@ -568,6 +571,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo
200+
@@ -571,6 +574,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo
201201
title: UPLOAD_LABEL,
202202
},
203203
when: ContextKeyExpr.and(
@@ -287,10 +287,10 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
287287
import { mainWindow } from 'vs/base/browser/window';
288288
import { IExplorerFileContribution, explorerFileContribRegistry } from 'vs/workbench/contrib/files/browser/explorerFileContrib';
289289
+import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
290-
import { IHoverWidget } from 'vs/base/browser/ui/hover/updatableHoverWidget';
290+
import type { IHoverWidget } from 'vs/base/browser/ui/hover/hover';
291291

292292
export class ExplorerDelegate implements IListVirtualDelegate<ExplorerItem> {
293-
@@ -1080,7 +1081,8 @@ export class FileDragAndDrop implements
293+
@@ -1085,7 +1086,8 @@ export class FileDragAndDrop implements
294294
@IConfigurationService private configurationService: IConfigurationService,
295295
@IInstantiationService private instantiationService: IInstantiationService,
296296
@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
@@ -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-
@@ -1305,15 +1307,17 @@ export class FileDragAndDrop implements
303+
@@ -1310,15 +1312,17 @@ export class FileDragAndDrop implements
304304

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

‎patches/getting-started.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
1919
import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
2020
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
2121
import { Button } from 'vs/base/browser/ui/button/button';
22-
@@ -55,7 +55,7 @@ import { IRecentFolder, IRecentWorkspace
22+
@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace
2323
import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
2424
import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
2525
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
2828
import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor';
2929
import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
3030
import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors';
31-
@@ -813,6 +813,72 @@ export class GettingStartedPage extends
31+
@@ -816,6 +816,72 @@ export class GettingStartedPage extends
3232
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
3333
);
3434

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
101101
const leftColumn = $('.categories-column.categories-column-left', {},);
102102
const rightColumn = $('.categories-column.categories-column-right', {},);
103103

104-
@@ -884,6 +950,9 @@ export class GettingStartedPage extends
104+
@@ -887,6 +953,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -135,7 +135,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
135135
===================================================================
136136
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
137137
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
138-
@@ -299,6 +299,11 @@ export interface IWorkbenchConstructionO
138+
@@ -313,6 +313,11 @@ export interface IWorkbenchConstructionO
139139
*/
140140
readonly isEnabledFileUploads?: boolean
141141

‎patches/integration.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
184184
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
185185
import { IProgressService } from 'vs/platform/progress/common/progress';
186186
import { DelayedLogChannel } from 'vs/workbench/services/output/common/delayedLogChannel';
187-
@@ -130,6 +131,9 @@ export class BrowserMain extends Disposa
187+
@@ -131,6 +132,9 @@ export class BrowserMain extends Disposa
188188
// Startup
189189
const instantiationService = workbench.startup();
190190

‎patches/local-storage.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
3030
===================================================================
3131
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
3232
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
33-
@@ -284,6 +284,11 @@ export interface IWorkbenchConstructionO
33+
@@ -298,6 +298,11 @@ export interface IWorkbenchConstructionO
3434
*/
3535
readonly configurationDefaults?: Record<string, any>;
3636

0 commit comments

Comments
 (0)
Please sign in to comment.