@codingame/monaco-vscode-timeline-service-override 1.85.6 → 2.0.0-v2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/package.json +4 -4
  2. package/timeline.js +1 -1
  3. package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.js +1 -1
  4. package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.js +5 -5
  5. package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.js +17 -17
  6. package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider.js +6 -6
  7. package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.js +9 -9
  8. package/vscode/src/vs/workbench/contrib/timeline/browser/timeline.contribution.js +9 -9
  9. package/vscode/src/vs/workbench/contrib/timeline/browser/timelinePane.js +44 -44
  10. package/vscode/src/vs/workbench/contrib/timeline/common/timelineService.js +4 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-timeline-service-override",
3
- "version": "1.85.6",
3
+ "version": "2.0.0-v2.1",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -9,7 +9,7 @@
9
9
  "license": "MIT",
10
10
  "repository": {
11
11
  "type": "git",
12
- "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
12
+ "url": "git@github.com:CodinGame/monaco-vscode-api.git"
13
13
  },
14
14
  "type": "module",
15
15
  "private": false,
@@ -18,7 +18,7 @@
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
20
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
22
- "monaco-editor": "0.45.0"
21
+ "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
22
+ "vscode-marked": "npm:marked@=3.0.2"
23
23
  }
24
24
  }
package/timeline.js CHANGED
@@ -1,4 +1,4 @@
1
- import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
1
+ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
2
2
  import './vscode/src/vs/workbench/contrib/timeline/browser/timeline.contribution.js';
3
3
  import './vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.js';
4
4
  import { ITimelineService } from 'vscode/vscode/vs/workbench/contrib/timeline/common/timeline';
package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.js CHANGED
@@ -1,4 +1,4 @@
1
- import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
1
+ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
2
2
  import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
3
3
  import { LocalHistoryTimeline } from './localHistoryTimeline.js';
4
4
 
package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.js CHANGED
@@ -1,8 +1,8 @@
1
- import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
2
- import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
3
- import { language } from 'monaco-editor/esm/vs/base/common/platform.js';
4
- import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
5
- import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
1
+ import { localizeWithPath } from 'vscode/vscode/vs/nls';
2
+ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
3
+ import { language } from 'vscode/vscode/vs/base/common/platform';
4
+ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
5
+ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
6
6
 
7
7
  let localHistoryDateFormatter = undefined;
8
8
  function getLocalHistoryDateFormatter() {
package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.js CHANGED
@@ -1,28 +1,28 @@
1
- import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
2
- import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
3
- import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
4
- import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
5
- import { toErrorMessage } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
6
- import { CancellationToken, CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
1
+ import { localizeWithPath } from 'vscode/vscode/vs/nls';
2
+ import { URI } from 'vscode/vscode/vs/base/common/uri';
3
+ import { Event } from 'vscode/vscode/vs/base/common/event';
4
+ import { Schemas } from 'vscode/vscode/vs/base/common/network';
5
+ import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
6
+ import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
7
7
  import { IWorkingCopyHistoryService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory';
8
8
  import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
9
9
  import { LocalHistoryFileSystemProvider } from './localHistoryFileSystemProvider.js';
10
- import { RawContextKey, IContextKeyService, ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
11
- import { registerAction2, Action2, MenuId, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
12
- import { basenameOrAuthority, basename, dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
13
- import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
10
+ import { RawContextKey, IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
11
+ import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
12
+ import { basenameOrAuthority, basename, dirname } from 'vscode/vscode/vs/base/common/resources';
13
+ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
14
14
  import { SaveSourceRegistry, EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
15
- import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
15
+ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
16
16
  import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
17
17
  import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
18
18
  import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
19
19
  import { ResourceContextKey, ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
20
- import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
21
- import { getIconClasses } from 'monaco-editor/esm/vs/editor/common/services/getIconClasses.js';
22
- import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
23
- import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
24
- import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
25
- import { firstOrDefault } from 'monaco-editor/esm/vs/base/common/arrays.js';
20
+ import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
21
+ import { getIconClasses } from 'vscode/vscode/vs/editor/common/services/getIconClasses';
22
+ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
23
+ import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
24
+ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
25
+ import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
26
26
  import { LOCAL_HISTORY_MENU_CONTEXT_KEY, LOCAL_HISTORY_ICON_RESTORE, getLocalHistoryDateFormatter } from './localHistory.js';
27
27
  import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
28
28
  import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider.js CHANGED
@@ -1,9 +1,9 @@
1
- import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
2
- import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
3
- import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
4
- import { FileType, hasReadWriteCapability } from 'monaco-editor/esm/vs/platform/files/common/files.js';
5
- import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
6
- import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
1
+ import { Event } from 'vscode/vscode/vs/base/common/event';
2
+ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
3
+ import { URI } from 'vscode/vscode/vs/base/common/uri';
4
+ import { FileType, hasReadWriteCapability } from 'vscode/vscode/vs/platform/files/common/files';
5
+ import { isEqual } from 'vscode/vscode/vs/base/common/resources';
6
+ import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
7
7
 
8
8
  class LocalHistoryFileSystemProvider {
9
9
  static { this.SCHEMA = 'vscode-local-history'; }
package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.js CHANGED
@@ -1,22 +1,22 @@
1
1
  import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
2
- import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
3
- import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
4
- import { Disposable, MutableDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
2
+ import { localizeWithPath } from 'vscode/vscode/vs/nls';
3
+ import { Emitter } from 'vscode/vscode/vs/base/common/event';
4
+ import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
5
5
  import { ITimelineService } from 'vscode/vscode/vs/workbench/contrib/timeline/common/timeline';
6
6
  import { IWorkingCopyHistoryService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory';
7
- import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
7
+ import { URI } from 'vscode/vscode/vs/base/common/uri';
8
8
  import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
9
9
  import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
10
- import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
10
+ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
11
11
  import { LocalHistoryFileSystemProvider } from './localHistoryFileSystemProvider.js';
12
12
  import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
13
13
  import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
14
- import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
14
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
15
15
  import { COMPARE_WITH_FILE_LABEL, toDiffEditorArguments } from './localHistoryCommands.js';
16
- import { MarkdownString } from 'monaco-editor/esm/vs/base/common/htmlContent.js';
16
+ import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
17
17
  import { getLocalHistoryDateFormatter, LOCAL_HISTORY_ICON_ENTRY, LOCAL_HISTORY_MENU_CONTEXT_VALUE } from './localHistory.js';
18
- import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
19
- import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
18
+ import { Schemas } from 'vscode/vscode/vs/base/common/network';
19
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
20
20
  import { getVirtualWorkspaceAuthority } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
21
21
 
22
22
  var LocalHistoryTimeline_1;
package/vscode/src/vs/workbench/contrib/timeline/browser/timeline.contribution.js CHANGED
@@ -1,19 +1,19 @@
1
- import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
2
- import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
3
- import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
1
+ import { localizeWithPath } from 'vscode/vscode/vs/nls';
2
+ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
3
+ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
4
4
  import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
5
5
  import { VIEW_CONTAINER } from 'vscode/vscode/vs/workbench/contrib/files/browser/explorerViewlet';
6
6
  import { TimelinePaneId, ITimelineService } from 'vscode/vscode/vs/workbench/contrib/timeline/common/timeline';
7
7
  import { TimelineHasProviderContext } from '../common/timelineService.js';
8
8
  import { TimelinePane } from './timelinePane.js';
9
- import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
10
- import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
11
- import { MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
12
- import { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
9
+ import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
10
+ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
11
+ import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
12
+ import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
13
13
  import { ExplorerFolderContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
14
14
  import { ResourceContextKey } from 'vscode/vscode/vs/workbench/common/contextkeys';
15
- import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
16
- import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
15
+ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
16
+ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
17
17
 
18
18
  const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localizeWithPath(
19
19
  'vs/workbench/contrib/timeline/browser/timeline.contribution',
package/vscode/src/vs/workbench/contrib/timeline/browser/timelinePane.js CHANGED
@@ -1,51 +1,51 @@
1
1
  import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
2
2
  import './media/timelinePane.css.js';
3
- import { localize2WithPath, localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
4
- import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
5
- import { ActionRunner } from 'monaco-editor/esm/vs/base/common/actions.js';
6
- import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
3
+ import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
4
+ import { clearNode, append, $, asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
5
+ import { ActionRunner } from 'vscode/vscode/vs/base/common/actions';
6
+ import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
7
7
  import { fromNow } from 'vscode/vscode/vs/base/common/date';
8
- import { debounce } from 'monaco-editor/esm/vs/base/common/decorators.js';
9
- import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
10
- import { createMatches } from 'monaco-editor/esm/vs/base/common/filters.js';
11
- import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
12
- import { DisposableStore, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
13
- import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
14
- import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
15
- import { escapeRegExpCharacters } from 'monaco-editor/esm/vs/base/common/strings.js';
16
- import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
17
- import { IconLabel } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabel.js';
8
+ import { debounce } from 'vscode/vscode/vs/base/common/decorators';
9
+ import { Emitter } from 'vscode/vscode/vs/base/common/event';
10
+ import { createMatches } from 'vscode/vscode/vs/base/common/filters';
11
+ import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
12
+ import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
13
+ import { Schemas } from 'vscode/vscode/vs/base/common/network';
14
+ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
15
+ import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
16
+ import { URI } from 'vscode/vscode/vs/base/common/uri';
17
+ import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
18
18
  import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
19
- import { WorkbenchObjectTree } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
20
- import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
21
- import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
22
- import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
23
- import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
24
- import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
19
+ import { WorkbenchObjectTree } from 'vscode/vscode/vs/platform/list/browser/listService';
20
+ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
21
+ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
22
+ import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
23
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
24
+ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
25
25
  import { ITimelineService } from 'vscode/vscode/vs/workbench/contrib/timeline/common/timeline';
26
26
  import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
27
27
  import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
28
- import { CommandsRegistry, ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
29
- import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
30
- import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
28
+ import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
29
+ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
30
+ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
31
31
  import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
32
- import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
33
- import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
34
- import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
35
- import { createActionViewItem, createAndFillInContextMenuActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
36
- import { MenuId, registerAction2, Action2, MenuRegistry, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
37
- import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
38
- import { ActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
39
- import { ColorScheme } from 'monaco-editor/esm/vs/platform/theme/common/theme.js';
40
- import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
41
- import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
32
+ import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
33
+ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
34
+ import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
35
+ import { createActionViewItem, createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
36
+ import { MenuId, registerAction2, Action2, MenuRegistry, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
37
+ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
38
+ import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
39
+ import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
40
+ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
41
+ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
42
42
  import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
43
- import { isString } from 'monaco-editor/esm/vs/base/common/types.js';
44
- import { renderMarkdownAsPlaintext } from 'monaco-editor/esm/vs/base/browser/markdownRenderer.js';
43
+ import { isString } from 'vscode/vscode/vs/base/common/types';
44
+ import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
45
45
  import { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
46
- import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
46
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
47
47
  import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
48
- import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
48
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
49
49
 
50
50
  const ItemHeight = 22;
51
51
  function isLoadMoreCommand(item) {
@@ -368,7 +368,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
368
368
  this.$message.classList.add('hide');
369
369
  }
370
370
  resetMessageElement() {
371
- dom.clearNode(this.$message);
371
+ clearNode(this.$message);
372
372
  }
373
373
  get hasVisibleItems() {
374
374
  return this._visibleItemCount > 0;
@@ -723,7 +723,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
723
723
  super.renderBody(container);
724
724
  this.$container = container;
725
725
  container.classList.add('tree-explorer-viewlet-tree-view', 'timeline-tree-view');
726
- this.$message = dom.append(this.$container, dom.$('.message'));
726
+ this.$message = append(this.$container, $('.message'));
727
727
  this.$message.classList.add('timeline-subtle');
728
728
  this.message = ( localizeWithPath(
729
729
  'vs/workbench/contrib/timeline/browser/timelinePane',
@@ -895,14 +895,14 @@ class TimelineElementTemplate {
895
895
  static { this.id = 'TimelineElementTemplate'; }
896
896
  constructor(container, actionViewItemProvider, hoverDelegate) {
897
897
  container.classList.add('custom-view-tree-node-item');
898
- this.icon = dom.append(container, dom.$('.custom-view-tree-node-item-icon'));
898
+ this.icon = append(container, $('.custom-view-tree-node-item-icon'));
899
899
  this.iconLabel = ( new IconLabel(
900
900
  container,
901
901
  { supportHighlights: true, supportIcons: true, hoverDelegate: hoverDelegate }
902
902
  ));
903
- const timestampContainer = dom.append(this.iconLabel.element, dom.$('.timeline-timestamp-container'));
904
- this.timestamp = dom.append(timestampContainer, dom.$('span.timeline-timestamp'));
905
- const actionsContainer = dom.append(this.iconLabel.element, dom.$('.actions'));
903
+ const timestampContainer = append(this.iconLabel.element, $('.timeline-timestamp-container'));
904
+ this.timestamp = append(timestampContainer, $('span.timeline-timestamp'));
905
+ const actionsContainer = append(this.iconLabel.element, $('.actions'));
906
906
  this.actionBar = ( new ActionBar(actionsContainer, { actionViewItemProvider: actionViewItemProvider }));
907
907
  }
908
908
  dispose() {
@@ -977,7 +977,7 @@ let TimelineTreeRenderer = class TimelineTreeRenderer {
977
977
  const iconUrl = icon ? URI.revive(icon) : null;
978
978
  if (iconUrl) {
979
979
  template.icon.className = 'custom-view-tree-node-item-icon';
980
- template.icon.style.backgroundImage = dom.asCSSUrl(iconUrl);
980
+ template.icon.style.backgroundImage = asCSSUrl(iconUrl);
981
981
  template.icon.style.color = '';
982
982
  }
983
983
  else if (item.themeIcon) {
package/vscode/src/vs/workbench/contrib/timeline/common/timelineService.js CHANGED
@@ -1,10 +1,10 @@
1
1
  import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
2
- import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
3
- import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
2
+ import { Emitter } from 'vscode/vscode/vs/base/common/event';
3
+ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
4
4
  import { TimelinePaneId } from 'vscode/vscode/vs/workbench/contrib/timeline/common/timeline';
5
5
  import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
6
- import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
7
- import { RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
6
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
7
+ import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
8
8
 
9
9
  const TimelineHasProviderContext = ( new RawContextKey('timelineHasProvider', false));
10
10
  let TimelineService = class TimelineService {