@codingame/monaco-vscode-api 2.1.4 → 2.2.0-next.2

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 (194) hide show
  1. package/README.md +24 -0
  2. package/contributions.js +1 -0
  3. package/extensions.d.ts +7 -3
  4. package/extensions.js +28 -8
  5. package/lifecycle.js +11 -3
  6. package/localExtensionHost.js +13 -10
  7. package/missing-services.js +55 -10
  8. package/monaco.js +7 -3
  9. package/package.json +8 -8
  10. package/service-override/tools/views.d.ts +98 -0
  11. package/service-override/tools/views.js +249 -0
  12. package/services.d.ts +4 -2
  13. package/services.js +11 -9
  14. package/vscode/src/vs/base/browser/deviceAccess.js +60 -0
  15. package/vscode/src/vs/base/browser/dom.js +18 -1
  16. package/vscode/src/vs/base/browser/ui/centered/centeredViewLayout.js +178 -0
  17. package/vscode/src/vs/base/browser/ui/grid/grid.js +492 -0
  18. package/vscode/src/vs/base/browser/ui/grid/gridview.css.js +4 -0
  19. package/vscode/src/vs/base/browser/ui/grid/gridview.d.ts +1 -0
  20. package/vscode/src/vs/base/browser/ui/grid/gridview.js +1109 -0
  21. package/vscode/src/vs/base/browser/ui/sash/sash.js +9 -1
  22. package/vscode/src/vs/base/browser/ui/splitview/splitview.d.ts +348 -1
  23. package/vscode/src/vs/base/common/async.js +46 -2
  24. package/vscode/src/vs/base/common/codicons.d.ts +579 -0
  25. package/vscode/src/vs/base/common/event.js +11 -2
  26. package/vscode/src/vs/base/common/keybindingParser.js +87 -0
  27. package/vscode/src/vs/base/common/network.js +1 -2
  28. package/vscode/src/vs/base/common/observableInternal/utils.js +1 -1
  29. package/vscode/src/vs/base/common/platform.js +2 -1
  30. package/vscode/src/vs/base/common/scrollable.d.ts +28 -0
  31. package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/colors.js +17 -0
  32. package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/diffEditorItemTemplate.js +214 -0
  33. package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorViewModel.js +84 -0
  34. package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidget.js +54 -0
  35. package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidgetImpl.js +324 -0
  36. package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/objectPool.js +46 -0
  37. package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/style.css.js +4 -0
  38. package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/utils.js +11 -0
  39. package/vscode/src/vs/platform/keyboardLayout/common/keyboardLayout.js +61 -1
  40. package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +10 -0
  41. package/vscode/src/vs/platform/log/browser/log.js +24 -0
  42. package/vscode/src/vs/platform/product/common/product.js +1 -2
  43. package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +772 -0
  44. package/vscode/src/vs/platform/userDataSync/common/userDataSyncStoreService.js +551 -0
  45. package/vscode/src/vs/platform/webview/common/mimeTypes.js +22 -0
  46. package/vscode/src/vs/platform/webview/common/webviewPortMapping.js +62 -0
  47. package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +788 -0
  48. package/vscode/src/vs/workbench/browser/actions/listCommands.js +763 -0
  49. package/vscode/src/vs/workbench/browser/layout.d.ts +26 -0
  50. package/vscode/src/vs/workbench/browser/media/style.css.js +1 -1
  51. package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +610 -0
  52. package/vscode/src/vs/workbench/browser/parts/activitybar/media/activityaction.css.js +4 -0
  53. package/vscode/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css.js +4 -0
  54. package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +148 -0
  55. package/vscode/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css.js +4 -0
  56. package/vscode/src/vs/workbench/browser/parts/compositeBar.js +603 -0
  57. package/vscode/src/vs/workbench/browser/parts/compositePart.js +333 -0
  58. package/vscode/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.js +221 -0
  59. package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +1406 -0
  60. package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +184 -0
  61. package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +509 -0
  62. package/vscode/src/vs/workbench/browser/parts/editor/editorPane.d.ts +112 -0
  63. package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +1018 -0
  64. package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +389 -0
  65. package/vscode/src/vs/workbench/browser/parts/editor/media/editordroptarget.css.js +4 -0
  66. package/vscode/src/vs/workbench/browser/parts/media/compositepart.css.js +4 -0
  67. package/vscode/src/vs/workbench/browser/parts/media/paneCompositePart.css.js +4 -0
  68. package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsActions.css.js +4 -0
  69. package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css.js +4 -0
  70. package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsList.css.js +4 -0
  71. package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css.js +4 -0
  72. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js +213 -0
  73. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +73 -0
  74. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +307 -0
  75. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js +226 -0
  76. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +218 -0
  77. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +433 -0
  78. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +436 -0
  79. package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +643 -0
  80. package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +377 -0
  81. package/vscode/src/vs/workbench/browser/parts/paneCompositePartService.js +66 -0
  82. package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +144 -0
  83. package/vscode/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css.js +4 -0
  84. package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +220 -0
  85. package/vscode/src/vs/workbench/browser/window.js +239 -5
  86. package/vscode/src/vs/workbench/common/configuration.js +11 -1
  87. package/vscode/src/vs/workbench/common/theme.js +3 -3
  88. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +298 -0
  89. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +363 -0
  90. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +133 -0
  91. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/media/callHierarchy.css.js +4 -0
  92. package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +90 -0
  93. package/vscode/src/vs/workbench/contrib/comments/browser/commentMenus.js +43 -0
  94. package/vscode/src/vs/workbench/contrib/comments/browser/commentService.js +317 -2
  95. package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.js +107 -0
  96. package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +395 -0
  97. package/vscode/src/vs/workbench/contrib/comments/browser/comments.js +3 -0
  98. package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +1277 -0
  99. package/vscode/src/vs/workbench/contrib/comments/browser/commentsFilterOptions.js +17 -0
  100. package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +123 -0
  101. package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +342 -0
  102. package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +451 -0
  103. package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +176 -0
  104. package/vscode/src/vs/workbench/contrib/comments/browser/media/panel.css.js +4 -0
  105. package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js +35 -0
  106. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.js +16 -0
  107. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js +143 -0
  108. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js +212 -0
  109. package/vscode/src/vs/workbench/contrib/customEditor/browser/media/customEditor.css.js +4 -0
  110. package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +76 -0
  111. package/vscode/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.js +61 -0
  112. package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +117 -0
  113. package/vscode/src/vs/workbench/contrib/editSessions/common/editSessions.js +62 -0
  114. package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.js +5 -0
  115. package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +77 -0
  116. package/vscode/src/vs/workbench/contrib/files/browser/editors/fileEditorHandler.js +72 -0
  117. package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +254 -0
  118. package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.js +97 -0
  119. package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +442 -0
  120. package/vscode/src/vs/workbench/contrib/files/browser/explorerService.js +430 -0
  121. package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +10 -10
  122. package/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js +784 -0
  123. package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.js +487 -0
  124. package/vscode/src/vs/workbench/contrib/files/browser/files.contribution.js +521 -0
  125. package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +150 -0
  126. package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +61 -0
  127. package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveDocumentService.js +25 -1
  128. package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js +178 -0
  129. package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.js +49 -0
  130. package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +408 -0
  131. package/vscode/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css.js +4 -0
  132. package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +145 -0
  133. package/vscode/src/vs/workbench/contrib/mappedEdits/common/mappedEdits.contribution.js +22 -0
  134. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +691 -0
  135. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +238 -0
  136. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +76 -0
  137. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorSerializer.js +40 -0
  138. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +69 -0
  139. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +346 -0
  140. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js +96 -0
  141. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +144 -0
  142. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js +103 -0
  143. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +399 -0
  144. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +195 -0
  145. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.js +39 -0
  146. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/lineAlignment.js +126 -0
  147. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css.js +4 -0
  148. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +611 -0
  149. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.js +156 -0
  150. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +262 -0
  151. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewZones.js +171 -0
  152. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js +41 -0
  153. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +317 -0
  154. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver.js +56 -0
  155. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +315 -0
  156. package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +193 -0
  157. package/vscode/src/vs/workbench/contrib/preferences/common/preferences.js +2 -1
  158. package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +2 -2
  159. package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +37 -0
  160. package/vscode/src/vs/workbench/contrib/sash/browser/sash.js +39 -0
  161. package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +138 -2
  162. package/vscode/src/vs/workbench/contrib/tags/browser/workspaceTagsService.js +12 -0
  163. package/vscode/src/vs/workbench/contrib/tags/common/workspaceTags.js +3 -0
  164. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/media/typeHierarchy.css.js +4 -0
  165. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +281 -0
  166. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +358 -0
  167. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +131 -0
  168. package/vscode/src/vs/workbench/contrib/update/common/update.js +2 -0
  169. package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.js +288 -0
  170. package/vscode/src/vs/workbench/contrib/webview/browser/resourceLoading.js +94 -0
  171. package/vscode/src/vs/workbench/contrib/webview/browser/themeing.js +86 -0
  172. package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +77 -0
  173. package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +646 -0
  174. package/vscode/src/vs/workbench/contrib/webview/browser/webviewFindWidget.js +63 -0
  175. package/vscode/src/vs/workbench/contrib/webview/browser/webviewService.js +57 -0
  176. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +140 -0
  177. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.js +119 -0
  178. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +67 -0
  179. package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.js +233 -0
  180. package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +16 -0
  181. package/vscode/src/vs/workbench/services/activity/browser/activityService.js +143 -0
  182. package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +0 -3
  183. package/vscode/src/vs/workbench/services/driver/browser/driver.js +184 -0
  184. package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +668 -0
  185. package/vscode/src/vs/workbench/services/history/browser/historyService.js +1482 -0
  186. package/vscode/src/vs/workbench/services/layout/browser/layoutService.js +17 -1
  187. package/vscode/src/vs/workbench/services/lifecycle/common/lifecycle.js +8 -1
  188. package/vscode/src/vs/workbench/services/progress/browser/media/progressService.css.js +4 -0
  189. package/vscode/src/vs/workbench/services/progress/browser/progressService.js +521 -0
  190. package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +102 -0
  191. package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js +296 -0
  192. package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.js +99 -0
  193. package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +711 -0
  194. package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +596 -0
@@ -0,0 +1,195 @@
1
+ import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
2
+ import { reset } from '../../../../../../base/browser/dom.js';
3
+ import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
4
+ import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
5
+ import { CompareResult } from '../../../../../../base/common/arrays.js';
6
+ import { BugIndicatingError } from '../../../../../../base/common/errors.js';
7
+ import { toDisposable } from '../../../../../../base/common/lifecycle.js';
8
+ import { MinimapPosition, OverviewRulerLane } from '../../../../../../editor/common/model.js';
9
+ import { localizeWithPath } from '../../../../../../nls.js';
10
+ import { MenuId } from '../../../../../../platform/actions/common/actions.js';
11
+ import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
12
+ import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
13
+ import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
14
+ import { ILabelService } from '../../../../../../platform/label/common/label.js';
15
+ import { LineRange } from '../../model/lineRange.js';
16
+ import { join, applyObservableDecorations } from '../../utils.js';
17
+ import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
18
+ import { EditorGutter } from '../editorGutter.js';
19
+ import { ctxIsMergeResultEditor } from '../../../common/mergeEditor.js';
20
+ import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
21
+ import { derived } from '../../../../../../base/common/observableInternal/derived.js';
22
+ import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
23
+ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
24
+ constructor(viewModel, instantiationService, _labelService, configurationService) {
25
+ super(instantiationService, viewModel, configurationService);
26
+ this._labelService = _labelService;
27
+ this.decorations = derived(this, reader => {
28
+ const viewModel = this.viewModel.read(reader);
29
+ if (!viewModel) {
30
+ return [];
31
+ }
32
+ const model = viewModel.model;
33
+ const textModel = model.resultTextModel;
34
+ const result = ( new Array());
35
+ const baseRangeWithStoreAndTouchingDiffs = join(model.modifiedBaseRanges.read(reader), model.baseResultDiffs.read(reader), (baseRange, diff) => baseRange.baseRange.touches(diff.inputRange)
36
+ ? CompareResult.neitherLessOrGreaterThan
37
+ : LineRange.compareByStart(baseRange.baseRange, diff.inputRange));
38
+ const activeModifiedBaseRange = viewModel.activeModifiedBaseRange.read(reader);
39
+ const showNonConflictingChanges = viewModel.showNonConflictingChanges.read(reader);
40
+ for (const m of baseRangeWithStoreAndTouchingDiffs) {
41
+ const modifiedBaseRange = m.left;
42
+ if (modifiedBaseRange) {
43
+ const blockClassNames = ['merge-editor-block'];
44
+ let blockPadding = [0, 0, 0, 0];
45
+ const isHandled = model.isHandled(modifiedBaseRange).read(reader);
46
+ if (isHandled) {
47
+ blockClassNames.push('handled');
48
+ }
49
+ if (modifiedBaseRange === activeModifiedBaseRange) {
50
+ blockClassNames.push('focused');
51
+ blockPadding = [0, 2, 0, 2];
52
+ }
53
+ if (modifiedBaseRange.isConflicting) {
54
+ blockClassNames.push('conflicting');
55
+ }
56
+ blockClassNames.push('result');
57
+ if (!modifiedBaseRange.isConflicting && !showNonConflictingChanges && isHandled) {
58
+ continue;
59
+ }
60
+ const range = model.getLineRangeInResult(modifiedBaseRange.baseRange, reader);
61
+ result.push({
62
+ range: range.toInclusiveRangeOrEmpty(),
63
+ options: {
64
+ showIfCollapsed: true,
65
+ blockClassName: blockClassNames.join(' '),
66
+ blockPadding,
67
+ blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
68
+ description: 'Result Diff',
69
+ minimap: {
70
+ position: MinimapPosition.Gutter,
71
+ color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
72
+ },
73
+ overviewRuler: modifiedBaseRange.isConflicting ? {
74
+ position: OverviewRulerLane.Center,
75
+ color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
76
+ } : undefined
77
+ }
78
+ });
79
+ }
80
+ if (!modifiedBaseRange || modifiedBaseRange.isConflicting) {
81
+ for (const diff of m.rights) {
82
+ const range = diff.outputRange.toInclusiveRange();
83
+ if (range) {
84
+ result.push({
85
+ range,
86
+ options: {
87
+ className: `merge-editor-diff result`,
88
+ description: 'Merge Editor',
89
+ isWholeLine: true,
90
+ }
91
+ });
92
+ }
93
+ if (diff.rangeMappings) {
94
+ for (const d of diff.rangeMappings) {
95
+ result.push({
96
+ range: d.outputRange,
97
+ options: {
98
+ className: `merge-editor-diff-word result`,
99
+ description: 'Merge Editor'
100
+ }
101
+ });
102
+ }
103
+ }
104
+ }
105
+ }
106
+ }
107
+ return result;
108
+ });
109
+ this.editor.invokeWithinContext(accessor => {
110
+ const contextKeyService = accessor.get(IContextKeyService);
111
+ const isMergeResultEditor = ctxIsMergeResultEditor.bindTo(contextKeyService);
112
+ isMergeResultEditor.set(true);
113
+ this._register(toDisposable(() => isMergeResultEditor.reset()));
114
+ });
115
+ this.htmlElements.gutterDiv.style.width = '5px';
116
+ this.htmlElements.root.classList.add(`result`);
117
+ this._register(autorunWithStore((reader, store) => {
118
+ if (this.checkboxesVisible.read(reader)) {
119
+ store.add(( new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
120
+ getIntersectingGutterItems: (range, reader) => [],
121
+ createView: (item, target) => { throw new BugIndicatingError(); },
122
+ })));
123
+ }
124
+ }));
125
+ this._register(autorun(reader => {
126
+ const vm = this.viewModel.read(reader);
127
+ if (!vm) {
128
+ return;
129
+ }
130
+ this.editor.setModel(vm.model.resultTextModel);
131
+ reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(
132
+ 'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
133
+ 'result',
134
+ 'Result'
135
+ ))));
136
+ reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
137
+ }));
138
+ const remainingConflictsActionBar = this._register(( new ActionBar(this.htmlElements.detail)));
139
+ this._register(autorun(reader => {
140
+ const vm = this.viewModel.read(reader);
141
+ if (!vm) {
142
+ return;
143
+ }
144
+ const model = vm.model;
145
+ if (!model) {
146
+ return;
147
+ }
148
+ const count = model.unhandledConflictsCount.read(reader);
149
+ const text = count === 1
150
+ ? ( localizeWithPath(
151
+ 'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
152
+ 'mergeEditor.remainingConflicts',
153
+ '{0} Conflict Remaining',
154
+ count
155
+ ))
156
+ : ( localizeWithPath(
157
+ 'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
158
+ 'mergeEditor.remainingConflict',
159
+ '{0} Conflicts Remaining ',
160
+ count
161
+ ));
162
+ remainingConflictsActionBar.clear();
163
+ remainingConflictsActionBar.push({
164
+ class: undefined,
165
+ enabled: count > 0,
166
+ id: 'nextConflict',
167
+ label: text,
168
+ run() {
169
+ vm.model.telemetry.reportConflictCounterClicked();
170
+ vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
171
+ },
172
+ tooltip: count > 0
173
+ ? ( localizeWithPath(
174
+ 'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
175
+ 'goToNextConflict',
176
+ 'Go to next conflict'
177
+ ))
178
+ : ( localizeWithPath(
179
+ 'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
180
+ 'allConflictHandled',
181
+ 'All conflicts handled, the merge can be completed now.'
182
+ )),
183
+ });
184
+ }));
185
+ this._register(applyObservableDecorations(this.editor, this.decorations));
186
+ this._register(createSelectionsAutorun(this, (baseRange, viewModel) => viewModel.model.translateBaseRangeToResult(baseRange)));
187
+ this._register(instantiationService.createInstance(TitleMenu, MenuId.MergeInputResultToolbar, this.htmlElements.toolbar));
188
+ }
189
+ };
190
+ ResultCodeEditorView = ( __decorate([
191
+ ( __param(1, IInstantiationService)),
192
+ ( __param(2, ILabelService)),
193
+ ( __param(3, IConfigurationService))
194
+ ], ResultCodeEditorView));
195
+ export { ResultCodeEditorView };
@@ -0,0 +1,39 @@
1
+ import { h } from '../../../../../base/browser/dom.js';
2
+ import { Disposable } from '../../../../../base/common/lifecycle.js';
3
+ import { Event } from '../../../../../base/common/event.js';
4
+ class FixedZoneWidget extends Disposable {
5
+ static { this.counter = 0; }
6
+ constructor(editor, viewZoneAccessor, afterLineNumber, height, viewZoneIdsToCleanUp) {
7
+ super();
8
+ this.editor = editor;
9
+ this.overlayWidgetId = `fixedZoneWidget-${FixedZoneWidget.counter++}`;
10
+ this.widgetDomNode = h('div.fixed-zone-widget').root;
11
+ this.overlayWidget = {
12
+ getId: () => this.overlayWidgetId,
13
+ getDomNode: () => this.widgetDomNode,
14
+ getPosition: () => null
15
+ };
16
+ this.viewZoneId = viewZoneAccessor.addZone({
17
+ domNode: document.createElement('div'),
18
+ afterLineNumber: afterLineNumber,
19
+ heightInPx: height,
20
+ onComputedHeight: (height) => {
21
+ this.widgetDomNode.style.height = `${height}px`;
22
+ },
23
+ onDomNodeTop: (top) => {
24
+ this.widgetDomNode.style.top = `${top}px`;
25
+ }
26
+ });
27
+ viewZoneIdsToCleanUp.push(this.viewZoneId);
28
+ this._register(Event.runAndSubscribe(this.editor.onDidLayoutChange, () => {
29
+ this.widgetDomNode.style.left = this.editor.getLayoutInfo().contentLeft + 'px';
30
+ }));
31
+ this.editor.addOverlayWidget(this.overlayWidget);
32
+ this._register({
33
+ dispose: () => {
34
+ this.editor.removeOverlayWidget(this.overlayWidget);
35
+ },
36
+ });
37
+ }
38
+ }
39
+ export { FixedZoneWidget };
@@ -0,0 +1,126 @@
1
+ import { compareBy } from '../../../../../base/common/arrays.js';
2
+ import { assertFn, checkAdjacentItems } from '../../../../../base/common/assert.js';
3
+ import { isDefined } from '../../../../../base/common/types.js';
4
+ import { Position } from '../../../../../editor/common/core/position.js';
5
+ import { Range } from '../../../../../editor/common/core/range.js';
6
+ import { LengthObj } from '../../../../../editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
7
+ import { RangeMapping } from '../model/mapping.js';
8
+ import { lengthOfRange, addLength, lengthBetweenPositions } from '../model/rangeUtils.js';
9
+ function getAlignments(m) {
10
+ const equalRanges1 = toEqualRangeMappings(m.input1Diffs.flatMap(d => d.rangeMappings), m.baseRange.toRange(), m.input1Range.toRange());
11
+ const equalRanges2 = toEqualRangeMappings(m.input2Diffs.flatMap(d => d.rangeMappings), m.baseRange.toRange(), m.input2Range.toRange());
12
+ const commonRanges = splitUpCommonEqualRangeMappings(equalRanges1, equalRanges2);
13
+ let result = [];
14
+ result.push([m.input1Range.startLineNumber - 1, m.baseRange.startLineNumber - 1, m.input2Range.startLineNumber - 1]);
15
+ function isFullSync(lineAlignment) {
16
+ return lineAlignment.every((i) => i !== undefined);
17
+ }
18
+ for (const m of commonRanges) {
19
+ const lineAlignment = [m.output1Pos?.lineNumber, m.inputPos.lineNumber, m.output2Pos?.lineNumber];
20
+ const alignmentIsFullSync = isFullSync(lineAlignment);
21
+ let shouldAdd = true;
22
+ if (alignmentIsFullSync) {
23
+ const isNewFullSyncAlignment = !( result.some(r => isFullSync(r) && ( r.some((v, idx) => v !== undefined && v === lineAlignment[idx]))));
24
+ if (isNewFullSyncAlignment) {
25
+ result = result.filter(r => !( r.some((v, idx) => v !== undefined && v === lineAlignment[idx])));
26
+ }
27
+ shouldAdd = isNewFullSyncAlignment;
28
+ }
29
+ else {
30
+ const isNew = !( result.some(r => ( r.some((v, idx) => v !== undefined && v === lineAlignment[idx]))));
31
+ shouldAdd = isNew;
32
+ }
33
+ if (shouldAdd) {
34
+ result.push(lineAlignment);
35
+ }
36
+ else {
37
+ if (m.length.isGreaterThan(( new LengthObj(1, 0)))) {
38
+ result.push([
39
+ m.output1Pos ? m.output1Pos.lineNumber + 1 : undefined,
40
+ m.inputPos.lineNumber + 1,
41
+ m.output2Pos ? m.output2Pos.lineNumber + 1 : undefined
42
+ ]);
43
+ }
44
+ }
45
+ }
46
+ const finalLineAlignment = [m.input1Range.endLineNumberExclusive, m.baseRange.endLineNumberExclusive, m.input2Range.endLineNumberExclusive];
47
+ result = result.filter(r => r.every((v, idx) => v !== finalLineAlignment[idx]));
48
+ result.push(finalLineAlignment);
49
+ assertFn(() => checkAdjacentItems(( result.map(r => r[0])).filter(isDefined), (a, b) => a < b)
50
+ && checkAdjacentItems(( result.map(r => r[1])).filter(isDefined), (a, b) => a <= b)
51
+ && checkAdjacentItems(( result.map(r => r[2])).filter(isDefined), (a, b) => a < b)
52
+ && result.every(alignment => alignment.filter(isDefined).length >= 2));
53
+ return result;
54
+ }
55
+ function toEqualRangeMappings(diffs, inputRange, outputRange) {
56
+ const result = [];
57
+ let equalRangeInputStart = inputRange.getStartPosition();
58
+ let equalRangeOutputStart = outputRange.getStartPosition();
59
+ for (const d of diffs) {
60
+ const equalRangeMapping = ( new RangeMapping(
61
+ Range.fromPositions(equalRangeInputStart, d.inputRange.getStartPosition()),
62
+ Range.fromPositions(equalRangeOutputStart, d.outputRange.getStartPosition())
63
+ ));
64
+ assertFn(() => lengthOfRange(equalRangeMapping.inputRange).equals(lengthOfRange(equalRangeMapping.outputRange)));
65
+ if (!equalRangeMapping.inputRange.isEmpty()) {
66
+ result.push(equalRangeMapping);
67
+ }
68
+ equalRangeInputStart = d.inputRange.getEndPosition();
69
+ equalRangeOutputStart = d.outputRange.getEndPosition();
70
+ }
71
+ const equalRangeMapping = ( new RangeMapping(
72
+ Range.fromPositions(equalRangeInputStart, inputRange.getEndPosition()),
73
+ Range.fromPositions(equalRangeOutputStart, outputRange.getEndPosition())
74
+ ));
75
+ assertFn(() => lengthOfRange(equalRangeMapping.inputRange).equals(lengthOfRange(equalRangeMapping.outputRange)));
76
+ if (!equalRangeMapping.inputRange.isEmpty()) {
77
+ result.push(equalRangeMapping);
78
+ }
79
+ return result;
80
+ }
81
+ function splitUpCommonEqualRangeMappings(equalRangeMappings1, equalRangeMappings2) {
82
+ const result = [];
83
+ const events = [];
84
+ for (const [input, rangeMappings] of [[0, equalRangeMappings1], [1, equalRangeMappings2]]) {
85
+ for (const rangeMapping of rangeMappings) {
86
+ events.push({
87
+ input: input,
88
+ start: true,
89
+ inputPos: rangeMapping.inputRange.getStartPosition(),
90
+ outputPos: rangeMapping.outputRange.getStartPosition()
91
+ });
92
+ events.push({
93
+ input: input,
94
+ start: false,
95
+ inputPos: rangeMapping.inputRange.getEndPosition(),
96
+ outputPos: rangeMapping.outputRange.getEndPosition()
97
+ });
98
+ }
99
+ }
100
+ events.sort(compareBy((m) => m.inputPos, Position.compare));
101
+ const starts = [undefined, undefined];
102
+ let lastInputPos;
103
+ for (const event of events) {
104
+ if (lastInputPos && ( starts.some(s => !!s))) {
105
+ const length = lengthBetweenPositions(lastInputPos, event.inputPos);
106
+ if (!length.isZero()) {
107
+ result.push({
108
+ inputPos: lastInputPos,
109
+ length,
110
+ output1Pos: starts[0],
111
+ output2Pos: starts[1]
112
+ });
113
+ if (starts[0]) {
114
+ starts[0] = addLength(starts[0], length);
115
+ }
116
+ if (starts[1]) {
117
+ starts[1] = addLength(starts[1], length);
118
+ }
119
+ }
120
+ }
121
+ starts[event.input] = event.start ? event.outputPos : undefined;
122
+ lastInputPos = event.inputPos;
123
+ }
124
+ return result;
125
+ }
126
+ export { getAlignments };
@@ -0,0 +1,4 @@
1
+ import n from '../../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
2
+ var css = ".monaco-workbench .merge-editor .code-view>.header{align-content:center;display:flex;height:30px;overflow:hidden;padding:0 10px}.monaco-workbench .merge-editor .code-view>.header>span{align-self:center;overflow:hidden;padding-right:6px;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .merge-editor .code-view>.header>span.title{flex-shrink:0}.monaco-workbench .merge-editor .code-view>.header>span.description{align-items:center;color:var(--vscode-descriptionForeground);display:flex;flex-shrink:0;font-size:12px}.monaco-workbench .merge-editor .code-view.result>.header>.description{display:inline;flex-shrink:1}.monaco-workbench .merge-editor .code-view.result>.header>.detail,.monaco-workbench .merge-editor .code-view.result>.header>.toolbar{flex-shrink:0}.monaco-workbench .merge-editor .code-view>.header>span.description .codicon{color:var(--vscode-descriptionForeground);font-size:14px}.monaco-workbench .merge-editor .code-view>.header>span.detail{color:var(--vscode-descriptionForeground);font-size:12px;margin-left:auto}.monaco-workbench .merge-editor .code-view>.header>span.detail .codicon{font-size:13px}.monaco-workbench .merge-editor .code-view.input>.header>span.detail:before{content:\"•\";opacity:.5;padding-right:3px}.monaco-workbench .merge-editor .code-view.input>.header>span.detail{margin-left:0}.monaco-workbench .merge-editor .code-view.input>.header>span.toolbar{flex-shrink:0;margin-left:auto}.monaco-workbench .merge-editor .code-view>.container{display:flex;flex-direction:row}.monaco-workbench .merge-editor .code-view>.container>.gutter{flex-grow:0;flex-shrink:0;overflow:hidden;position:relative;width:24px}.monaco-workbench .merge-editor .merge-editor-diff{background-color:var(--vscode-mergeEditor-change-background)}.monaco-workbench .merge-editor .merge-editor-diff-word{background-color:var(--vscode-mergeEditor-change-word-background)}.monaco-workbench .merge-editor .merge-editor-block:not(.handled):not(.focused){border:1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border)}.monaco-workbench .merge-editor .merge-editor-block:not(.handled).focused{border:2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border)}.monaco-workbench .merge-editor .merge-editor-block.handled:not(.focused){border:1px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border)}.monaco-workbench .merge-editor .merge-editor-block.handled.focused{border:1px solid var(--vscode-mergeEditor-conflict-handledFocused-border)}.merge-editor-block.use-simplified-decorations.input.i1,.monaco-workbench .merge-editor .merge-editor-simplified.input.i1{background-color:var(--vscode-mergeEditor-conflict-input1-background)}.merge-editor-block.use-simplified-decorations.input.i2,.monaco-workbench .merge-editor .merge-editor-simplified.input.i2{background-color:var(--vscode-mergeEditor-conflict-input2-background)}.gutter.monaco-editor>div{position:absolute}.merge-accept-gutter-marker{margin-left:4px;width:28px}.merge-accept-gutter-marker .background{height:100%;position:absolute;width:50%}.merge-accept-gutter-marker.multi-line.focused .background{border:2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);border-right:0}.merge-accept-gutter-marker.multi-line .background{border:2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);border-bottom-left-radius:3px;border-right:0;border-top-left-radius:3px}.merge-accept-gutter-marker.multi-line.handled.focused .background{border:2px solid var(--vscode-mergeEditor-conflict-handledFocused-border);border-right:0}.merge-accept-gutter-marker.multi-line.handled .background{border:2px solid var(--vscode-checkbox-border);border-right:0}.focused .accept-conflict-group.monaco-custom-toggle{border:1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border)}.accept-conflict-group.monaco-custom-toggle{border:1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border)}.handled.focused .accept-conflict-group.monaco-custom-toggle{border:1px solid var(--vscode-mergeEditor-conflict-handledFocused-border)}.handled .accept-conflict-group.monaco-custom-toggle{border:1px solid var(--vscode-checkbox-border)}.merge-accept-gutter-marker.multi-line .background{left:8px;width:10px}.merge-accept-gutter-marker .checkbox{position:absolute;width:100%}.accept-conflict-group.monaco-custom-toggle{background-color:var(--vscode-checkbox-border);background-size:16px!important;border-radius:3px;height:18px;margin-left:0;margin-right:0;opacity:1;padding:0;width:18px}.merge-accept-gutter-marker .checkbox-background{background:var(--vscode-editor-background);display:flex}.conflict-zone-root{align-content:center;align-items:center;background-color:var(--vscode-mergeEditor-change-background);border:1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);display:flex;height:90%}.conflict-zone-root .dots{margin:0 10px}.conflict-zone-root pre{display:\"inline\";font-family:var(--monaco-monospace-font)}.conflict-zone-root .text{align-items:center;background:var(--vscode-mergeEditor-conflictingLines-background);display:flex;height:100%;margin-left:auto;overflow:hidden;padding:0 8px;white-space:nowrap}.focused.conflict-zone .conflict-zone-root{border:1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border)}.merge-editor-conflict-actions{color:var(--vscode-editorCodeLens-foreground);display:inline-block;margin:0 3px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.merge-editor-conflict-actions>a,.merge-editor-conflict-actions>span{user-select:none;-webkit-user-select:none;white-space:nowrap}.merge-editor-conflict-actions>a{text-decoration:none}.merge-editor-conflict-actions>a:hover{cursor:pointer}.merge-editor-conflict-actions>a:hover,.merge-editor-conflict-actions>a:hover .codicon{color:var(--vscode-editorLink-activeForeground)!important}.merge-editor-conflict-actions .codicon{color:currentColor!important;color:var(--vscode-editorCodeLens-foreground);vertical-align:middle}.merge-editor-conflict-actions>a:hover .codicon:before{cursor:pointer}.fixed-zone-widget{width:100%}.merge-editor-diff-empty-word.base{border-left:3px solid var(--vscode-mergeEditor-changeBase-word-background);margin-left:3px}.merge-editor-diff-empty-word.input{border-left:3px solid var(--vscode-mergeEditor-change-word-background);margin-left:3px}.merge-editor-diff-word.base{background-color:var(--vscode-mergeEditor-changeBase-word-background)}.merge-editor-diff.base{background-color:var(--vscode-mergeEditor-changeBase-background)}";
3
+ n(css,{});
4
+ export { css, css as default };