Skip to content

Commit efce005

Browse files
jsjoeiojsjoeio
authored
chore: update Code to 1.72.2 (#5650)
* chore: update Code to 1.72.2 * chore: refresh integration patch * chore: refresh base-path * chore: refresh proposed-api patch * chore: refresh marketplace patch * chore: refresh webview patch * chore: refresh disable-builtin patch * chore: refresh logout, update-check patches * chor: refresh proxy-uri patch * fix: delete unique-db patch This was supposed to be removed in #5519 Looks like I didn't update the series or actually delete the patch. * fix: drop log-level patch This was merged upstream! * chore: refresh local-storage patch * chore: refresh service-worker patch * chore: refresh sourcemaps patch * chore: refresh disable-downloads patch * chore: refresh telemetry patch * chore: refresh language patch * chore: refresh cli-window-open patch * Revert "fix: delete unique-db patch" This reverts commit ca0506c. * fixup!: rm extra spaces integration patch * fixup: space * fixup! update unique-db patch * fixup!: update hash in webview patch * fixup! update marketplace patch * fixup!: remove comma
1 parent 4a06d97 commit efce005

20 files changed

+75
-115
lines changed

‎lib/vscode

Submodule vscode updated 1352 files

‎patches/base-path.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactor
104104
connect(host: string, port: number, path: string, query: string, debugLabel: string, callback: IConnectCallback): void {
105105
const webSocketSchema = (/^https:/.test(window.location.href) ? 'wss' : 'ws');
106106
+ path = (window.location.pathname + "/" + path).replace(/\/\/+/g, "/")
107-
const socket = this._webSocketFactory.create(`${webSocketSchema}://${/:/.test(host) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
107+
const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
108108
const errorListener = socket.onError((err) => callback(err, undefined));
109109
socket.onOpen(() => {
110110
@@ -282,6 +283,3 @@ export class BrowserSocketFactory implem
@@ -262,15 +262,15 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
262262
===================================================================
263263
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
264264
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
265-
@@ -485,6 +485,7 @@ function doCreateUri(path: string, query
265+
@@ -489,6 +489,7 @@ function doCreateUri(path: string, query
266266
});
267267
}
268268

269269
+ path = (window.location.pathname + "/" + path).replace(/\/\/+/g, "/")
270270
return URI.parse(window.location.href).with({ path, query });
271271
}
272272

273-
@@ -496,7 +497,7 @@ function doCreateUri(path: string, query
273+
@@ -500,7 +501,7 @@ function doCreateUri(path: string, query
274274
if (!configElement || !configElementAttribute) {
275275
throw new Error('Missing web configuration element');
276276
}

‎patches/cli-window-open.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTe
1717
===================================================================
1818
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
1919
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
20-
@@ -99,10 +99,14 @@ class RemoteTerminalBackend extends Base
20+
@@ -100,10 +100,14 @@ class RemoteTerminalBackend extends Base
2121
}
2222
const reqId = e.reqId;
2323
const commandId = e.commandId;

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

+2-2
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-
@@ -236,6 +236,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-
@@ -1121,6 +1125,10 @@ export class ExtensionsWorkbenchService
21+
@@ -1234,6 +1238,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

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
1212
===================================================================
1313
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
1414
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
15-
@@ -267,6 +267,11 @@ export interface IWorkbenchConstructionO
15+
@@ -271,6 +271,11 @@ export interface IWorkbenchConstructionO
1616
*/
1717
readonly userDataPath?: string
1818

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

6767
/* ----- server setup ----- */
6868

69-
@@ -95,6 +96,7 @@ export interface ServerParsedArgs {
69+
@@ -94,6 +95,7 @@ export interface ServerParsedArgs {
7070
/* ----- code-server ----- */
7171
'disable-update-check'?: boolean;
7272
'auth'?: string
@@ -84,25 +84,25 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
8484
userDataPath: this._environmentService.userDataPath,
8585
+ isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
8686
_wrapWebWorkerExtHostInIframe,
87-
developmentOptions: {
88-
enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined,
87+
developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
88+
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
8989
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
9393
@@ -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';
96-
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext } 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 } 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, IsEnabledFileDownloads } from 'vs/workbench/common/contextkeys';
96+
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';
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';
102102
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
103103
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
104104
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
105-
import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
105+
import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
106106
import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
107107
@@ -25,6 +24,7 @@ import { IPaneCompositePartService } fro
108108
import { Schemas } from 'vs/base/common/network';
@@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
112112

113113
export class WorkbenchContextKeysHandler extends Disposable {
114114
private inputFocusedContext: IContextKey<boolean>;
115-
@@ -76,7 +76,7 @@ export class WorkbenchContextKeysHandler
115+
@@ -77,7 +77,7 @@ export class WorkbenchContextKeysHandler
116116
@IContextKeyService private readonly contextKeyService: IContextKeyService,
117117
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
118118
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -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-
@@ -199,6 +199,9 @@ export class WorkbenchContextKeysHandler
124+
@@ -202,6 +202,9 @@ export class WorkbenchContextKeysHandler
125125
this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
126126
this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
127127

@@ -172,7 +172,7 @@ 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-
@@ -30,6 +30,8 @@ export const IsFullscreenContext = new R
175+
@@ -32,6 +32,8 @@ export const IsFullscreenContext = new R
176176

177177
export const HasWebFileSystemAccess = new RawContextKey<boolean>('hasWebFileSystemAccess', false, true); // Support for FileSystemAccess web APIs (https://wicg.github.io/file-system-access)
178178

‎patches/display-language.diff

+7-23
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1919
===================================================================
2020
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
2121
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
22-
@@ -212,6 +212,9 @@ export async function setupServerService
22+
@@ -209,6 +209,9 @@ export async function setupServerService
2323
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2424
socketServer.registerChannel('extensions', channel);
2525

@@ -39,11 +39,11 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
3939
*--------------------------------------------------------------------------------------------*/
4040
-import * as nls from 'vs/nls';
4141
-
42-
const LANGUAGE_DEFAULT = 'en';
42+
export const LANGUAGE_DEFAULT = 'en';
4343

4444
let _isWindows = false;
45-
@@ -81,17 +79,19 @@ if (typeof navigator === 'object' && !is
46-
_isLinux = _userAgent.indexOf('Linux') >= 0;
45+
@@ -83,17 +81,19 @@ if (typeof navigator === 'object' && !is
46+
_isMobile = _userAgent?.indexOf('Mobi') >= 0;
4747
_isWeb = true;
4848

4949
- const configuredLocale = nls.getConfiguredDefaultLocale(
@@ -216,7 +216,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
216216

217217
const workbenchWebConfiguration = {
218218
remoteAuthority,
219-
@@ -339,6 +342,7 @@ export class WebClientServer {
219+
@@ -336,6 +339,7 @@ export class WebClientServer {
220220
WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
221221
BASE: base,
222222
VS_BASE: vscodeBase,
@@ -236,7 +236,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
236236

237237
/* ----- server setup ----- */
238238

239-
@@ -97,6 +98,7 @@ export interface ServerParsedArgs {
239+
@@ -96,6 +97,7 @@ export interface ServerParsedArgs {
240240
'disable-update-check'?: boolean;
241241
'auth'?: string
242242
'disable-file-downloads'?: boolean;
@@ -248,7 +248,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
248248
===================================================================
249249
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
250250
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
251-
@@ -122,8 +122,9 @@ import 'vs/workbench/contrib/logs/browse
251+
@@ -123,8 +123,9 @@ import 'vs/workbench/contrib/logs/browse
252252
// Explorer
253253
import 'vs/workbench/contrib/files/browser/files.web.contribution';
254254

@@ -314,19 +314,3 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/localization/electron-san
314314
await this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['locale'], value: locale }], true);
315315
return true;
316316
}
317-
Index: code-server/lib/vscode/src/vs/base/node/languagePacks.js
318-
===================================================================
319-
--- code-server.orig/lib/vscode/src/vs/base/node/languagePacks.js
320-
+++ code-server/lib/vscode/src/vs/base/node/languagePacks.js
321-
@@ -73,7 +73,10 @@
322-
function getLanguagePackConfigurations(userDataPath) {
323-
const configFile = path.join(userDataPath, 'languagepacks.json');
324-
try {
325-
- return nodeRequire(configFile);
326-
+ // This must not use Node's require otherwise it will be cached forever.
327-
+ // Code can get away with this since the process actually restarts but
328-
+ // that is not currently the case with code-server.
329-
+ return JSON.parse(fs.readFileSync(configFile, "utf8"));
330-
} catch (err) {
331-
// Do nothing. If we can't read the file we have no
332-
// language pack config.

‎patches/integration.diff

+2-1
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,13 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html
221221

222222
<!-- Disable pinch zooming -->
223223
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
224-
@@ -26,8 +27,9 @@
224+
@@ -26,9 +27,9 @@
225225
<meta id="vscode-workbench-builtin-extensions" data-settings="{{WORKBENCH_BUILTIN_EXTENSIONS}}">
226226

227227
<!-- Workbench Icon/Manifest/CSS -->
228228
- <link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/favicon.ico" type="image/x-icon" />
229229
- <link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/manifest.json" crossorigin="use-credentials" />
230+
-
230231
+ <link rel="icon" href="/_static/src/browser/media/favicon-dark-support.svg" />
231232
+ <link rel="alternate icon" href="/_static/src/browser/media/favicon.ico" type="image/x-icon" />
232233
+ <link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />

‎patches/local-storage.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
2626
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
2727
+ userDataPath: this._environmentService.userDataPath,
2828
_wrapWebWorkerExtHostInIframe,
29-
developmentOptions: {
30-
enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined,
29+
developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
30+
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
3131
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-
@@ -262,6 +262,11 @@ export interface IWorkbenchConstructionO
35+
@@ -266,6 +266,11 @@ export interface IWorkbenchConstructionO
3636
*/
3737
readonly configurationDefaults?: Record<string, any>;
3838

‎patches/log-level.diff

-21
This file was deleted.

0 commit comments

Comments
 (0)