Skip to content

refactor: remove coder-link stuff #10

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 3, 2021
Merged

refactor: remove coder-link stuff #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 2 additions & 31 deletions src/vs/workbench/services/extensions/browser/extensionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { IWorkbenchExtensionEnablementService, IWebExtensionsScannerService } fr
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IExtensionService, IExtensionHost, toExtensionDescription, ExtensionRunningLocation, extensionRunningLocationToString, ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensions';
import { IExtensionService, IExtensionHost, toExtensionDescription, ExtensionRunningLocation, extensionRunningLocationToString } from 'vs/workbench/services/extensions/common/extensions';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IFileService } from 'vs/platform/files/common/files';
import { IProductService } from 'vs/platform/product/common/productService';
Expand All @@ -22,15 +22,14 @@ import { ExtensionIdentifier, IExtensionDescription, ExtensionKind, IExtension,
import { FetchFileSystemProvider } from 'vs/workbench/services/extensions/browser/webWorkerFileSystemProvider';
import { Schemas } from 'vs/base/common/network';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
import { IUserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
import { IAutomatedWindow } from 'vs/platform/log/browser/log';
import { ILogService } from 'vs/platform/log/common/log';
import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';

export class ExtensionService extends AbstractExtensionService implements IExtensionService {

Expand All @@ -50,7 +49,6 @@ export class ExtensionService extends AbstractExtensionService implements IExten
@IConfigurationService configurationService: IConfigurationService,
@IRemoteAuthorityResolverService private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService,
@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
@IRemoteExplorerService private readonly _remoteExplorerService: IRemoteExplorerService,
@IWebExtensionsScannerService webExtensionsScannerService: IWebExtensionsScannerService,
@ILifecycleService private readonly _lifecycleService: ILifecycleService,
@IExtensionManifestPropertiesService extensionManifestPropertiesService: IExtensionManifestPropertiesService,
Expand Down Expand Up @@ -78,33 +76,6 @@ export class ExtensionService extends AbstractExtensionService implements IExten
this._lifecycleService.when(LifecyclePhase.Ready).then(async () => {
await this._userDataInitializationService.initializeInstalledExtensions(this._instantiationService);
await this._initialize();

try {
// This enables the `vscode.workspace.registerRemoteAuthorityResolver` API to be executed.
//
// It's specifically scoped to the "coder-link" scheme at the moment to reduce external
// dependency on forking VS Code functionality.
//
// The remote host doesn't resolve to an extension host like the API expects, but instead
// we only utilize the tunnel functionality.
const extHost = this._getExtensionHostManager(ExtensionHostKind.Remote);
const resolved = await extHost?.resolveAuthority('coder-link+web');
if (resolved) {
this._remoteExplorerService.setTunnelInformation(resolved.tunnelInformation);
}
} catch (error: any) {
let message = '';

if (error instanceof RemoteAuthorityResolverError && error._code === RemoteAuthorityResolverErrorCode.NoResolverFound) {
message = error.message;
}

if (error instanceof Error) {
message = error.message;
}

this._logOrShowMessage(Severity.Ignore, nls.localize('link', "Failed to initialize remote Link authority: {0}", message || error));
}
});

this._initFetchFileSystem();
Expand Down