@codingame/monaco-vscode-view-common-service-override 13.1.4 → 13.1.6

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 (22) hide show
  1. package/package.json +43 -43
  2. package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +1 -1
  3. package/vscode/src/vs/workbench/browser/actions/listCommands.js +1 -1
  4. package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +1 -1
  5. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +3 -3
  6. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js +1 -1
  7. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +1 -1
  8. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +1 -1
  9. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js +1 -1
  10. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +1 -1
  11. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +1 -1
  12. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +10 -10
  13. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +8 -8
  14. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +3 -3
  15. package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +1 -1
  16. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +5 -5
  17. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +1 -1
  18. package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +9 -9
  19. package/vscode/src/vs/workbench/services/history/browser/historyService.js +9 -9
  20. package/vscode/src/vs/workbench/services/progress/browser/progressService.js +9 -9
  21. package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +5 -5
  22. package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-view-common-service-override",
3
- "version": "13.1.4",
3
+ "version": "13.1.6",
4
4
  "private": false,
5
5
  "description": "VSCode public API plugged on the monaco editor - view-common service-override",
6
6
  "keywords": [],
@@ -15,48 +15,48 @@
15
15
  },
16
16
  "type": "module",
17
17
  "dependencies": {
18
- "@codingame/monaco-vscode-0139c6af-2375-559c-af57-b738f2fd6d8e-common": "13.1.4",
19
- "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "13.1.4",
20
- "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "13.1.4",
21
- "@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common": "13.1.4",
22
- "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "13.1.4",
23
- "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common": "13.1.4",
24
- "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "13.1.4",
25
- "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "13.1.4",
26
- "@codingame/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common": "13.1.4",
27
- "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common": "13.1.4",
28
- "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "13.1.4",
29
- "@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common": "13.1.4",
30
- "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "13.1.4",
31
- "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common": "13.1.4",
32
- "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "13.1.4",
33
- "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common": "13.1.4",
34
- "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "13.1.4",
35
- "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "13.1.4",
36
- "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common": "13.1.4",
37
- "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "13.1.4",
38
- "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "13.1.4",
39
- "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "13.1.4",
40
- "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "13.1.4",
41
- "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common": "13.1.4",
42
- "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "13.1.4",
43
- "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "13.1.4",
44
- "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common": "13.1.4",
45
- "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "13.1.4",
46
- "@codingame/monaco-vscode-api": "13.1.4",
47
- "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "13.1.4",
48
- "@codingame/monaco-vscode-b8988f79-16c1-5bff-b0e7-699bab3431da-common": "13.1.4",
49
- "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common": "13.1.4",
50
- "@codingame/monaco-vscode-bulk-edit-service-override": "13.1.4",
51
- "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common": "13.1.4",
52
- "@codingame/monaco-vscode-cc2b8dc7-d125-518e-bf7e-99a1db5babd1-common": "13.1.4",
53
- "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common": "13.1.4",
54
- "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "13.1.4",
55
- "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "13.1.4",
56
- "@codingame/monaco-vscode-e7080bda-ce3e-5243-9a35-98cd9634dbda-common": "13.1.4",
57
- "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "13.1.4",
58
- "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "13.1.4",
59
- "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "13.1.4"
18
+ "@codingame/monaco-vscode-0139c6af-2375-559c-af57-b738f2fd6d8e-common": "13.1.6",
19
+ "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "13.1.6",
20
+ "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "13.1.6",
21
+ "@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common": "13.1.6",
22
+ "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "13.1.6",
23
+ "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common": "13.1.6",
24
+ "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "13.1.6",
25
+ "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "13.1.6",
26
+ "@codingame/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common": "13.1.6",
27
+ "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common": "13.1.6",
28
+ "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "13.1.6",
29
+ "@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common": "13.1.6",
30
+ "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "13.1.6",
31
+ "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common": "13.1.6",
32
+ "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "13.1.6",
33
+ "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common": "13.1.6",
34
+ "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "13.1.6",
35
+ "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "13.1.6",
36
+ "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common": "13.1.6",
37
+ "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "13.1.6",
38
+ "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "13.1.6",
39
+ "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "13.1.6",
40
+ "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "13.1.6",
41
+ "@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common": "13.1.6",
42
+ "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "13.1.6",
43
+ "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "13.1.6",
44
+ "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common": "13.1.6",
45
+ "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "13.1.6",
46
+ "@codingame/monaco-vscode-api": "13.1.6",
47
+ "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "13.1.6",
48
+ "@codingame/monaco-vscode-b8988f79-16c1-5bff-b0e7-699bab3431da-common": "13.1.6",
49
+ "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common": "13.1.6",
50
+ "@codingame/monaco-vscode-bulk-edit-service-override": "13.1.6",
51
+ "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common": "13.1.6",
52
+ "@codingame/monaco-vscode-cc2b8dc7-d125-518e-bf7e-99a1db5babd1-common": "13.1.6",
53
+ "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common": "13.1.6",
54
+ "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "13.1.6",
55
+ "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "13.1.6",
56
+ "@codingame/monaco-vscode-e7080bda-ce3e-5243-9a35-98cd9634dbda-common": "13.1.6",
57
+ "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "13.1.6",
58
+ "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "13.1.6",
59
+ "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "13.1.6"
60
60
  },
61
61
  "main": "index.js",
62
62
  "module": "index.js",
@@ -10,7 +10,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
10
10
  import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
11
11
  import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
12
12
  import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-b8988f79-16c1-5bff-b0e7-699bab3431da-common/vscode/vs/workbench/browser/panecomposite';
13
- import { TreeViewPane, CustomTreeView } from '@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common/vscode/vs/workbench/browser/parts/views/treeView';
13
+ import { CustomTreeView, TreeViewPane } from '@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common/vscode/vs/workbench/browser/parts/views/treeView';
14
14
  import { ViewPaneContainer } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
15
15
  import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
16
16
  import { Extensions, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
@@ -16,7 +16,7 @@ import { AbstractTree, TreeFindMode, TreeFindMatchType } from '@codingame/monaco
16
16
  import { isActiveElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
17
17
  import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
18
18
  import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
19
- import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
19
+ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
20
20
  import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
21
21
 
22
22
  function ensureDOMFocus(widget) {
@@ -3,7 +3,7 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
3
3
  import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
4
4
  import { EditorPaneDescriptor } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
5
5
  import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
6
- import { IsAuxiliaryEditorPartContext, ActiveEditorGroupLockedContext, EditorPartMultipleEditorGroupsContext, MultipleEditorGroupsContext, InEditorZenModeContext, EditorGroupEditorsCountContext, ActiveEditorLastInGroupContext, MultipleEditorsSelectedInGroupContext, EditorTabsVisibleContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, EditorPartMaximizedEditorGroupContext, ActiveEditorDirtyContext, TextCompareEditorActiveContext, ActiveCompareEditorCanSwapContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
6
+ import { IsAuxiliaryEditorPartContext, ActiveEditorGroupLockedContext, EditorPartMultipleEditorGroupsContext, MultipleEditorGroupsContext, InEditorZenModeContext, EditorGroupEditorsCountContext, EditorTabsVisibleContext, ActiveEditorLastInGroupContext, MultipleEditorsSelectedInGroupContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, EditorPartMaximizedEditorGroupContext, ActiveEditorDirtyContext, TextCompareEditorActiveContext, ActiveCompareEditorCanSwapContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
7
7
  import { SideBySideEditorInput, SideBySideEditorInputSerializer } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/vscode/vs/workbench/common/editor/sideBySideEditorInput';
8
8
  import { TextResourceEditor } from '@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common/vscode/vs/workbench/browser/parts/editor/textResourceEditor';
9
9
  import { SideBySideEditor } from '@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common/vscode/vs/workbench/browser/parts/editor/sideBySideEditor';
@@ -1,11 +1,11 @@
1
1
 
2
2
  import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
3
3
  import './media/callHierarchy.css.js';
4
- import { PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/peekView/browser/peekView';
4
+ import { PeekViewWidget, peekViewBorder, peekViewTitleInfoForeground, peekViewTitleForeground, peekViewTitleBackground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/peekView/browser/peekView';
5
5
  import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
6
6
  import { CallHierarchyDirection } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
7
7
  import { WorkbenchAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
8
- import { Sorter, AccessibilityProvider, IdentityProvider, VirtualDelegate, CallRenderer, DataSource } from './callHierarchyTree.js';
8
+ import { IdentityProvider, AccessibilityProvider, Sorter, VirtualDelegate, CallRenderer, DataSource } from './callHierarchyTree.js';
9
9
  import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
10
10
  import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
11
11
  import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -16,7 +16,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
16
16
  import { EmbeddedCodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
17
17
  import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
18
18
  import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
19
- import { TrackedRangeStickiness, OverviewRulerLane } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
19
+ import { OverviewRulerLane, TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
20
20
  import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
21
21
  import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
22
22
  import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
@@ -10,7 +10,7 @@ import { ICustomEditorService } from '@codingame/monaco-vscode-api/vscode/vs/wor
10
10
  import { NotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
11
11
  import { WebviewContentPurpose } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview';
12
12
  import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
13
- import { WebviewEditorInputSerializer, reviveWebviewExtensionDescription, restoreWebviewOptions, restoreWebviewContentOptions } from '../../webviewPanel/browser/webviewEditorInputSerializer.js';
13
+ import { WebviewEditorInputSerializer, reviveWebviewExtensionDescription, restoreWebviewContentOptions, restoreWebviewOptions } from '../../webviewPanel/browser/webviewEditorInputSerializer.js';
14
14
  import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
15
15
  import { IWorkingCopyBackupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
16
16
  import { IWorkingCopyEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
@@ -11,7 +11,7 @@ import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/st
11
11
  import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
12
12
  import { MergeEditorInputData } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
13
13
  import { MergeEditor } from '../view/mergeEditor.js';
14
- import { ctxMergeEditorLayout, ctxIsMergeEditor, ctxMergeEditorShowNonConflictingChanges, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, StorageCloseWithConflicts } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
14
+ import { ctxIsMergeEditor, ctxMergeEditorLayout, ctxMergeEditorShowNonConflictingChanges, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, StorageCloseWithConflicts } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
15
15
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
16
16
 
17
17
  class MergeEditorAction extends Action2 {
@@ -10,7 +10,7 @@ import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/v
10
10
  import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
11
11
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
12
12
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
13
- import { MinimapPosition, OverviewRulerLane } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
13
+ import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
14
14
  import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
15
15
  import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
16
16
  import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -15,7 +15,7 @@ import { CodeLensContribution } from '@codingame/monaco-vscode-api/vscode/vs/edi
15
15
  import { FoldingController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/folding/browser/folding';
16
16
  import { MenuWorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
17
17
  import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
18
- import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editor';
18
+ import { DEFAULT_EDITOR_MAX_DIMENSIONS, DEFAULT_EDITOR_MIN_DIMENSIONS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editor';
19
19
  import { setStyle } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
20
20
  import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
21
21
 
@@ -16,7 +16,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
16
16
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
17
17
  import { noBreakWhitespace } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
18
18
  import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
19
- import { MinimapPosition, OverviewRulerLane } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
19
+ import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
20
20
  import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
21
21
  import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
22
22
  import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -11,7 +11,7 @@ import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/v
11
11
  import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
12
12
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
13
13
  import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
14
- import { MinimapPosition, OverviewRulerLane } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
14
+ import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
15
15
  import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
16
16
  import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
17
17
  import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -22,12 +22,12 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
22
22
  import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
23
23
 
24
24
  var TypeHierarchyController_1;
25
- const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(10412, 'Whether a type hierarchy provider is available'))));
26
- const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(10413, 'Whether type hierarchy peek is currently showing'))));
25
+ const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(10410, 'Whether a type hierarchy provider is available'))));
26
+ const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(10411, 'Whether type hierarchy peek is currently showing'))));
27
27
  const _ctxTypeHierarchyDirection = ( new RawContextKey(
28
28
  'typeHierarchyDirection',
29
29
  undefined,
30
- { type: 'string', description: ( localize(10414, 'whether type hierarchy shows super types or subtypes')) }
30
+ { type: 'string', description: ( localize(10412, 'whether type hierarchy shows super types or subtypes')) }
31
31
  ));
32
32
  function sanitizedDirection(candidate) {
33
33
  return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
@@ -96,14 +96,14 @@ let TypeHierarchyController = class TypeHierarchyController {
96
96
  this._widget.showModel(model);
97
97
  }
98
98
  else {
99
- this._widget.showMessage(( localize(10415, "No results")));
99
+ this._widget.showMessage(( localize(10413, "No results")));
100
100
  }
101
101
  }).catch(err => {
102
102
  if (isCancellationError(err)) {
103
103
  this.endTypeHierarchy();
104
104
  return;
105
105
  }
106
- this._widget.showMessage(( localize(10416, "Failed to show type hierarchy")));
106
+ this._widget.showMessage(( localize(10414, "Failed to show type hierarchy")));
107
107
  });
108
108
  }
109
109
  async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +148,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
148
148
  constructor() {
149
149
  super({
150
150
  id: 'editor.showTypeHierarchy',
151
- title: ( localize2(10417, 'Peek Type Hierarchy')),
151
+ title: ( localize2(10415, 'Peek Type Hierarchy')),
152
152
  menu: {
153
153
  id: MenuId.EditorContextPeek,
154
154
  group: 'navigation',
@@ -167,7 +167,7 @@ registerAction2(class extends EditorAction2 {
167
167
  constructor() {
168
168
  super({
169
169
  id: 'editor.showSupertypes',
170
- title: ( localize2(10418, 'Show Supertypes')),
170
+ title: ( localize2(10416, 'Show Supertypes')),
171
171
  icon: Codicon.typeHierarchySuper,
172
172
  precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
173
173
  keybinding: {
@@ -189,7 +189,7 @@ registerAction2(class extends EditorAction2 {
189
189
  constructor() {
190
190
  super({
191
191
  id: 'editor.showSubtypes',
192
- title: ( localize2(10419, 'Show Subtypes')),
192
+ title: ( localize2(10417, 'Show Subtypes')),
193
193
  icon: Codicon.typeHierarchySub,
194
194
  precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
195
195
  keybinding: {
@@ -211,7 +211,7 @@ registerAction2(class extends EditorAction2 {
211
211
  constructor() {
212
212
  super({
213
213
  id: 'editor.refocusTypeHierarchy',
214
- title: ( localize2(10420, 'Refocus Type Hierarchy')),
214
+ title: ( localize2(10418, 'Refocus Type Hierarchy')),
215
215
  precondition: _ctxTypeHierarchyVisible,
216
216
  keybinding: {
217
217
  weight: KeybindingWeight.WorkbenchContrib,
@@ -227,7 +227,7 @@ registerAction2(class extends EditorAction2 {
227
227
  constructor() {
228
228
  super({
229
229
  id: 'editor.closeTypeHierarchy',
230
- title: ( localize(10421, 'Close')),
230
+ title: ( localize(10419, 'Close')),
231
231
  icon: Codicon.close,
232
232
  precondition: _ctxTypeHierarchyVisible,
233
233
  keybinding: {
@@ -10,9 +10,9 @@ import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vsco
10
10
  import { EmbeddedCodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
11
11
  import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
12
12
  import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
13
- import { TrackedRangeStickiness, OverviewRulerLane } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
13
+ import { OverviewRulerLane, TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
14
14
  import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
15
- import { PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/peekView/browser/peekView';
15
+ import { PeekViewWidget, peekViewBorder, peekViewTitleInfoForeground, peekViewTitleForeground, peekViewTitleBackground, peekViewResultsBackground, peekViewEditorMatchHighlight, IPeekViewService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/peekView/browser/peekView';
16
16
  import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
17
17
  import { getFlatActionBarActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
18
18
  import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -24,7 +24,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
24
24
  import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
25
25
  import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
26
26
  import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
27
- import { Sorter, AccessibilityProvider, IdentityProvider, VirtualDelegate, TypeRenderer, DataSource } from './typeHierarchyTree.js';
27
+ import { IdentityProvider, AccessibilityProvider, Sorter, VirtualDelegate, TypeRenderer, DataSource } from './typeHierarchyTree.js';
28
28
  import { TypeHierarchyDirection } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
29
29
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
30
30
  import { Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
@@ -262,13 +262,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
262
262
  }
263
263
  this._previewDisposable.add(value);
264
264
  const title = this._direction === TypeHierarchyDirection.Supertypes
265
- ? ( localize(10422, "Supertypes of '{0}'", element.model.root.name))
266
- : ( localize(10423, "Subtypes of '{0}'", element.model.root.name));
265
+ ? ( localize(10420, "Supertypes of '{0}'", element.model.root.name))
266
+ : ( localize(10421, "Subtypes of '{0}'", element.model.root.name));
267
267
  this.setTitle(title);
268
268
  }
269
269
  showLoading() {
270
270
  this._parent.dataset['state'] = State.Loading;
271
- this.setTitle(( localize(10424, "Loading...")));
271
+ this.setTitle(( localize(10422, "Loading...")));
272
272
  this._show();
273
273
  }
274
274
  showMessage(message) {
@@ -287,8 +287,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
287
287
  await this._tree.expand(root.element);
288
288
  if (root.children.length === 0) {
289
289
  this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
290
- ? ( localize(10425, "No supertypes of '{0}'", model.root.name))
291
- : ( localize(10426, "No subtypes of '{0}'", model.root.name)));
290
+ ? ( localize(10423, "No supertypes of '{0}'", model.root.name))
291
+ : ( localize(10424, "No subtypes of '{0}'", model.root.name)));
292
292
  }
293
293
  else {
294
294
  this._parent.dataset['state'] = State.Data;
@@ -105,14 +105,14 @@ class AccessibilityProvider {
105
105
  this.getDirection = getDirection;
106
106
  }
107
107
  getWidgetAriaLabel() {
108
- return localize(10427, "Type Hierarchy");
108
+ return localize(10425, "Type Hierarchy");
109
109
  }
110
110
  getAriaLabel(element) {
111
111
  if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
112
- return localize(10428, "supertypes of {0}", element.item.name);
112
+ return localize(10426, "supertypes of {0}", element.item.name);
113
113
  }
114
114
  else {
115
- return localize(10429, "subtypes of {0}", element.item.name);
115
+ return localize(10427, "subtypes of {0}", element.item.name);
116
116
  }
117
117
  }
118
118
  }
@@ -159,7 +159,7 @@ let WebviewElement = class WebviewElement extends Disposable {
159
159
  this._hasFindResult.fire(didFind);
160
160
  }));
161
161
  this._register(this.on('fatal-error', (e) => {
162
- notificationService.error(( localize(10727, "Error loading webview: {0}", e.message)));
162
+ notificationService.error(( localize(10725, "Error loading webview: {0}", e.message)));
163
163
  this._onFatalError.fire({ message: e.message });
164
164
  }));
165
165
  this._register(this.on('did-keydown', (data) => {
@@ -15,7 +15,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
15
15
  const webviewActiveContextKeyExpr = ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', WebviewEditor.ID)), ( EditorContextKeys.focus.toNegated() )));
16
16
  class ShowWebViewEditorFindWidgetAction extends Action2 {
17
17
  static { this.ID = 'editor.action.webvieweditor.showFind'; }
18
- static { this.LABEL = ( localize(10728, "Show find")); }
18
+ static { this.LABEL = ( localize(10726, "Show find")); }
19
19
  constructor() {
20
20
  super({
21
21
  id: ShowWebViewEditorFindWidgetAction.ID,
@@ -36,7 +36,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
36
36
  }
37
37
  class HideWebViewEditorFindCommand extends Action2 {
38
38
  static { this.ID = 'editor.action.webvieweditor.hideFind'; }
39
- static { this.LABEL = ( localize(10729, "Stop find")); }
39
+ static { this.LABEL = ( localize(10727, "Stop find")); }
40
40
  constructor() {
41
41
  super({
42
42
  id: HideWebViewEditorFindCommand.ID,
@@ -57,7 +57,7 @@ class HideWebViewEditorFindCommand extends Action2 {
57
57
  }
58
58
  class WebViewEditorFindNextCommand extends Action2 {
59
59
  static { this.ID = 'editor.action.webvieweditor.findNext'; }
60
- static { this.LABEL = ( localize(10730, 'Find next')); }
60
+ static { this.LABEL = ( localize(10728, 'Find next')); }
61
61
  constructor() {
62
62
  super({
63
63
  id: WebViewEditorFindNextCommand.ID,
@@ -78,7 +78,7 @@ class WebViewEditorFindNextCommand extends Action2 {
78
78
  }
79
79
  class WebViewEditorFindPreviousCommand extends Action2 {
80
80
  static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
81
- static { this.LABEL = ( localize(10731, 'Find previous')); }
81
+ static { this.LABEL = ( localize(10729, 'Find previous')); }
82
82
  constructor() {
83
83
  super({
84
84
  id: WebViewEditorFindPreviousCommand.ID,
@@ -99,7 +99,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
99
99
  }
100
100
  class ReloadWebviewAction extends Action2 {
101
101
  static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
102
- static { this.LABEL = ( localize2(10732, "Reload Webviews")); }
102
+ static { this.LABEL = ( localize2(10730, "Reload Webviews")); }
103
103
  constructor() {
104
104
  super({
105
105
  id: ReloadWebviewAction.ID,
@@ -18,7 +18,7 @@ import '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vsc
18
18
  import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
19
19
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
20
20
 
21
- (( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(10734, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
21
+ (( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(10732, "webview editor"))), [( new SyncDescriptor(WebviewInput))]);
22
22
  let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
23
23
  static { this.ID = 'workbench.contrib.webviewPanel'; }
24
24
  constructor(editorService, editorGroupService) {
@@ -449,8 +449,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
449
449
  if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
450
450
  return;
451
451
  }
452
- const handle = this.notificationService.prompt(Severity.Warning, ( localize(11401, 'There are multiple default editors available for the resource.')), [{
453
- label: ( localize(11402, 'Configure Default')),
452
+ const handle = this.notificationService.prompt(Severity.Warning, ( localize(11399, 'There are multiple default editors available for the resource.')), [{
453
+ label: ( localize(11400, 'Configure Default')),
454
454
  run: async () => {
455
455
  const picked = await this.doPickEditor(untypedInput, true);
456
456
  if (!picked) {
@@ -471,7 +471,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
471
471
  }
472
472
  },
473
473
  {
474
- label: ( localize(11403, 'Keep {0}', editorName)),
474
+ label: ( localize(11401, 'Keep {0}', editorName)),
475
475
  run: writeCurrentEditorsToStorage
476
476
  }
477
477
  ]);
@@ -497,9 +497,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
497
497
  }
498
498
  });
499
499
  const quickPickEntries = [];
500
- const currentlyActiveLabel = ( localize(11404, "Active"));
501
- const currentDefaultLabel = ( localize(11405, "Default"));
502
- const currentDefaultAndActiveLabel = ( localize(11406, "Active and Default"));
500
+ const currentlyActiveLabel = ( localize(11402, "Active"));
501
+ const currentDefaultLabel = ( localize(11403, "Default"));
502
+ const currentDefaultAndActiveLabel = ( localize(11404, "Active and Default"));
503
503
  let defaultViewType = defaultSetting;
504
504
  if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
505
505
  defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -524,7 +524,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
524
524
  quickPickEntries.push(separator);
525
525
  const configureDefaultEntry = {
526
526
  id: EditorResolverService_1.configureDefaultID,
527
- label: ( localize(11407, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
527
+ label: ( localize(11405, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
528
528
  };
529
529
  quickPickEntries.push(configureDefaultEntry);
530
530
  }
@@ -539,8 +539,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
539
539
  const disposables = ( new DisposableStore());
540
540
  const editorPicker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
541
541
  const placeHolderMessage = showDefaultPicker ?
542
- ( localize(11408, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
543
- ( localize(11409, "Select editor for '{0}'", basename(resource)));
542
+ ( localize(11406, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
543
+ ( localize(11407, "Select editor for '{0}'", basename(resource)));
544
544
  editorPicker.placeholder = placeHolderMessage;
545
545
  editorPicker.canAcceptInBackground = true;
546
546
  editorPicker.items = editorPicks;
@@ -56,33 +56,33 @@ let HistoryService = class HistoryService extends Disposable {
56
56
  this.activeEditorListeners = this._register(( new DisposableStore()));
57
57
  this.lastActiveEditor = undefined;
58
58
  this.editorHelper = this.instantiationService.createInstance(EditorHelper);
59
- this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(11596, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
60
- this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(11597, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
59
+ this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(11594, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
60
+ this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(11595, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
61
61
  this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
62
- 11598,
62
+ 11596,
63
63
  "Whether it is possible to navigate back in editor navigation locations history"
64
64
  ))))).bindTo(this.contextKeyService);
65
65
  this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
66
- 11599,
66
+ 11597,
67
67
  "Whether it is possible to navigate forward in editor navigation locations history"
68
68
  ))))).bindTo(this.contextKeyService);
69
69
  this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
70
- 11600,
70
+ 11598,
71
71
  "Whether it is possible to navigate to the last editor navigation location"
72
72
  ))))).bindTo(this.contextKeyService);
73
73
  this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
74
- 11601,
74
+ 11599,
75
75
  "Whether it is possible to navigate back in editor edit locations history"
76
76
  ))))).bindTo(this.contextKeyService);
77
77
  this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
78
- 11602,
78
+ 11600,
79
79
  "Whether it is possible to navigate forward in editor edit locations history"
80
80
  ))))).bindTo(this.contextKeyService);
81
81
  this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
82
- 11603,
82
+ 11601,
83
83
  "Whether it is possible to navigate to the last editor edit location"
84
84
  ))))).bindTo(this.contextKeyService);
85
- this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(11604, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
85
+ this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(11602, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
86
86
  this._onDidChangeEditorNavigationStack = this._register(( new Emitter()));
87
87
  this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
88
88
  this.defaultScopedEditorNavigationStack = undefined;
@@ -25,7 +25,7 @@ import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/w
25
25
  import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
26
26
  import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
27
27
  import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
28
- import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
28
+ import { defaultDialogStyles, defaultInputBoxStyles, defaultCheckboxStyles, defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
29
29
  import { ResultKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingResolver';
30
30
  import { IUserActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
31
31
  import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
@@ -132,23 +132,23 @@ let ProgressService = class ProgressService extends Disposable {
132
132
  let title;
133
133
  const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
134
134
  if (progressTitle && progressMessage) {
135
- text = ( localize(11726, "{0}: {1}", progressTitle, progressMessage));
136
- title = source ? ( localize(11727, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
135
+ text = ( localize(11724, "{0}: {1}", progressTitle, progressMessage));
136
+ title = source ? ( localize(11725, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
137
137
  }
138
138
  else if (progressTitle) {
139
139
  text = progressTitle;
140
- title = source ? ( localize(11728, "[{0}]: {1}", source, progressTitle)) : text;
140
+ title = source ? ( localize(11726, "[{0}]: {1}", source, progressTitle)) : text;
141
141
  }
142
142
  else if (progressMessage) {
143
143
  text = progressMessage;
144
- title = source ? ( localize(11728, "[{0}]: {1}", source, progressMessage)) : text;
144
+ title = source ? ( localize(11726, "[{0}]: {1}", source, progressMessage)) : text;
145
145
  }
146
146
  else {
147
147
  this.updateWindowProgress(idx + 1);
148
148
  return;
149
149
  }
150
150
  const statusEntryProperties = {
151
- name: ( localize(11729, "Progress Message")),
151
+ name: ( localize(11727, "Progress Message")),
152
152
  text,
153
153
  showProgress: options.type || true,
154
154
  ariaLabel: text,
@@ -244,7 +244,7 @@ let ProgressService = class ProgressService extends Disposable {
244
244
  if (options.cancellable) {
245
245
  const cancelAction = new (class extends Action {
246
246
  constructor() {
247
- super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(11730, "Cancel")), undefined, true);
247
+ super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(11728, "Cancel")), undefined, true);
248
248
  }
249
249
  async run() {
250
250
  progressStateModel.cancel();
@@ -430,8 +430,8 @@ let ProgressService = class ProgressService extends Disposable {
430
430
  const buttons = options.buttons || [];
431
431
  if (!options.sticky) {
432
432
  buttons.push(options.cancellable
433
- ? (typeof options.cancellable === 'boolean' ? ( localize(11730, "Cancel")) : options.cancellable)
434
- : ( localize(11731, "Dismiss")));
433
+ ? (typeof options.cancellable === 'boolean' ? ( localize(11728, "Cancel")) : options.cancellable)
434
+ : ( localize(11729, "Dismiss")));
435
435
  }
436
436
  dialog = ( new Dialog(this.layoutService.activeContainer, message, buttons, {
437
437
  type: 'pending',
@@ -345,7 +345,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
345
345
  const container = this.viewContainersRegistry.registerViewContainer({
346
346
  id,
347
347
  ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }])),
348
- title: { value: ( localize(12085, "User View Container")), original: 'User View Container' },
348
+ title: { value: ( localize(12083, "User View Container")), original: 'User View Container' },
349
349
  icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
350
350
  storageId: getViewContainerStorageId(id),
351
351
  hideIfEmpty: true
@@ -559,7 +559,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
559
559
  title: viewDescriptor.name,
560
560
  metadata: {
561
561
  description: ( localize2(
562
- 12086,
562
+ 12084,
563
563
  'Toggles the visibility of the {0} view if the view container it is located in is visible',
564
564
  viewDescriptor.name.value
565
565
  ))
@@ -590,10 +590,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
590
590
  super({
591
591
  id: `${viewDescriptor.id}.removeView`,
592
592
  viewPaneContainerId: viewContainerModel.viewContainer.id,
593
- title: ( localize(12087, "Hide '{0}'", viewDescriptor.name.value)),
593
+ title: ( localize(12085, "Hide '{0}'", viewDescriptor.name.value)),
594
594
  metadata: {
595
595
  description: ( localize2(
596
- 12088,
596
+ 12086,
597
597
  'Hides the {0} view if it is visible and the view container it is located in is visible',
598
598
  viewDescriptor.name.value
599
599
  ))
@@ -623,7 +623,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
623
623
  constructor() {
624
624
  super({
625
625
  id: `${viewContainer.id}.resetViewContainerLocation`,
626
- title: ( localize2(12089, "Reset Location")),
626
+ title: ( localize2(12087, "Reset Location")),
627
627
  menu: [{
628
628
  id: MenuId.ViewContainerTitleContext,
629
629
  group: '1_viewActions',
@@ -25,7 +25,7 @@ registerAction2(class extends Action2 {
25
25
  constructor() {
26
26
  super({
27
27
  id: '_workbench.output.showViewsLog',
28
- title: ( localize2(12095, "Show Views Log")),
28
+ title: ( localize2(12093, "Show Views Log")),
29
29
  category: Categories.Developer,
30
30
  f1: true
31
31
  });