Skip to content

Commit a67f1e9

Browse files
repo-ranger[bot]repo-ranger[bot]
authored
Merge branch 'main' into jsjoeio/update-install-docs
2 parents 940a60e + 3367e1a commit a67f1e9

20 files changed

+66
-78
lines changed

‎lib/vscode

Submodule vscode updated 1272 files

‎patches/base-path.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
119119
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
120120
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
121121
@@ -267,12 +267,11 @@ export class WebClientServer {
122-
return res.end();
122+
return void res.end();
123123
}
124124

125125
- const getFirstHeader = (headerName: string) => {
@@ -176,7 +176,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
176176
`frame-src 'self' https://*.vscode-cdn.net data:;`,
177177
'worker-src \'self\' data:;',
178178
@@ -417,3 +421,70 @@ export class WebClientServer {
179-
return res.end(data);
179+
return void res.end(data);
180180
}
181181
}
182182
+
@@ -279,10 +279,10 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
279279

280280
// Create workbench
281281
create(document.body, {
282-
Index: code-server/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts
282+
Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
283283
===================================================================
284-
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts
285-
+++ code-server/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts
284+
--- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
285+
+++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
286286
@@ -16,7 +16,6 @@ import { getServiceMachineId } from 'vs/
287287
import { IStorageService } from 'vs/platform/storage/common/storage';
288288
import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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-
@@ -1234,6 +1238,10 @@ export class ExtensionsWorkbenchService
21+
@@ -1237,6 +1241,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: 6 additions & 6 deletions
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-
@@ -31,6 +31,11 @@ export interface IBrowserWorkbenchEnviro
31+
@@ -32,6 +32,11 @@ export interface IBrowserWorkbenchEnviro
3232
* Options used to configure the workbench.
3333
*/
3434
readonly options?: IWorkbenchConstructionOptions;
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
4040
}
4141

4242
export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvironmentService {
43-
@@ -62,6 +67,13 @@ export class BrowserWorkbenchEnvironment
43+
@@ -87,6 +92,13 @@ export class BrowserWorkbenchEnvironment
4444
return this.options.userDataPath;
4545
}
4646

@@ -135,16 +135,16 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
135135
===================================================================
136136
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
137137
+++ code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
138-
@@ -22,7 +22,7 @@ import { CLOSE_SAVED_EDITORS_COMMAND_ID,
138+
@@ -20,7 +20,7 @@ import { CLOSE_SAVED_EDITORS_COMMAND_ID,
139139
import { AutoSaveAfterShortDelayContext } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
140140
import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService';
141141
import { Schemas } from 'vs/base/common/network';
142-
-import { DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey } from 'vs/workbench/common/contextkeys';
143-
+import { DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, IsEnabledFileDownloads } from 'vs/workbench/common/contextkeys';
142+
-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext } from 'vs/workbench/common/contextkeys';
143+
+import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, IsEnabledFileDownloads } from 'vs/workbench/common/contextkeys';
144144
import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
145145
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
146146
import { ThemeIcon } from 'vs/platform/theme/common/themeService';
147-
@@ -477,13 +477,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
147+
@@ -483,13 +483,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
148148
id: DOWNLOAD_COMMAND_ID,
149149
title: DOWNLOAD_LABEL
150150
},

‎patches/display-language.diff

Lines changed: 25 additions & 17 deletions
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-
@@ -209,6 +209,9 @@ export async function setupServerService
22+
@@ -216,6 +216,9 @@ export async function setupServerService
2323
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2424
socketServer.registerChannel('extensions', channel);
2525

@@ -125,7 +125,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ
125125
===================================================================
126126
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
127127
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
128-
@@ -105,7 +105,7 @@ export abstract class AbstractNativeEnvi
128+
@@ -110,7 +110,7 @@ export abstract class AbstractNativeEnvi
129129
return URI.file(join(vscodePortable, 'argv.json'));
130130
}
131131

@@ -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-
@@ -123,8 +123,9 @@ import 'vs/workbench/contrib/logs/browse
251+
@@ -119,8 +119,9 @@ import 'vs/workbench/contrib/logs/browse
252252
// Explorer
253253
import 'vs/workbench/contrib/files/browser/files.web.contribution';
254254

@@ -264,27 +264,35 @@ Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePack
264264
===================================================================
265265
--- code-server.orig/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
266266
+++ code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
267-
@@ -4,10 +4,23 @@
268-
*--------------------------------------------------------------------------------------------*/
269-
270-
import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
267+
@@ -6,18 +6,24 @@
268+
import { CancellationTokenSource } from 'vs/base/common/cancellation';
269+
import { Language } from 'vs/base/common/platform';
270+
import { URI } from 'vs/base/common/uri';
271271
+import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
272-
+import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
272+
import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
273+
import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
274+
-import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
275+
+import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
276+
import { ILogService } from 'vs/platform/log/common/log';
273277
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
274-
+import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
275278

276279
export class WebLanguagePacksService extends LanguagePackBaseService {
277-
- // Web doesn't have a concept of language packs, so we just return an empty array
278280
+ private readonly languagePackService: ILanguagePackService;
279281
+
280-
+ constructor(
282+
constructor(
281283
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService,
282-
+ @IExtensionGalleryService extensionGalleryService: IExtensionGalleryService
283-
+ ) {
284-
+ super(extensionGalleryService)
285-
+ this.languagePackService = ProxyChannel.toService<ILanguagePackService>(remoteAgentService.getConnection()!.getChannel('languagePacks'));
286-
+ }
287-
+
284+
@IExtensionResourceLoaderService private readonly extensionResourceLoaderService: IExtensionResourceLoaderService,
285+
@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
286+
@ILogService private readonly logService: ILogService
287+
) {
288+
super(extensionGalleryService);
289+
+ this.languagePackService = ProxyChannel.toService<ILanguagePackService>(remoteAgentService.getConnection()!.getChannel('languagePacks'))
290+
}
291+
292+
async getBuiltInExtensionTranslationsUri(id: string): Promise<URI | undefined> {
293+
@@ -73,6 +79,6 @@ export class WebLanguagePacksService ext
294+
295+
// Web doesn't have a concept of language packs, so we just return an empty array
288296
getInstalledLanguages(): Promise<ILanguagePackItem[]> {
289297
- return Promise.resolve([]);
290298
+ return this.languagePackService.getInstalledLanguages()

‎patches/exec-argv.diff

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎patches/getting-started.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
159159
===================================================================
160160
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
161161
+++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
162-
@@ -36,6 +36,11 @@ export interface IBrowserWorkbenchEnviro
162+
@@ -37,6 +37,11 @@ export interface IBrowserWorkbenchEnviro
163163
* Enable downloading files via menu actions.
164164
*/
165165
readonly isEnabledFileDownloads?: boolean;
@@ -171,7 +171,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
171171
}
172172

173173
export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvironmentService {
174-
@@ -74,6 +79,13 @@ export class BrowserWorkbenchEnvironment
174+
@@ -99,6 +104,13 @@ export class BrowserWorkbenchEnvironment
175175
return this.options.isEnabledFileDownloads;
176176
}
177177

‎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-
@@ -116,6 +117,9 @@ export class BrowserMain extends Disposa
187+
@@ -117,6 +118,9 @@ export class BrowserMain extends Disposa
188188
// Startup
189189
const instantiationService = workbench.startup();
190190

‎patches/local-storage.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
4848
===================================================================
4949
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
5050
+++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
51-
@@ -53,7 +53,14 @@ export class BrowserWorkbenchEnvironment
52-
get logFile(): URI { return joinPath(this.logsHome, 'window.log'); }
51+
@@ -78,7 +78,14 @@ export class BrowserWorkbenchEnvironment
52+
get logFile(): URI { return joinPath(this.windowLogsPath, 'window.log'); }
5353

5454
@memoize
5555
- get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.vscodeUserData }); }

‎patches/logout.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/serverEnvironmentService.ts
2121
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2222
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2323
@@ -13,6 +13,7 @@ import { IEnvironmentService, INativeEnv
24-
export const serverOptions: OptionDescriptions<ServerParsedArgs> = {
24+
export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
2525
/* ----- code-server ----- */
2626
'disable-update-check': { type: 'boolean' },
2727
+ 'auth': { type: 'string' },

‎patches/marketplace.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
6565
},
6666
callbackRoute: this._callbackRoute
6767
};
68-
Index: code-server/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts
68+
Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
6969
===================================================================
70-
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts
71-
+++ code-server/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts
70+
--- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
71+
+++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
7272
@@ -16,7 +16,6 @@ import { getServiceMachineId } from 'vs/
7373
import { IStorageService } from 'vs/platform/storage/common/storage';
7474
import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';

‎patches/proposed-api.diff

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Unconditionally enable the proposed API
22

3-
To test run an extension that uses the proposed API.
3+
To test run an extension that uses the proposed API (i.e.
4+
https://github.com/microsoft/vscode-extension-samples/tree/ddae6c0c9ff203b4ed6f6b43bfacdd0834215f83/proposed-api-sample)
45

56
We also override isProposedApiEnabled in case an extension does not declare the
67
APIs it needs correctly (the Jupyter extension had this issue).
@@ -9,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstra
910
===================================================================
1011
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
1112
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
12-
@@ -1462,7 +1462,7 @@ class ProposedApiController {
13+
@@ -1482,7 +1482,7 @@ class ProposedApiController {
1314

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

@@ -22,7 +23,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens
2223
===================================================================
2324
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
2425
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
25-
@@ -359,10 +359,7 @@ function extensionDescriptionArrayToMap(
26+
@@ -364,10 +364,7 @@ function extensionDescriptionArrayToMap(
2627
}
2728

2829
export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean {

‎patches/proxy-uri.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
9292
===================================================================
9393
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
9494
+++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
95-
@@ -247,7 +247,7 @@ export class BrowserMain extends Disposa
95+
@@ -248,7 +248,7 @@ export class BrowserMain extends Disposa
9696

9797
// Remote
9898
const connectionToken = environmentService.options.connectionToken || getCookieValue(connectionTokenCookieName);
@@ -105,7 +105,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalE
105105
===================================================================
106106
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
107107
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
108-
@@ -392,7 +392,7 @@ export async function createTerminalEnvi
108+
@@ -381,7 +381,7 @@ export async function createTerminalEnvi
109109

110110
// Sanitize the environment, removing any undesirable VS Code and Electron environment
111111
// variables

‎patches/series

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ disable-downloads.diff
1818
telemetry.diff
1919
display-language.diff
2020
cli-window-open.diff
21-
exec-argv.diff
2221
getting-started.diff

‎patches/sourcemaps.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
1010
===================================================================
1111
--- code-server.orig/lib/vscode/build/gulpfile.reh.js
1212
+++ code-server/lib/vscode/build/gulpfile.reh.js
13-
@@ -191,8 +191,7 @@ function packageTask(type, platform, arc
13+
@@ -192,8 +192,7 @@ function packageTask(type, platform, arc
1414

1515
const src = gulp.src(sourceFolderName + '/**', { base: '.' })
1616
.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
2020

2121
const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
2222
const isUIExtension = (manifest) => {
23-
@@ -231,9 +230,9 @@ function packageTask(type, platform, arc
23+
@@ -232,9 +231,9 @@ function packageTask(type, platform, arc
2424
.map(name => `.build/extensions/${name}/**`);
2525

2626
const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
3232

3333
let version = packageJson.version;
3434
const quality = product.quality;
35-
@@ -387,7 +386,7 @@ function tweakProductForServerWeb(produc
35+
@@ -388,7 +387,7 @@ function tweakProductForServerWeb(produc
3636
const minifyTask = task.define(`minify-vscode-${type}`, task.series(
3737
optimizeTask,
3838
util.rimraf(`out-vscode-${type}-min`),

0 commit comments

Comments
 (0)