@@ -23,14 +23,14 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
23
23
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
24
24
@@ -11,7 +11,7 @@ import * as path from 'vs/base/common/pa
25
25
import { IURITransformer } from 'vs/base/common/uriIpc';
26
- import { getMachineId, getSqmMachineId } from 'vs/base/node/id';
26
+ import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
27
27
import { Promises } from 'vs/base/node/pfs';
28
28
- import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
29
29
+ import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
30
30
import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net';
31
31
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
32
32
import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
33
- @@ -237 ,6 +237 ,9 @@ export async function setupServerService
33
+ @@ -238 ,6 +238 ,9 @@ export async function setupServerService
34
34
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
35
35
socketServer.registerChannel('extensions', channel);
36
36
@@ -348,7 +348,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
348
348
===================================================================
349
349
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
350
350
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
351
- @@ -342 ,9 +342 ,6 @@ export class InstallAction extends Exten
351
+ @@ -341 ,9 +341 ,6 @@ export class InstallAction extends Exten
352
352
if (this.extension.isBuiltin) {
353
353
return;
354
354
}
@@ -358,7 +358,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
358
358
if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) {
359
359
this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
360
360
this.updateLabel();
361
- @@ -615 ,7 +612 ,7 @@ export abstract class InstallInOtherServ
361
+ @@ -614 ,7 +611 ,7 @@ export abstract class InstallInOtherServ
362
362
}
363
363
364
364
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
367
367
}
368
368
369
369
// Prefers to run on UI
370
- @@ -1843 ,17 +1840 ,6 @@ export class SetLanguageAction extends E
370
+ @@ -1848 ,17 +1845 ,6 @@ export class SetLanguageAction extends E
371
371
update(): void {
372
372
this.enabled = false;
373
373
this.class = SetLanguageAction.DisabledClass;
@@ -385,15 +385,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
385
385
}
386
386
387
387
override async run(): Promise<any> {
388
- @@ -1870 ,7 +1856 ,6 @@ export class ClearLanguageAction extends
388
+ @@ -1875 ,7 +1861 ,6 @@ export class ClearLanguageAction extends
389
389
private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
390
390
391
391
constructor(
392
392
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
393
393
@ILocaleService private readonly localeService: ILocaleService,
394
394
) {
395
395
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
396
- @@ -1880 ,17 +1865 ,6 @@ export class ClearLanguageAction extends
396
+ @@ -1885 ,17 +1870 ,6 @@ export class ClearLanguageAction extends
397
397
update(): void {
398
398
this.enabled = false;
399
399
this.class = ClearLanguageAction.DisabledClass;
0 commit comments