-
Notifications
You must be signed in to change notification settings - Fork 6k
chore: upgrade Code to 1.73.0 #5751
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
568f0ac
134ab92
91575e1
95bfeac
49fa8a2
f58d91e
9ee00a6
bf8b8e0
2476e41
cd0d1d2
44fa1f3
c2c6e37
d888456
8c15dfa
fd3427b
a2860d2
0c149bf
8b57956
b53ca8a
78c02a1
43e71fb
504a56f
0760db7
957635a
0b8ddc8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts | |
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts | ||
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts | ||
@@ -209,6 +209,9 @@ export async function setupServerService | ||
@@ -216,6 +216,9 @@ export async function setupServerService | ||
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)); | ||
socketServer.registerChannel('extensions', channel); | ||
|
||
|
@@ -125,7 +125,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ | |
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts | ||
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts | ||
@@ -105,7 +105,7 @@ export abstract class AbstractNativeEnvi | ||
@@ -110,7 +110,7 @@ export abstract class AbstractNativeEnvi | ||
return URI.file(join(vscodePortable, 'argv.json')); | ||
} | ||
|
||
|
@@ -248,7 +248,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts | |
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts | ||
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts | ||
@@ -123,8 +123,9 @@ import 'vs/workbench/contrib/logs/browse | ||
@@ -119,8 +119,9 @@ import 'vs/workbench/contrib/logs/browse | ||
// Explorer | ||
import 'vs/workbench/contrib/files/browser/files.web.contribution'; | ||
|
||
|
@@ -264,27 +264,35 @@ Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePack | |
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts | ||
+++ code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts | ||
@@ -4,10 +4,23 @@ | ||
*--------------------------------------------------------------------------------------------*/ | ||
|
||
import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks'; | ||
@@ -6,18 +6,24 @@ | ||
import { CancellationTokenSource } from 'vs/base/common/cancellation'; | ||
import { Language } from 'vs/base/common/platform'; | ||
import { URI } from 'vs/base/common/uri'; | ||
+import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc'; | ||
+import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks'; | ||
import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement'; | ||
import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader'; | ||
-import { ILanguagePackItem, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks'; | ||
+import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks'; | ||
import { ILogService } from 'vs/platform/log/common/log'; | ||
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; | ||
+import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement'; | ||
|
||
export class WebLanguagePacksService extends LanguagePackBaseService { | ||
- // Web doesn't have a concept of language packs, so we just return an empty array | ||
+ private readonly languagePackService: ILanguagePackService; | ||
+ | ||
+ constructor( | ||
constructor( | ||
+ @IRemoteAgentService remoteAgentService: IRemoteAgentService, | ||
+ @IExtensionGalleryService extensionGalleryService: IExtensionGalleryService | ||
+ ) { | ||
+ super(extensionGalleryService) | ||
+ this.languagePackService = ProxyChannel.toService<ILanguagePackService>(remoteAgentService.getConnection()!.getChannel('languagePacks')); | ||
+ } | ||
+ | ||
@IExtensionResourceLoaderService private readonly extensionResourceLoaderService: IExtensionResourceLoaderService, | ||
@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService, | ||
@ILogService private readonly logService: ILogService | ||
) { | ||
super(extensionGalleryService); | ||
+ this.languagePackService = ProxyChannel.toService<ILanguagePackService>(remoteAgentService.getConnection()!.getChannel('languagePacks')) | ||
} | ||
|
||
async getBuiltInExtensionTranslationsUri(id: string): Promise<URI | undefined> { | ||
@@ -73,6 +79,6 @@ export class WebLanguagePacksService ext | ||
|
||
// Web doesn't have a concept of language packs, so we just return an empty array | ||
getInstalledLanguages(): Promise<ILanguagePackItem[]> { | ||
- return Promise.resolve([]); | ||
+ return this.languagePackService.getInstalledLanguages() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This was the only change I was hesitant about. Hope I did it right. I will test them all after first review. |
||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,8 +48,8 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi | |
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts | ||
+++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts | ||
@@ -53,7 +53,14 @@ export class BrowserWorkbenchEnvironment | ||
get logFile(): URI { return joinPath(this.logsHome, 'window.log'); } | ||
@@ -78,7 +78,14 @@ export class BrowserWorkbenchEnvironment | ||
get logFile(): URI { return joinPath(this.windowLogsPath, 'window.log'); } | ||
|
||
@memoize | ||
- get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.vscodeUserData }); } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm...this seems like it got dropped unintentionally. Guessing I'll need to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Okay doube-checked: seems fine as is. |
||
|
Uh oh!
There was an error while loading. Please reload this page.