@codingame/monaco-vscode-timeline-service-override 2.2.2 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-timeline-service-override",
-  "version": "2.2.2",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

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

@@ -1,5 +1,4 @@
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { LocalHistoryTimeline } from './localHistoryTimeline.js';
 
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(LocalHistoryTimeline, 2 );
+registerWorkbenchContribution2(LocalHistoryTimeline.ID, LocalHistoryTimeline, 2 );

package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.js

@@ -22,7 +22,7 @@ import { getVirtualWorkspaceAuthority } from 'vscode/vscode/vs/platform/workspac
 var LocalHistoryTimeline_1;
 let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
     static { LocalHistoryTimeline_1 = this; }
-    static { this.ID = 'timeline.localHistory'; }
+    static { this.ID = 'workbench.contrib.localHistoryTimeline'; }
     static { this.LOCAL_HISTORY_ENABLED_SETTINGS_KEY = 'workbench.localHistory.enabled'; }
     constructor(timelineService, workingCopyHistoryService, pathService, fileService, environmentService, configurationService, contextService) {
         super();
@@ -33,7 +33,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
         this.environmentService = environmentService;
         this.configurationService = configurationService;
         this.contextService = contextService;
-        this.id = LocalHistoryTimeline_1.ID;
+        this.id = 'timeline.localHistory';
         this.label = ( localizeWithPath(
             'vs/workbench/contrib/localHistory/browser/localHistoryTimeline',
             'localHistory',
@@ -73,7 +73,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
     }
     onDidChangeWorkingCopyHistoryEntry(entry) {
         this._onDidChange.fire({
-            id: LocalHistoryTimeline_1.ID,
+            id: this.id,
             uri: entry?.workingCopy.resource,
             reset: true
         });
@@ -101,7 +101,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
             }
         }
         return {
-            source: LocalHistoryTimeline_1.ID,
+            source: this.id,
             items
         };
     }
@@ -113,7 +113,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
                 `$(history) ${getLocalHistoryDateFormatter().format(entry.timestamp)}\n\n${SaveSourceRegistry.getSourceLabel(entry.source)}`,
                 { supportThemeIcons: true }
             )),
-            source: LocalHistoryTimeline_1.ID,
+            source: this.id,
             timestamp: entry.timestamp,
             themeIcon: LOCAL_HISTORY_ICON_ENTRY,
             contextValue: LOCAL_HISTORY_MENU_CONTEXT_VALUE,

package/vscode/src/vs/workbench/contrib/timeline/browser/timelinePane.js

@@ -42,10 +42,10 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegate';
 
 const ItemHeight = 22;
 function isLoadMoreCommand(item) {
@@ -571,7 +571,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     }
                 }
                 const iterator = timeline.items[Symbol.iterator]();
-                sources.push({ timeline: timeline, iterator: iterator, nextItem: iterator.next() });
+                sources.push({ timeline, iterator, nextItem: iterator.next() });
             }
             this._visibleItemCount = hasAnyItems ? 1 : 0;
             function getNextMostRecentSource() {
@@ -864,7 +864,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     this.tree.domFocus();
                 }
             },
-            getActionsContext: () => ({ uri: this.uri, item: item }),
+            getActionsContext: () => ({ uri: this.uri, item }),
             actionRunner: ( new TimelineActionRunner())
         });
     }
@@ -896,14 +896,11 @@ class TimelineElementTemplate {
     constructor(container, actionViewItemProvider, hoverDelegate) {
         container.classList.add('custom-view-tree-node-item');
         this.icon = append(container, $('.custom-view-tree-node-item-icon'));
-        this.iconLabel = ( new IconLabel(
-            container,
-            { supportHighlights: true, supportIcons: true, hoverDelegate: hoverDelegate }
-        ));
+        this.iconLabel = ( new IconLabel(container, { supportHighlights: true, supportIcons: true, hoverDelegate }));
         const timestampContainer = append(this.iconLabel.element, $('.timeline-timestamp-container'));
         this.timestamp = append(timestampContainer, $('span.timeline-timestamp'));
         const actionsContainer = append(this.iconLabel.element, $('.actions'));
-        this.actionBar = ( new ActionBar(actionsContainer, { actionViewItemProvider: actionViewItemProvider }));
+        this.actionBar = ( new ActionBar(actionsContainer, { actionViewItemProvider }));
     }
     dispose() {
         this.iconLabel.dispose();
@@ -930,7 +927,7 @@ class TimelineActionRunner extends ActionRunner {
             $mid: 12 ,
             handle: item.handle,
             source: item.source,
-            uri: uri
+            uri
         }, uri, item.source);
     }
 }
@@ -948,20 +945,15 @@ class TimelineListVirtualDelegate {
     }
 }
 let TimelineTreeRenderer = class TimelineTreeRenderer {
-    constructor(commands, instantiationService, themeService, hoverService, configurationService) {
+    constructor(commands, instantiationService, themeService) {
         this.commands = commands;
         this.instantiationService = instantiationService;
         this.themeService = themeService;
-        this.hoverService = hoverService;
-        this.configurationService = configurationService;
         this._onDidScrollToEnd = ( new Emitter());
         this.onDidScrollToEnd = this._onDidScrollToEnd.event;
         this.templateId = TimelineElementTemplate.id;
         this.actionViewItemProvider = createActionViewItem.bind(undefined, this.instantiationService);
-        this._hoverDelegate = {
-            showHover: (options) => this.hoverService.showHover(options),
-            delay: this.configurationService.getValue('workbench.hover.delay')
-        };
+        this._hoverDelegate = getDefaultHoverDelegate('mouse');
     }
     setUri(uri) {
         this.uri = uri;
@@ -1007,7 +999,7 @@ let TimelineTreeRenderer = class TimelineTreeRenderer {
         template.timestamp.textContent = item.relativeTime ?? '';
         template.timestamp.ariaLabel = item.relativeTimeFullWord ?? '';
         template.timestamp.parentElement.classList.toggle('timeline-timestamp--duplicate', isTimelineItem(item) && item.hideRelativeTime);
-        template.actionBar.context = { uri: this.uri, item: item };
+        template.actionBar.context = { uri: this.uri, item };
         template.actionBar.actionRunner = ( new TimelineActionRunner());
         template.actionBar.push(this.commands.getItemActions(item), { icon: true, label: false });
         if (isLoadMoreCommand(item)) {
@@ -1020,9 +1012,7 @@ let TimelineTreeRenderer = class TimelineTreeRenderer {
 };
 TimelineTreeRenderer = ( __decorate([
     ( __param(1, IInstantiationService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IHoverService)),
-    ( __param(4, IConfigurationService))
+    ( __param(2, IThemeService))
 ], TimelineTreeRenderer));
 const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localizeWithPath(
     'vs/workbench/contrib/timeline/browser/timelinePane',