Skip to content
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

Remove cyclic dependency #389

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Remove cyclic dependency #389

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
21 changes: 13 additions & 8 deletions src/extensions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ import { parse } from 'vs/base/common/json'
import { IFileService } from 'vs/platform/files/common/files'
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'
import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'
import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices'
import { IExtensionWithExtHostKind, ExtensionServiceOverride } from './service-override/extensions'
import { CustomSchemas, registerExtensionFile } from './service-override/files'
import { getService } from './services'
import { waitServicesReady } from './lifecycle'
import { ExtensionManifestTranslator } from './tools/l10n'
import { throttle, memoized } from './tools'
import { setDefaultApi } from './extension.api'
Expand Down Expand Up @@ -82,13 +83,15 @@ interface ExtensionDelta {
toRemove: IExtension[]
}
const deltaExtensions = throttle(async ({ toAdd, toRemove }: ExtensionDelta) => {
const extensionService = await getService(IExtensionService) as ExtensionServiceOverride
await waitServicesReady()
const extensionService = StandaloneServices.get(IExtensionService) as ExtensionServiceOverride
await extensionService.deltaExtensions(toAdd, toRemove)
}, (a, b) => ({ toAdd: [...a.toAdd, ...b.toAdd], toRemove: [...a.toRemove, ...b.toRemove] }), 0)

export async function registerRemoteExtension (directory: string): Promise<RegisterRemoteExtensionResult> {
const fileService = await getService(IFileService)
const remoteAuthority = (await getService(IWorkbenchEnvironmentService)).remoteAuthority
await waitServicesReady()
const fileService = StandaloneServices.get(IFileService)
const remoteAuthority = StandaloneServices.get(IWorkbenchEnvironmentService).remoteAuthority
const content = await fileService.readFile(joinPath(URI.from({ scheme: Schemas.vscodeRemote, authority: remoteAuthority, path: directory }), 'package.json'))
const manifest: IExtensionManifest = parse(content.value.toString())

Expand All @@ -113,13 +116,14 @@ export function registerExtension (manifest: IExtensionManifest, extHostKind?: E
const location = URI.from({ scheme: CustomSchemas.extensionFile, authority: id, path })

const addExtensionPromise = (async () => {
const remoteAuthority = (await getService(IWorkbenchEnvironmentService)).remoteAuthority
await waitServicesReady()
const remoteAuthority = StandaloneServices.get(IWorkbenchEnvironmentService).remoteAuthority
let realLocation = location
if (extHostKind === ExtensionHostKind.Remote) {
realLocation = URI.from({ scheme: Schemas.vscodeRemote, authority: remoteAuthority, path })
}

const instantiationService = await getService(IInstantiationService)
const instantiationService = StandaloneServices.get(IInstantiationService)
const translator = instantiationService.createInstance(ExtensionManifestTranslator)

const localizedManifest = await translator.translateManifest(realLocation, manifest)
Expand All @@ -146,7 +150,7 @@ export function registerExtension (manifest: IExtensionManifest, extHostKind?: E
}

// Wait for extension to be enabled
const extensionEnablementService = await getService(IWorkbenchExtensionEnablementService)
const extensionEnablementService = StandaloneServices.get(IWorkbenchExtensionEnablementService)
if (extensionEnablementService.isEnabled(extension)) {
await deltaExtensions({ toAdd: [extension], toRemove: [] })
}
Expand All @@ -160,7 +164,8 @@ export function registerExtension (manifest: IExtensionManifest, extHostKind?: E
await addExtensionPromise
},
async isEnabled () {
const extensionEnablementService = await getService(IWorkbenchExtensionEnablementService)
await waitServicesReady()
const extensionEnablementService = StandaloneServices.get(IWorkbenchExtensionEnablementService)
const extension = await addExtensionPromise
return extensionEnablementService.isEnabled(extension)
},
Expand Down