diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts index 58e47a6f79d..6f51fe1b597 100644 --- a/extensions/typescript-language-features/src/extension.ts +++ b/extensions/typescript-language-features/src/extension.ts @@ -53,6 +53,12 @@ export function activate( new ExperimentationService(experimentTelemetryReporter, id, version, context.globalState); } + // Register features that work in both TSGO and non-TSGO modes + import('./languageFeatures/tsconfig').then(module => { + context.subscriptions.push(module.register()); + }); + + // Conditionally register features based on whether TSGO is enabled context.subscriptions.push(conditionalRegistration([ requireGlobalConfiguration('typescript', 'experimental.useTsgo'), requireHasVsCodeExtension(tsNativeExtensionId), @@ -95,10 +101,6 @@ export function activate( disposables.add(module.register(new Lazy(() => lazyClientHost.value.serviceClient))); }); - import('./languageFeatures/tsconfig').then(module => { - disposables.add(module.register()); - }); - disposables.add(lazilyActivateClient(lazyClientHost, pluginManager, activeJsTsEditorTracker)); return disposables;