@codingame/monaco-vscode-quickaccess-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/url/browser/url.contribution.js

@@ -1,26 +1,29 @@
+
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IURLService } from 'vscode/vscode/vs/platform/url/common/url.service';
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { ExternalUriResolverContribution } from './externalUriResolver.js';
-import { manageTrustedDomainSettingsCommand } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomains';
+import { manageTrustedDomainSettingsCommand } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { TrustedDomainsFileSystemProvider } from './trustedDomainsFileSystemProvider.js';
 import { OpenerValidatorContributions } from './trustedDomainsValidator.js';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
-import 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
+import '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 class OpenUrlAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.url.openUrl',
-            title: ( localize2(1447, 'Open URL')),
+            title: ( localize2(10474, 'Open URL')),
             category: Categories.Developer,
             f1: true
         });
@@ -28,9 +31,9 @@ class OpenUrlAction extends Action2 {
     async run(accessor) {
         const quickInputService = accessor.get(IQuickInputService);
         const urlService = accessor.get(IURLService);
-        return quickInputService.input({ prompt: ( localize(1448, "URL to open")) }).then(input => {
+        return quickInputService.input({ prompt: ( localize(10475, "URL to open")) }).then(input => {
             if (input) {
-                const uri = ( (URI.parse(input)));
+                const uri = ( URI.parse(input));
                 urlService.open(uri, { originalUrl: input });
             }
         });
@@ -44,19 +47,21 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         title: manageTrustedDomainSettingsCommand.description.description
     }
 });
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(OpenerValidatorContributions, 3 );
-registerWorkbenchContribution2(TrustedDomainsFileSystemProvider.ID, TrustedDomainsFileSystemProvider, 2 );
-registerWorkbenchContribution2(ExternalUriResolverContribution.ID, ExternalUriResolverContribution, 2 );
-const configurationRegistry = ( (Registry.as(Extensions$1.Configuration)));
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(OpenerValidatorContributions, LifecyclePhase.Restored);
+registerWorkbenchContribution2(TrustedDomainsFileSystemProvider.ID, TrustedDomainsFileSystemProvider, WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(ExternalUriResolverContribution.ID, ExternalUriResolverContribution, WorkbenchPhase.BlockRestore
+);
+const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
 configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
         'workbench.trustedDomains.promptInTrustedWorkspace': {
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             type: 'boolean',
             default: false,
             description: ( localize(
-                1449,
+                10476,
                 "When enabled, trusted domain prompts will appear when opening links in trusted workspaces."
             ))
         }

package/vscode/src/vs/workbench/services/quickinput/browser/quickInputService.d.ts

@@ -0,0 +1,15 @@
+import { ILayoutService } from "vscode/vscode/vs/platform/layout/browser/layoutService.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { QuickInputController } from "vscode/vscode/vs/platform/quickinput/browser/quickInputController";
+import { QuickInputService as BaseQuickInputService } from "vscode/vscode/vs/platform/quickinput/browser/quickInputService";
+export declare class QuickInputService extends BaseQuickInputService {
+    private readonly keybindingService;
+    private readonly inQuickInputContext;
+    constructor(configurationService: IConfigurationService, instantiationService: IInstantiationService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, themeService: IThemeService, layoutService: ILayoutService);
+    private registerListeners;
+    protected createController(): QuickInputController;
+}

package/vscode/src/vs/workbench/services/quickinput/browser/quickInputService.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
@@ -6,7 +7,8 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { QuickInputService as QuickInputService$1 } from 'vscode/vscode/vs/platform/quickinput/browser/quickInputService';
-import { InQuickPickContextKey } from 'vscode/vscode/vs/workbench/browser/quickaccess';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { InQuickPickContextKey } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/workbench/browser/quickaccess';
 
 let QuickInputService = class QuickInputService extends QuickInputService$1 {
     constructor(configurationService, instantiationService, keybindingService, contextKeyService, themeService, layoutService) {

package/quickaccess.js

@@ -1,115 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
-import { StandaloneQuickInputService } from 'vscode/vscode/vs/editor/standalone/browser/quickInput/standaloneQuickInputService';
-import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { QuickInputService } from './vscode/src/vs/workbench/services/quickinput/browser/quickInputService.js';
-import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { StandaloneCodeEditor } from 'vscode/vscode/vs/editor/standalone/browser/standaloneCodeEditor';
-import { CommandsQuickAccessProvider } from './vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js';
-import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
-import './vscode/src/vs/workbench/browser/actions/quickAccessActions.js';
-import './vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js';
-import './vscode/src/vs/workbench/contrib/url/browser/url.contribution.js';
-import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
-
-let isKeybindingConfigurationVisible = () => {
-    return false;
-};
-let shouldUseGlobalPicker = (_activeCodeEditor, _activeCodeEditorStandalone) => {
-    return false;
-};
-const original = CommandsQuickAccessProvider.prototype['getCommandPicks'];
-CommandsQuickAccessProvider.prototype['getCommandPicks'] = async function (token) {
-    let result = await original.call(this, token);
-    if (!isKeybindingConfigurationVisible()) {
-        result = ( result.map((picks) => ({
-            ...picks,
-            buttons: undefined
-        })));
-    }
-    return result;
-};
-let DelegateQuickInputService = class DelegateQuickInputService {
-    constructor(instantiationService) {
-        this.instantiationService = instantiationService;
-        this.workbenchQuickInputService = instantiationService.createInstance(QuickInputService);
-    }
-    get activeService() {
-        const activeCodeEditor = StandaloneServices.get(ICodeEditorService).getFocusedCodeEditor();
-        if (activeCodeEditor == null ||
-            shouldUseGlobalPicker(activeCodeEditor, activeCodeEditor instanceof StandaloneCodeEditor)) {
-            return this.workbenchQuickInputService;
-        }
-        this.standaloneQuickInputService ?? (this.standaloneQuickInputService = this.instantiationService.createInstance(StandaloneQuickInputService));
-        return this.standaloneQuickInputService;
-    }
-    get currentQuickInput() {
-        return this.activeService.currentQuickInput;
-    }
-    get quickAccess() {
-        return this.activeService.quickAccess;
-    }
-    get backButton() {
-        return this.activeService.backButton;
-    }
-    get onShow() {
-        return this.activeService.onShow;
-    }
-    get onHide() {
-        return this.activeService.onHide;
-    }
-    createQuickWidget() {
-        return this.activeService.createQuickWidget();
-    }
-    pick(picks, options = {}, token = CancellationToken.None) {
-        return this.activeService
-            .pick(picks, options, token);
-    }
-    input(options, token) {
-        return this.activeService.input(options, token);
-    }
-    createQuickPick(options = { useSeparators: false }) {
-        return this.activeService.createQuickPick(options);
-    }
-    createInputBox() {
-        return this.activeService.createInputBox();
-    }
-    focus() {
-        return this.activeService.focus();
-    }
-    toggle() {
-        return this.activeService.toggle();
-    }
-    navigate(next, quickNavigate) {
-        return this.activeService.navigate(next, quickNavigate);
-    }
-    accept() {
-        return this.activeService.accept();
-    }
-    back() {
-        return this.activeService.back();
-    }
-    cancel() {
-        return this.activeService.cancel();
-    }
-};
-DelegateQuickInputService = __decorate([
-    ( __param(0, IInstantiationService))
-], DelegateQuickInputService);
-function getServiceOverride({ isKeybindingConfigurationVisible: _isKeybindingConfigurationVisible, shouldUseGlobalPicker: _shouldUseGlobalPicker } = {}) {
-    if (_isKeybindingConfigurationVisible != null) {
-        isKeybindingConfigurationVisible = _isKeybindingConfigurationVisible;
-    }
-    if (_shouldUseGlobalPicker != null) {
-        shouldUseGlobalPicker = _shouldUseGlobalPicker;
-    }
-    return {
-        [( IQuickInputService.toString())]: new SyncDescriptor(DelegateQuickInputService, [], true)
-    };
-}
-
-export { getServiceOverride as default };