@codingame/monaco-vscode-timeline-service-override 5.3.0 → 6.0.1

package/package.json

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

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

@@ -1,5 +1,5 @@
 import './localHistoryCommands.js';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { LocalHistoryTimeline } from './localHistoryTimeline.js';
 
-registerWorkbenchContribution2(LocalHistoryTimeline.ID, LocalHistoryTimeline, 2 );
+registerWorkbenchContribution2(LocalHistoryTimeline.ID, LocalHistoryTimeline, WorkbenchPhase.BlockRestore );

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

@@ -1,7 +1,7 @@
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { FileType, hasReadWriteCapability } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileSystemProviderCapabilities, FileType, hasReadWriteCapability } from 'vscode/vscode/vs/platform/files/common/files';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 
@@ -30,7 +30,7 @@ class LocalHistoryFileSystemProvider {
         associatedResource: LocalHistoryFileSystemProvider.EMPTY_RESOURCE
     }; }
     get capabilities() {
-        return 2  | 2048 ;
+        return FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.Readonly;
     }
     constructor(fileService) {
         this.fileService = fileService;

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

@@ -107,7 +107,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
             handle: entry.id,
             label: SaveSourceRegistry.getSourceLabel(entry.source),
             tooltip: ( (new MarkdownString(
-                `$(history) ${getLocalHistoryDateFormatter().format(entry.timestamp)}\n\n${SaveSourceRegistry.getSourceLabel(entry.source)}`,
+                `$(history) ${getLocalHistoryDateFormatter().format(entry.timestamp)}\n\n${SaveSourceRegistry.getSourceLabel(entry.source)}${entry.sourceDescription ? ` (${entry.sourceDescription})` : ``}`,
                 { supportThemeIcons: true }
             ))),
             source: this.id,

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

@@ -1,5 +1,6 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
 import { VIEW_CONTAINER } from 'vscode/vscode/vs/workbench/contrib/files/browser/explorerViewlet';

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

@@ -43,10 +43,12 @@ import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
+import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
@@ -204,10 +206,10 @@ let TimelinePane = class TimelinePane extends ViewPane {
         this.commands = this._register(this.instantiationService.createInstance(TimelinePaneCommands, this));
         this.followActiveEditorContext = TimelineFollowActiveEditorContext.bindTo(this.contextKeyService);
         this.timelineExcludeSourcesContext = TimelineExcludeSources.bindTo(this.contextKeyService);
-        const excludedSourcesString = storageService.get('timeline.excludeSources', 0 , '[]');
+        const excludedSourcesString = storageService.get('timeline.excludeSources', StorageScope.PROFILE, '[]');
         this.timelineExcludeSourcesContext.set(excludedSourcesString);
         this.excludedSources = ( (new Set(JSON.parse(excludedSourcesString))));
-        this._register(storageService.onDidChangeValue(0 , 'timeline.excludeSources', this._register(( (new DisposableStore()))))(this.onStorageServiceChanged, this));
+        this._register(storageService.onDidChangeValue(StorageScope.PROFILE, 'timeline.excludeSources', this._register(( (new DisposableStore()))))(this.onStorageServiceChanged, this));
         this._register(configurationService.onDidChangeConfiguration(this.onConfigurationChanged, this));
         this._register(timelineService.onDidChangeProviders(this.onProvidersChanged, this));
         this._register(timelineService.onDidChangeTimeline(this.onTimelineChanged, this));
@@ -256,7 +258,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         this.loadTimeline(true);
     }
     onStorageServiceChanged() {
-        const excludedSourcesString = this.storageService.get('timeline.excludeSources', 0 , '[]');
+        const excludedSourcesString = this.storageService.get('timeline.excludeSources', StorageScope.PROFILE, '[]');
         this.timelineExcludeSourcesContext.set(excludedSourcesString);
         this.excludedSources = ( (new Set(JSON.parse(excludedSourcesString))));
         const missing = this.timelineService.getSources()
@@ -311,7 +313,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         }
     }
     onTimelineChanged(e) {
-        if (e?.uri === undefined || this.uriIdentityService.extUri.isEqual(e.uri, this.uri)) {
+        if (e?.uri === undefined || this.uriIdentityService.extUri.isEqual(URI.revive(e.uri), this.uri)) {
             const timeline = this.timelinesBySource.get(e.id);
             if (timeline === undefined) {
                 return;
@@ -887,7 +889,7 @@ class TimelineActionRunner extends ActionRunner {
             return;
         }
         await action.run({
-            $mid: 12 ,
+            $mid: MarshalledId.TimelineActionContext,
             handle: item.handle,
             source: item.source,
             uri
@@ -1057,7 +1059,7 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
     updateTimelineSourceFilters() {
         this.sourceDisposables.clear();
         const excluded = ( (new Set(
-            JSON.parse(this.storageService.get('timeline.excludeSources', 0 , '[]'))
+            JSON.parse(this.storageService.get('timeline.excludeSources', StorageScope.PROFILE, '[]'))
         )));
         for (const source of this.timelineService.getSources()) {
             this.sourceDisposables.add(registerAction2(class extends Action2 {
@@ -1083,7 +1085,7 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
                         excluded.add(source.id);
                     }
                     const storageService = accessor.get(IStorageService);
-                    storageService.store('timeline.excludeSources', JSON.stringify([...( (excluded.keys()))]), 0 , 0 );
+                    storageService.store('timeline.excludeSources', JSON.stringify([...( (excluded.keys()))]), StorageScope.PROFILE, StorageTarget.USER);
                 }
             }));
         }