Skip to content

Commit 1dd4eeb

Browse files
cdrcicode-asher
authored andcommitted
Update Code to 1.132.0
1 parent 208c81a commit 1dd4eeb

9 files changed

Lines changed: 25 additions & 19 deletions

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ Code v99.99.999
2222

2323
## Unreleased
2424

25+
Code v1.132.0
26+
27+
### Changed
28+
29+
- Update to Code 1.132.0
30+
2531
### Fixed
2632

2733
- When proxying, cookies were being decoded and re-encoded, which could cause

lib/vscode

Submodule vscode updated 1518 files

patches/base-path.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
146146
embedderIdentifier: 'server-distro',
147147
voiceWsUrl: this._productService.voiceWsUrl,
148148
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
149-
@@ -402,7 +409,9 @@ export class WebClientServer {
149+
@@ -403,7 +410,9 @@ export class WebClientServer {
150150
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
151151
WORKBENCH_WEB_BASE_URL: staticRoute,
152152
WORKBENCH_NLS_URL,
@@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
157157
};
158158

159159
// DEV ---------------------------------------------------------------------------------------
160-
@@ -439,7 +448,7 @@ export class WebClientServer {
160+
@@ -440,7 +449,7 @@ export class WebClientServer {
161161
'default-src \'self\';',
162162
'img-src \'self\' https: data: blob:;',
163163
'media-src \'self\';',
@@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
166166
'child-src \'self\';',
167167
`frame-src 'self' https://*.vscode-cdn.net data:;`,
168168
'worker-src \'self\' data: blob:;',
169-
@@ -512,3 +521,70 @@ export class WebClientServer {
169+
@@ -513,3 +522,70 @@ export class WebClientServer {
170170
return void res.end(data);
171171
}
172172
}

patches/display-language.diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
161161
import { CharCode } from '../../base/common/charCode.js';
162162
import { IExtensionManifest } from '../../platform/extensions/common/extensions.js';
163163
import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
164-
@@ -400,14 +401,22 @@ export class WebClientServer {
164+
@@ -401,14 +402,22 @@ export class WebClientServer {
165165
};
166166

167167
const cookies = cookie.parse(req.headers.cookie || '');
@@ -272,7 +272,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
272272
===================================================================
273273
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
274274
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
275-
@@ -474,9 +474,6 @@ export class InstallAction extends Exten
275+
@@ -475,9 +475,6 @@ export class InstallAction extends Exten
276276
if (this.extension.isBuiltin) {
277277
return;
278278
}
@@ -282,7 +282,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
282282
if (this.extension.state !== ExtensionState.Uninstalled) {
283283
return;
284284
}
285-
@@ -781,7 +778,7 @@ export abstract class InstallInOtherServ
285+
@@ -782,7 +779,7 @@ export abstract class InstallInOtherServ
286286
}
287287

288288
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -291,7 +291,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
291291
}
292292

293293
// Prefers to run on UI
294-
@@ -2282,17 +2279,6 @@ export class SetLanguageAction extends E
294+
@@ -2281,17 +2278,6 @@ export class SetLanguageAction extends E
295295
update(): void {
296296
this.enabled = false;
297297
this.class = SetLanguageAction.DisabledClass;
@@ -309,15 +309,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
309309
}
310310

311311
override async run(): Promise<any> {
312-
@@ -2309,7 +2295,6 @@ export class ClearLanguageAction extends
312+
@@ -2308,7 +2294,6 @@ export class ClearLanguageAction extends
313313
private static readonly DisabledClass = `${this.EnabledClass} disabled`;
314314

315315
constructor(
316316
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
317317
@ILocaleService private readonly localeService: ILocaleService,
318318
) {
319319
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
320-
@@ -2319,17 +2304,6 @@ export class ClearLanguageAction extends
320+
@@ -2318,17 +2303,6 @@ export class ClearLanguageAction extends
321321
update(): void {
322322
this.enabled = false;
323323
this.class = ClearLanguageAction.DisabledClass;

patches/external-file-actions.diff

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

@@ -166,12 +166,12 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
166166
import { AutoSaveAfterShortDelayContext } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
167167
import { WorkbenchListDoubleSelection } from '../../../../platform/list/browser/listService.js';
168168
import { Schemas } from '../../../../base/common/network.js';
169-
-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
170-
+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
169+
-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ActiveEditorDirtyContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
170+
+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsSessionsWindowContext, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ActiveEditorDirtyContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from '../../../common/contextkeys.js';
171171
import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
172172
import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
173173
import { ThemeIcon } from '../../../../base/common/themables.js';
174-
@@ -571,13 +571,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
174+
@@ -573,13 +573,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
175175
id: DOWNLOAD_COMMAND_ID,
176176
title: DOWNLOAD_LABEL
177177
},
@@ -195,7 +195,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
195195
)
196196
}));
197197

198-
@@ -589,6 +592,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo
198+
@@ -591,6 +594,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo
199199
title: UPLOAD_LABEL,
200200
},
201201
when: ContextKeyExpr.and(

patches/getting-started.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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-
@@ -322,6 +322,11 @@ export interface IWorkbenchConstructionO
138+
@@ -329,6 +329,11 @@ export interface IWorkbenchConstructionO
139139
*/
140140
readonly isEnabledFileUploads?: boolean
141141

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-
@@ -307,6 +307,11 @@ export interface IWorkbenchConstructionO
33+
@@ -314,6 +314,11 @@ export interface IWorkbenchConstructionO
3434
*/
3535
readonly configurationDefaults?: Record<string, unknown>;
3636

patches/proxy-uri.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExpl
148148
===================================================================
149149
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
150150
+++ code-server/lib/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
151-
@@ -84,8 +84,8 @@ export class ForwardedPortsView extends
151+
@@ -99,8 +99,8 @@ export class ForwardedPortsView extends
152152
private async enableForwardedPortsFeatures() {
153153
this.contextKeyListener.clear();
154154

patches/webview.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
2828
===================================================================
2929
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
3030
+++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
31-
@@ -226,7 +226,7 @@ export class BrowserWorkbenchEnvironment
31+
@@ -234,7 +234,7 @@ export class BrowserWorkbenchEnvironment
3232

3333
@memoize
3434
get webviewExternalEndpoint(): string {

0 commit comments

Comments
 (0)