@codingame/monaco-vscode-quickaccess-service-override 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "2.0.3-improve-modularity.1",
+  "version": "2.1.0-update-vscode-1.86.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3-improve-modularity.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0-update-vscode-1.86.1",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputService, ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
@@ -181,29 +181,29 @@ class BaseQuickAccessNavigateAction extends Action2 {
 }
 class QuickAccessNavigateNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigateNext', { value: ( localizeWithPath(
+        super('workbench.action.quickOpenNavigateNext', ( localize2WithPath(
             'vs/workbench/browser/actions/quickAccessActions',
             'quickNavigateNext',
-            "Navigate Next in Quick Open"
-        )), original: 'Navigate Next in Quick Open' }, true, true);
+            'Navigate Next in Quick Open'
+        )), true, true);
     }
 }
 class QuickAccessNavigatePreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigatePrevious', { value: ( localizeWithPath(
+        super('workbench.action.quickOpenNavigatePrevious', ( localize2WithPath(
             'vs/workbench/browser/actions/quickAccessActions',
             'quickNavigatePrevious',
-            "Navigate Previous in Quick Open"
-        )), original: 'Navigate Previous in Quick Open' }, false, true);
+            'Navigate Previous in Quick Open'
+        )), false, true);
     }
 }
 class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectNext', { value: ( localizeWithPath(
+        super('workbench.action.quickOpenSelectNext', ( localize2WithPath(
             'vs/workbench/browser/actions/quickAccessActions',
             'quickSelectNext',
-            "Select Next in Quick Open"
-        )), original: 'Select Next in Quick Open' }, true, false, {
+            'Select Next in Quick Open'
+        )), true, false, {
             weight: 200  + 50,
             when: inQuickPickContext,
             primary: 0,
@@ -213,11 +213,11 @@ class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
 }
 class QuickAccessSelectPreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectPrevious', { value: ( localizeWithPath(
+        super('workbench.action.quickOpenSelectPrevious', ( localize2WithPath(
             'vs/workbench/browser/actions/quickAccessActions',
             'quickSelectPrevious',
-            "Select Previous in Quick Open"
-        )), original: 'Select Previous in Quick Open' }, false, false, {
+            'Select Previous in Quick Open'
+        )), false, false, {
             weight: 200  + 50,
             when: inQuickPickContext,
             primary: 0,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { AbstractGotoLineQuickAccessProvider } from 'vscode/vscode/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
@@ -51,11 +51,11 @@ class GotoLineAction extends Action2 {
     constructor() {
         super({
             id: GotoLineAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess',
                 'gotoLine',
-                "Go to Line/Column..."
-            )), original: 'Go to Line/Column...' },
+                'Go to Line/Column...'
+            )),
             f1: true,
             keybinding: {
                 weight: 200 ,

package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { CommandsHistory } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { MenuId, MenuItemAction, Action2, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -230,11 +230,11 @@ class ShowAllCommandsAction extends Action2 {
     constructor() {
         super({
             id: ShowAllCommandsAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
                 'showTriggerActions',
-                "Show All Commands"
-            )), original: 'Show All Commands' },
+                'Show All Commands'
+            )),
             keybinding: {
                 weight: 200 ,
                 when: undefined,
@@ -252,11 +252,11 @@ class ClearCommandHistoryAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.clearCommandHistory',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
                 'clearCommandHistory',
-                "Clear Command History"
-            )), original: 'Clear Command History' },
+                'Clear Command History'
+            )),
             f1: true
         });
     }

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js

@@ -1,8 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { IQuickInputService, ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { IViewDescriptorService, IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output';
 import { ITerminalService, ITerminalGroupService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -217,11 +218,11 @@ class OpenViewPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenViewPickerAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/quickaccess/browser/viewQuickAccess',
                 'openView',
-                "Open View"
-            )), original: 'Open View' },
+                'Open View'
+            )),
             category: Categories.View,
             f1: true
         });
@@ -240,11 +241,11 @@ class QuickAccessViewPickerAction extends Action2 {
     constructor() {
         super({
             id: QuickAccessViewPickerAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/quickaccess/browser/viewQuickAccess',
                 'quickOpenView',
-                "Quick Open View"
-            )), original: 'Quick Open View' },
+                'Quick Open View'
+            )),
             category: Categories.View,
             f1: false,
             keybinding: {

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

@@ -1,5 +1,5 @@
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuRegistry, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
@@ -18,7 +18,7 @@ class OpenUrlAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.url.openUrl',
-            title: { value: ( localizeWithPath('vs/workbench/contrib/url/browser/url.contribution', 'openUrl', "Open URL")), original: 'Open URL' },
+            title: ( localize2WithPath('vs/workbench/contrib/url/browser/url.contribution', 'openUrl', 'Open URL')),
             category: Categories.Developer,
             f1: true
         });

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

@@ -7,15 +7,12 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { QuickInputService as QuickInputService$1 } from 'vscode/vscode/vs/platform/quickinput/browser/quickInputService';
 import { InQuickPickContextKey } from 'vscode/vscode/vs/workbench/browser/quickaccess';
-import { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
 
 let QuickInputService = class QuickInputService extends QuickInputService$1 {
     constructor(configurationService, instantiationService, keybindingService, contextKeyService, themeService, layoutService, hoverService) {
-        super(instantiationService, contextKeyService, themeService, layoutService);
-        this.configurationService = configurationService;
+        super(instantiationService, contextKeyService, themeService, layoutService, configurationService, hoverService);
         this.keybindingService = keybindingService;
-        this.hoverService = hoverService;
-        this.hoverDelegate = ( new QuickInputHoverDelegate(this.configurationService, this.hoverService));
         this.inQuickInputContext = InQuickPickContextKey.bindTo(this.contextKeyService);
         this.registerListeners();
     }
@@ -27,7 +24,6 @@ let QuickInputService = class QuickInputService extends QuickInputService$1 {
         return super.createController(this.layoutService, {
             ignoreFocusOut: () => !this.configurationService.getValue('workbench.quickOpen.closeOnFocusLost'),
             backKeybindingLabel: () => this.keybindingService.lookupKeybinding('workbench.action.quickInputBack')?.getLabel() || undefined,
-            hoverDelegate: this.hoverDelegate
         });
     }
 };
@@ -40,39 +36,5 @@ QuickInputService = ( __decorate([
     ( __param(5, ILayoutService)),
     ( __param(6, IHoverService))
 ], QuickInputService));
-class QuickInputHoverDelegate {
-    get delay() {
-        if (Date.now() - this.lastHoverHideTime < 200) {
-            return 0;
-        }
-        return this.configurationService.getValue('workbench.hover.delay');
-    }
-    constructor(configurationService, hoverService) {
-        this.configurationService = configurationService;
-        this.hoverService = hoverService;
-        this.lastHoverHideTime = 0;
-        this.placement = 'element';
-    }
-    showHover(options, focus) {
-        const showHoverHint = (options.content instanceof HTMLElement
-            ? options.content.textContent ?? ''
-            : typeof options.content === 'string'
-                ? options.content
-                : options.content.value).length > 20;
-        return this.hoverService.showHover({
-            ...options,
-            persistence: {
-                hideOnKeyDown: false,
-            },
-            appearance: {
-                showHoverHint,
-                skipFadeInAnimation: true,
-            },
-        }, focus);
-    }
-    onDidHideHover() {
-        this.lastHoverHideTime = Date.now();
-    }
-}
 
 export { QuickInputService };