@codingame/monaco-vscode-markers-service-override 4.5.2 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-markers-service-override",
-  "version": "4.5.2",
+  "version": "5.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.1"
   }
 }

package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js

@@ -21,6 +21,7 @@ import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var MarkerSeverityColumnRenderer_1, MarkerCodeColumnRenderer_1, MarkerFileColumnRenderer_1;
 const _moduleId = "vs/workbench/contrib/markers/browser/markersTable";
@@ -74,7 +75,8 @@ MarkerSeverityColumnRenderer = MarkerSeverityColumnRenderer_1 = ( (__decorate([
 let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
     static { MarkerCodeColumnRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'code'; }
-    constructor(openerService) {
+    constructor(hoverService, openerService) {
+        this.hoverService = hoverService;
         this.openerService = openerService;
         this.templateId = MarkerCodeColumnRenderer_1.TEMPLATE_ID;
     }
@@ -85,7 +87,13 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
         sourceLabel.element.classList.add('source-label');
         const codeLabel = templateDisposable.add(( (new HighlightedLabel(codeColumn))));
         codeLabel.element.classList.add('code-label');
-        const codeLink = templateDisposable.add(( (new Link(codeColumn, { href: '', label: '' }, {}, this.openerService))));
+        const codeLink = templateDisposable.add(( (new Link(
+            codeColumn,
+            { href: '', label: '' },
+            {},
+            this.hoverService,
+            this.openerService
+        ))));
         return { codeColumn, sourceLabel, codeLabel, codeLink, templateDisposable };
     }
     renderElement(element, index, templateData, height) {
@@ -121,7 +129,8 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
     }
 };
 MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = ( (__decorate([
-    ( (__param(0, IOpenerService)))
+    ( (__param(0, IHoverService))),
+    ( (__param(1, IOpenerService)))
 ], MarkerCodeColumnRenderer)));
 class MarkerMessageColumnRenderer {
     constructor() {

package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js

@@ -1,6 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { append, $, clearNode, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
-import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { dirname, basename as basename$1 } from 'vscode/vscode/vs/base/common/path';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
@@ -13,7 +12,7 @@ import { DisposableStore, Disposable, toDisposable, dispose } from 'vscode/vscod
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { QuickFixAction, QuickFixActionViewItem } from './markersViewActions.js';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
-import { dirname as dirname$1, basename, isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { basename, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { FilterOptions } from './markersFilterOptions.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
@@ -28,7 +27,6 @@ import { ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { SeverityIcon } from 'vscode/vscode/vs/platform/severityIcon/browser/severityIcon';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
@@ -40,8 +38,8 @@ import { MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/c
 import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 const _moduleId = "vs/workbench/contrib/markers/browser/markersTreeViewer";
 let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvider {
@@ -93,11 +91,9 @@ class VirtualDelegate {
         }
     }
 }
-let ResourceMarkersRenderer = class ResourceMarkersRenderer {
-    constructor(labels, onDidChangeRenderNodeCount, labelService, fileService) {
+class ResourceMarkersRenderer {
+    constructor(labels, onDidChangeRenderNodeCount) {
         this.labels = labels;
-        this.labelService = labelService;
-        this.fileService = fileService;
         this.renderedNodes = ( (new Map()));
         this.disposables = ( (new DisposableStore()));
         this.templateId = "rm" ;
@@ -113,12 +109,7 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
     renderElement(node, _, templateData) {
         const resourceMarkers = node.element;
         const uriMatches = node.filterData && node.filterData.uriMatches || [];
-        if (this.fileService.hasProvider(resourceMarkers.resource) || resourceMarkers.resource.scheme === Schemas.untitled) {
-            templateData.resourceLabel.setFile(resourceMarkers.resource, { matches: uriMatches });
-        }
-        else {
-            templateData.resourceLabel.setResource({ name: resourceMarkers.name, description: this.labelService.getUriLabel(dirname$1(resourceMarkers.resource), { relative: true }), resource: resourceMarkers.resource }, { matches: uriMatches });
-        }
+        templateData.resourceLabel.setFile(resourceMarkers.resource, { matches: uriMatches });
         this.updateCount(node, templateData);
         const nodeRenders = this.renderedNodes.get(resourceMarkers) ?? [];
         this.renderedNodes.set(resourceMarkers, [...nodeRenders, templateData]);
@@ -152,14 +143,11 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
     dispose() {
         this.disposables.dispose();
     }
-};
-ResourceMarkersRenderer = ( (__decorate([
-    ( (__param(2, ILabelService))),
-    ( (__param(3, IFileService)))
-], ResourceMarkersRenderer)));
+}
 let MarkerRenderer = class MarkerRenderer {
-    constructor(markersViewState, instantiationService, openerService) {
+    constructor(markersViewState, hoverService, instantiationService, openerService) {
         this.markersViewState = markersViewState;
+        this.hoverService = hoverService;
         this.instantiationService = instantiationService;
         this.openerService = openerService;
         this.templateId = "m" ;
@@ -169,6 +157,7 @@ let MarkerRenderer = class MarkerRenderer {
         data.markerWidget = ( (new MarkerWidget(
             container,
             this.markersViewState,
+            this.hoverService,
             this.openerService,
             this.instantiationService
         )));
@@ -182,8 +171,9 @@ let MarkerRenderer = class MarkerRenderer {
     }
 };
 MarkerRenderer = ( (__decorate([
-    ( (__param(1, IInstantiationService))),
-    ( (__param(2, IOpenerService)))
+    ( (__param(1, IHoverService))),
+    ( (__param(2, IInstantiationService))),
+    ( (__param(3, IOpenerService)))
 ], MarkerRenderer)));
 const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, ( localizeWithPath(
     _moduleId,
@@ -210,10 +200,11 @@ class ToggleMultilineActionViewItem extends ActionViewItem {
     }
 }
 class MarkerWidget extends Disposable {
-    constructor(parent, markersViewModel, _openerService, _instantiationService) {
+    constructor(parent, markersViewModel, _hoverService, _openerService, _instantiationService) {
         super();
         this.parent = parent;
         this.markersViewModel = markersViewModel;
+        this._hoverService = _hoverService;
         this._openerService = _openerService;
         this.disposables = this._register(( (new DisposableStore())));
         this.actionBar = this._register(( (new ActionBar(append(parent, $('.actions')), {
@@ -222,7 +213,7 @@ class MarkerWidget extends Disposable {
         this.iconContainer = append(parent, $(''));
         this.icon = append(this.iconContainer, $(''));
         this.messageAndDetailsContainer = append(parent, $('.marker-message-details-container'));
-        this.messageAndDetailsContainerHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.messageAndDetailsContainer, ''));
+        this.messageAndDetailsContainerHover = this._register(this._hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.messageAndDetailsContainer, ''));
     }
     render(element, filterData) {
         this.actionBar.clear();
@@ -317,6 +308,7 @@ class MarkerWidget extends Disposable {
                         parent,
                         { href: link, label: container, title: link },
                         undefined,
+                        this._hoverService,
                         this._openerService
                     ))));
                     const codeMatches = filterData && filterData.codeMatches || [];

package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js

@@ -45,6 +45,7 @@ import { ResourceListDnDHandler } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { MarkersTable } from './markersTable.js';
 import { Markers, MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 const _moduleId = "vs/workbench/contrib/markers/browser/markersView";
 function createResourceMarkersIterator(resourceMarkers) {
@@ -57,7 +58,7 @@ function createResourceMarkersIterator(resourceMarkers) {
     );
 }
 let MarkersView = class MarkersView extends FilterViewPane {
-    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, telemetryService, markerService, contextKeyService, workspaceContextService, contextMenuService, uriIdentityService, keybindingService, storageService, openerService, themeService) {
+    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, telemetryService, markerService, contextKeyService, workspaceContextService, contextMenuService, uriIdentityService, keybindingService, storageService, openerService, themeService, hoverService) {
         const memento = ( (new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService)));
         const panelState = memento.getMemento(1 , 1 );
         super({
@@ -69,7 +70,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
                 text: panelState['filter'] || '',
                 history: panelState['filterHistory'] || []
             }
-        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorService = editorService;
         this.markerService = markerService;
         this.workspaceContextService = workspaceContextService;
@@ -111,6 +112,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
     render() {
         super.render();
         this._register(registerNavigableContainer({
+            name: 'markersView',
             focusNotifiers: [this, this.filterWidget],
             focusNextWidget: () => {
                 if (this.filterWidget.hasFocus()) {
@@ -128,9 +130,15 @@ let MarkersView = class MarkersView extends FilterViewPane {
         super.renderBody(parent);
         parent.classList.add('markers-panel');
         this._register(addDisposableListener(parent, 'keydown', e => {
-            if (this.keybindingService.mightProducePrintableCharacter(( (new StandardKeyboardEvent(e))))) {
-                this.focusFilter();
+            const event = ( (new StandardKeyboardEvent(e)));
+            if (!this.keybindingService.mightProducePrintableCharacter(event)) {
+                return;
             }
+            const result = this.keybindingService.softDispatch(event, event.target);
+            if (result.kind === 1  || result.kind === 2 ) {
+                return;
+            }
+            this.focusFilter();
         }));
         const panelContainer = append(parent, $('.markers-panel-container'));
         this.createArialLabelElement(panelContainer);
@@ -375,9 +383,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
                 return null;
             }),
             expandOnlyOnTwistieClick: (e) => e instanceof Marker && e.relatedInformation.length > 0,
-            overrideStyles: {
-                listBackground: this.getBackgroundColor()
-            },
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             selectionNavigation: true,
             multipleSelectionSupport: true,
         });
@@ -747,7 +753,8 @@ MarkersView = ( (__decorate([
     ( (__param(11, IKeybindingService))),
     ( (__param(12, IStorageService))),
     ( (__param(13, IOpenerService))),
-    ( (__param(14, IThemeService)))
+    ( (__param(14, IThemeService))),
+    ( (__param(15, IHoverService)))
 ], MarkersView)));
 let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
     constructor(user, container, delegate, renderers, options, instantiationService, contextKeyService, listService, themeService, configurationService) {