Skip to content

Commit 833606e

Browse files
fritterhofffritterhoff
committed
chore: update patches
1 parent f25e0dc commit 833606e

11 files changed

+25
-20
lines changed

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

Lines changed: 2 additions & 2 deletions
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-
@@ -234,6 +234,10 @@ export class Extension implements IExten
10+
@@ -237,6 +237,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
1818
if (!this.local.preRelease && this.gallery.properties.isPreReleaseVersion) {
1919
return false;
2020
}
21-
@@ -1088,6 +1092,10 @@ export class ExtensionsWorkbenchService
21+
@@ -1122,6 +1126,10 @@ export class ExtensionsWorkbenchService
2222
// Skip if check updates only for builtin extensions and current extension is not builtin.
2323
continue;
2424
}

‎patches/disable-downloads.diff

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
9090
===================================================================
9191
--- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts
9292
+++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
93-
@@ -7,7 +7,7 @@ import { Event } from 'vs/base/common/ev
93+
@@ -7,12 +7,11 @@ import { Event } from 'vs/base/common/ev
9494
import { Disposable } from 'vs/base/common/lifecycle';
9595
import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
9696
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext } from 'vs/platform/contextkey/common/contextkeys';
@@ -99,15 +99,20 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
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';
102-
@@ -25,6 +25,7 @@ import { IPaneCompositePartService } fro
102+
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
103+
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
104+
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
105+
import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
106+
import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
107+
@@ -25,6 +24,7 @@ import { IPaneCompositePartService } fro
103108
import { Schemas } from 'vs/base/common/network';
104109
import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
105110
import { IProductService } from 'vs/platform/product/common/productService';
106111
+import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService';
107112

108113
export class WorkbenchContextKeysHandler extends Disposable {
109114
private inputFocusedContext: IContextKey<boolean>;
110-
@@ -76,7 +77,7 @@ export class WorkbenchContextKeysHandler
115+
@@ -76,7 +76,7 @@ export class WorkbenchContextKeysHandler
111116
@IContextKeyService private readonly contextKeyService: IContextKeyService,
112117
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
113118
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -116,7 +121,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
116121
@IProductService private readonly productService: IProductService,
117122
@IEditorService private readonly editorService: IEditorService,
118123
@IEditorResolverService private readonly editorResolverService: IEditorResolverService,
119-
@@ -198,6 +199,9 @@ export class WorkbenchContextKeysHandler
124+
@@ -198,6 +198,9 @@ export class WorkbenchContextKeysHandler
120125
// Auxiliary Bar
121126
this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
122127
this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));

‎patches/integration.diff

Lines changed: 2 additions & 2 deletions
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-
@@ -109,6 +110,9 @@ export class BrowserMain extends Disposa
187+
@@ -116,6 +117,9 @@ export class BrowserMain extends Disposa
188188
// Startup
189189
const instantiationService = workbench.startup();
190190

@@ -263,7 +263,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
263263
===================================================================
264264
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
265265
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
266-
@@ -307,6 +307,7 @@ export class WebClientServer {
266+
@@ -308,6 +308,7 @@ export class WebClientServer {
267267
folderUri: resolveWorkspaceURI(this._environmentService.args['default-folder']),
268268
workspaceUri: resolveWorkspaceURI(this._environmentService.args['default-workspace']),
269269
productConfiguration: <Partial<IProductConfiguration>>{

‎patches/local-storage.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
2020
===================================================================
2121
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2222
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
23-
@@ -299,6 +299,7 @@ export class WebClientServer {
23+
@@ -296,6 +296,7 @@ export class WebClientServer {
2424
const workbenchWebConfiguration = {
2525
remoteAuthority,
2626
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
3434
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
35-
@@ -245,6 +245,11 @@ export interface IWorkbenchConstructionO
35+
@@ -262,6 +262,11 @@ export interface IWorkbenchConstructionO
3636
*/
3737
readonly configurationDefaults?: Record<string, any>;
3838

@@ -63,4 +63,4 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
6363
+ }
6464

6565
@memoize
66-
get settingsResource(): URI { return joinPath(this.userRoamingDataHome, 'settings.json'); }
66+
get argvResource(): URI { return joinPath(this.userRoamingDataHome, 'argv.json'); }

‎patches/log-level.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/server/node/webClientServer.ts
77
===================================================================
88
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
99
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
10-
@@ -300,7 +300,10 @@ export class WebClientServer {
10+
@@ -297,7 +297,10 @@ export class WebClientServer {
1111
remoteAuthority,
1212
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
1313
_wrapWebWorkerExtHostInIframe,

‎patches/logout.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2828

2929
/* ----- server setup ----- */
3030

31-
@@ -92,6 +93,7 @@ export const serverOptions: OptionDescri
31+
@@ -93,6 +94,7 @@ export const serverOptions: OptionDescri
3232
export interface ServerParsedArgs {
3333
/* ----- code-server ----- */
3434
'disable-update-check'?: boolean;
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4040
===================================================================
4141
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
4242
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
43-
@@ -309,6 +309,7 @@ export class WebClientServer {
43+
@@ -306,6 +306,7 @@ export class WebClientServer {
4444
codeServerVersion: this._productService.codeServerVersion,
4545
rootEndpoint: base,
4646
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,

‎patches/marketplace.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4848
}
4949

5050
/**
51-
@@ -308,14 +308,7 @@ export class WebClientServer {
51+
@@ -305,14 +305,7 @@ export class WebClientServer {
5252
codeServerVersion: this._productService.codeServerVersion,
5353
rootEndpoint: base,
5454
embedderIdentifier: 'server-distro',

‎patches/proposed-api.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstra
99
===================================================================
1010
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
1111
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
12-
@@ -1451,7 +1451,7 @@ class ProposedApiController {
12+
@@ -1454,7 +1454,7 @@ class ProposedApiController {
1313

1414
this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id)));
1515

‎patches/service-worker.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
2121
===================================================================
2222
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2323
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
24-
@@ -315,6 +315,10 @@ export class WebClientServer {
24+
@@ -312,6 +312,10 @@ export class WebClientServer {
2525
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
2626
logoutEndpoint: this._environmentService.args['auth'] ? base + '/logout' : undefined,
2727
proxyEndpointTemplate: base + '/proxy/{{port}}',

‎patches/store-socket.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extHostExtensionService.
2424
import * as performance from 'vs/base/common/performance';
2525
import { createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl';
2626
import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
27-
@@ -69,6 +71,10 @@ export class ExtHostExtensionService ext
27+
@@ -72,6 +74,10 @@ export class ExtHostExtensionService ext
2828
if (this._initData.remote.isRemote && this._initData.remote.authority) {
2929
const cliServer = this._instaService.createInstance(CLIServer);
3030
process.env['VSCODE_IPC_HOOK_CLI'] = cliServer.ipcHandlePath;

0 commit comments

Comments
 (0)