@theia/scm 1.77.0-next.99 → 1.77.0

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 (304) hide show
  1. package/lib/browser/decorations/scm-decorations-service.d.ts +2 -2
  2. package/lib/browser/decorations/scm-decorations-service.d.ts.map +1 -1
  3. package/lib/browser/decorations/scm-decorations-service.js +22 -28
  4. package/lib/browser/decorations/scm-decorations-service.js.map +1 -1
  5. package/lib/browser/decorations/scm-navigator-decorator.js +22 -28
  6. package/lib/browser/decorations/scm-navigator-decorator.js.map +1 -1
  7. package/lib/browser/dirty-diff/content-lines.js +2 -5
  8. package/lib/browser/dirty-diff/content-lines.js.map +1 -1
  9. package/lib/browser/dirty-diff/content-lines.spec.js +15 -17
  10. package/lib/browser/dirty-diff/content-lines.spec.js.map +1 -1
  11. package/lib/browser/dirty-diff/diff-computer.d.ts +1 -1
  12. package/lib/browser/dirty-diff/diff-computer.d.ts.map +1 -1
  13. package/lib/browser/dirty-diff/diff-computer.js +11 -16
  14. package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
  15. package/lib/browser/dirty-diff/diff-computer.spec.js +26 -28
  16. package/lib/browser/dirty-diff/diff-computer.spec.js.map +1 -1
  17. package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts +1 -1
  18. package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts.map +1 -1
  19. package/lib/browser/dirty-diff/dirty-diff-decorator.js +19 -22
  20. package/lib/browser/dirty-diff/dirty-diff-decorator.js.map +1 -1
  21. package/lib/browser/dirty-diff/dirty-diff-module.js +11 -14
  22. package/lib/browser/dirty-diff/dirty-diff-module.js.map +1 -1
  23. package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts +3 -3
  24. package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts.map +1 -1
  25. package/lib/browser/dirty-diff/dirty-diff-navigator.js +30 -40
  26. package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -1
  27. package/lib/browser/dirty-diff/dirty-diff-widget.d.ts +1 -1
  28. package/lib/browser/dirty-diff/dirty-diff-widget.d.ts.map +1 -1
  29. package/lib/browser/dirty-diff/dirty-diff-widget.js +50 -54
  30. package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -1
  31. package/lib/browser/merge-editor/merge-editor-contribution.d.ts +2 -2
  32. package/lib/browser/merge-editor/merge-editor-contribution.d.ts.map +1 -1
  33. package/lib/browser/merge-editor/merge-editor-contribution.js +43 -49
  34. package/lib/browser/merge-editor/merge-editor-contribution.js.map +1 -1
  35. package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts +2 -2
  36. package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts.map +1 -1
  37. package/lib/browser/merge-editor/merge-editor-dev-contribution.js +35 -45
  38. package/lib/browser/merge-editor/merge-editor-dev-contribution.js.map +1 -1
  39. package/lib/browser/merge-editor/merge-editor-module.d.ts +1 -1
  40. package/lib/browser/merge-editor/merge-editor-module.d.ts.map +1 -1
  41. package/lib/browser/merge-editor/merge-editor-module.js +49 -54
  42. package/lib/browser/merge-editor/merge-editor-module.js.map +1 -1
  43. package/lib/browser/merge-editor/merge-editor.d.ts +5 -5
  44. package/lib/browser/merge-editor/merge-editor.d.ts.map +1 -1
  45. package/lib/browser/merge-editor/merge-editor.js +77 -92
  46. package/lib/browser/merge-editor/merge-editor.js.map +1 -1
  47. package/lib/browser/merge-editor/model/line-range.js +6 -10
  48. package/lib/browser/merge-editor/model/line-range.js.map +1 -1
  49. package/lib/browser/merge-editor/model/live-diff.d.ts +1 -1
  50. package/lib/browser/merge-editor/model/live-diff.d.ts.map +1 -1
  51. package/lib/browser/merge-editor/model/live-diff.js +14 -18
  52. package/lib/browser/merge-editor/model/live-diff.js.map +1 -1
  53. package/lib/browser/merge-editor/model/merge-editor-model.d.ts +4 -4
  54. package/lib/browser/merge-editor/model/merge-editor-model.d.ts.map +1 -1
  55. package/lib/browser/merge-editor/model/merge-editor-model.js +88 -98
  56. package/lib/browser/merge-editor/model/merge-editor-model.js.map +1 -1
  57. package/lib/browser/merge-editor/model/merge-range.d.ts +3 -3
  58. package/lib/browser/merge-editor/model/merge-range.d.ts.map +1 -1
  59. package/lib/browser/merge-editor/model/merge-range.js +26 -30
  60. package/lib/browser/merge-editor/model/merge-range.js.map +1 -1
  61. package/lib/browser/merge-editor/model/range-editing.d.ts +1 -1
  62. package/lib/browser/merge-editor/model/range-editing.d.ts.map +1 -1
  63. package/lib/browser/merge-editor/model/range-editing.js +8 -13
  64. package/lib/browser/merge-editor/model/range-editing.js.map +1 -1
  65. package/lib/browser/merge-editor/model/range-mapping.d.ts +2 -2
  66. package/lib/browser/merge-editor/model/range-mapping.d.ts.map +1 -1
  67. package/lib/browser/merge-editor/model/range-mapping.js +28 -37
  68. package/lib/browser/merge-editor/model/range-mapping.js.map +1 -1
  69. package/lib/browser/merge-editor/model/range-mapping.spec.js +19 -21
  70. package/lib/browser/merge-editor/model/range-mapping.spec.js.map +1 -1
  71. package/lib/browser/merge-editor/model/range-utils.js +9 -12
  72. package/lib/browser/merge-editor/model/range-utils.js.map +1 -1
  73. package/lib/browser/merge-editor/view/diff-spacers.d.ts +1 -1
  74. package/lib/browser/merge-editor/view/diff-spacers.d.ts.map +1 -1
  75. package/lib/browser/merge-editor/view/diff-spacers.js +7 -10
  76. package/lib/browser/merge-editor/view/diff-spacers.js.map +1 -1
  77. package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts +5 -5
  78. package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts.map +1 -1
  79. package/lib/browser/merge-editor/view/merge-editor-panes/index.js +5 -8
  80. package/lib/browser/merge-editor/view/merge-editor-panes/index.js.map +1 -1
  81. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts +3 -3
  82. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts.map +1 -1
  83. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js +11 -15
  84. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js.map +1 -1
  85. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js +18 -25
  86. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js.map +1 -1
  87. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts +5 -5
  88. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts.map +1 -1
  89. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js +48 -58
  90. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js.map +1 -1
  91. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts +4 -4
  92. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts.map +1 -1
  93. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js +32 -38
  94. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js.map +1 -1
  95. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts +4 -4
  96. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts.map +1 -1
  97. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js +32 -41
  98. package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js.map +1 -1
  99. package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts +2 -2
  100. package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts.map +1 -1
  101. package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js +3 -7
  102. package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js.map +1 -1
  103. package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts +5 -5
  104. package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts.map +1 -1
  105. package/lib/browser/merge-editor/view/merge-editor-view-zones.js +18 -25
  106. package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map +1 -1
  107. package/lib/browser/merge-editor/view/merge-range-actions.d.ts +2 -2
  108. package/lib/browser/merge-editor/view/merge-range-actions.d.ts.map +1 -1
  109. package/lib/browser/merge-editor/view/merge-range-actions.js +34 -38
  110. package/lib/browser/merge-editor/view/merge-range-actions.js.map +1 -1
  111. package/lib/browser/multi-diff-editor/multi-diff-editor-module.js +13 -16
  112. package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -1
  113. package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +7 -10
  114. package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -1
  115. package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +2 -2
  116. package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -1
  117. package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +17 -21
  118. package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -1
  119. package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +226 -229
  120. package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -1
  121. package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +1 -1
  122. package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -1
  123. package/lib/browser/multi-diff-editor/multi-diff-editor.js +70 -81
  124. package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -1
  125. package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +66 -68
  126. package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -1
  127. package/lib/browser/scm-action-button-widget.d.ts +2 -2
  128. package/lib/browser/scm-action-button-widget.d.ts.map +1 -1
  129. package/lib/browser/scm-action-button-widget.js +30 -39
  130. package/lib/browser/scm-action-button-widget.js.map +1 -1
  131. package/lib/browser/scm-amend-component.d.ts +3 -3
  132. package/lib/browser/scm-amend-component.d.ts.map +1 -1
  133. package/lib/browser/scm-amend-component.js +24 -29
  134. package/lib/browser/scm-amend-component.js.map +1 -1
  135. package/lib/browser/scm-amend-widget.d.ts +2 -2
  136. package/lib/browser/scm-amend-widget.d.ts.map +1 -1
  137. package/lib/browser/scm-amend-widget.js +26 -36
  138. package/lib/browser/scm-amend-widget.js.map +1 -1
  139. package/lib/browser/scm-avatar-service.js +7 -10
  140. package/lib/browser/scm-avatar-service.js.map +1 -1
  141. package/lib/browser/scm-colors.js +2 -5
  142. package/lib/browser/scm-colors.js.map +1 -1
  143. package/lib/browser/scm-commit-widget.d.ts +2 -2
  144. package/lib/browser/scm-commit-widget.d.ts.map +1 -1
  145. package/lib/browser/scm-commit-widget.js +25 -31
  146. package/lib/browser/scm-commit-widget.js.map +1 -1
  147. package/lib/browser/scm-context-key-service.js +10 -17
  148. package/lib/browser/scm-context-key-service.js.map +1 -1
  149. package/lib/browser/scm-context-key-service.spec.js +33 -35
  150. package/lib/browser/scm-context-key-service.spec.js.map +1 -1
  151. package/lib/browser/scm-contribution.d.ts +8 -8
  152. package/lib/browser/scm-contribution.d.ts.map +1 -1
  153. package/lib/browser/scm-contribution.js +114 -131
  154. package/lib/browser/scm-contribution.js.map +1 -1
  155. package/lib/browser/scm-frontend-module.js +99 -103
  156. package/lib/browser/scm-frontend-module.js.map +1 -1
  157. package/lib/browser/scm-groups-tree-model.d.ts +3 -3
  158. package/lib/browser/scm-groups-tree-model.d.ts.map +1 -1
  159. package/lib/browser/scm-groups-tree-model.js +15 -22
  160. package/lib/browser/scm-groups-tree-model.js.map +1 -1
  161. package/lib/browser/scm-history-graph-contribution.d.ts +4 -4
  162. package/lib/browser/scm-history-graph-contribution.d.ts.map +1 -1
  163. package/lib/browser/scm-history-graph-contribution.js +52 -60
  164. package/lib/browser/scm-history-graph-contribution.js.map +1 -1
  165. package/lib/browser/scm-history-graph-contribution.spec.js +35 -37
  166. package/lib/browser/scm-history-graph-contribution.spec.js.map +1 -1
  167. package/lib/browser/scm-history-graph-helpers.d.ts +1 -1
  168. package/lib/browser/scm-history-graph-helpers.d.ts.map +1 -1
  169. package/lib/browser/scm-history-graph-helpers.js +14 -30
  170. package/lib/browser/scm-history-graph-helpers.js.map +1 -1
  171. package/lib/browser/scm-history-graph-helpers.spec.js +44 -46
  172. package/lib/browser/scm-history-graph-helpers.spec.js.map +1 -1
  173. package/lib/browser/scm-history-graph-lanes.js +1 -4
  174. package/lib/browser/scm-history-graph-lanes.js.map +1 -1
  175. package/lib/browser/scm-history-graph-lanes.spec.js +135 -137
  176. package/lib/browser/scm-history-graph-lanes.spec.js.map +1 -1
  177. package/lib/browser/scm-history-graph-model.d.ts +4 -4
  178. package/lib/browser/scm-history-graph-model.d.ts.map +1 -1
  179. package/lib/browser/scm-history-graph-model.js +34 -43
  180. package/lib/browser/scm-history-graph-model.js.map +1 -1
  181. package/lib/browser/scm-history-graph-model.spec.js +74 -76
  182. package/lib/browser/scm-history-graph-model.spec.js.map +1 -1
  183. package/lib/browser/scm-history-graph-tooltip.d.ts +2 -2
  184. package/lib/browser/scm-history-graph-tooltip.d.ts.map +1 -1
  185. package/lib/browser/scm-history-graph-tooltip.js +33 -42
  186. package/lib/browser/scm-history-graph-tooltip.js.map +1 -1
  187. package/lib/browser/scm-history-graph-tooltip.spec.js +63 -65
  188. package/lib/browser/scm-history-graph-tooltip.spec.js.map +1 -1
  189. package/lib/browser/scm-history-graph-widget.d.ts +7 -7
  190. package/lib/browser/scm-history-graph-widget.d.ts.map +1 -1
  191. package/lib/browser/scm-history-graph-widget.js +116 -134
  192. package/lib/browser/scm-history-graph-widget.js.map +1 -1
  193. package/lib/browser/scm-history-graph-widget.spec.js +40 -43
  194. package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
  195. package/lib/browser/scm-input.js +11 -16
  196. package/lib/browser/scm-input.js.map +1 -1
  197. package/lib/browser/scm-layout-migrations.js +15 -18
  198. package/lib/browser/scm-layout-migrations.js.map +1 -1
  199. package/lib/browser/scm-provider.js +1 -4
  200. package/lib/browser/scm-provider.js.map +1 -1
  201. package/lib/browser/scm-quick-open-service.d.ts +1 -1
  202. package/lib/browser/scm-quick-open-service.d.ts.map +1 -1
  203. package/lib/browser/scm-quick-open-service.js +20 -27
  204. package/lib/browser/scm-quick-open-service.js.map +1 -1
  205. package/lib/browser/scm-repositories-widget.d.ts +4 -4
  206. package/lib/browser/scm-repositories-widget.d.ts.map +1 -1
  207. package/lib/browser/scm-repositories-widget.js +55 -67
  208. package/lib/browser/scm-repositories-widget.js.map +1 -1
  209. package/lib/browser/scm-repositories-widget.spec.js +86 -89
  210. package/lib/browser/scm-repositories-widget.spec.js.map +1 -1
  211. package/lib/browser/scm-repository.d.ts +2 -2
  212. package/lib/browser/scm-repository.d.ts.map +1 -1
  213. package/lib/browser/scm-repository.js +6 -10
  214. package/lib/browser/scm-repository.js.map +1 -1
  215. package/lib/browser/scm-service.d.ts +3 -3
  216. package/lib/browser/scm-service.d.ts.map +1 -1
  217. package/lib/browser/scm-service.js +18 -22
  218. package/lib/browser/scm-service.js.map +1 -1
  219. package/lib/browser/scm-service.spec.js +15 -17
  220. package/lib/browser/scm-service.spec.js.map +1 -1
  221. package/lib/browser/scm-tree-label-provider.d.ts +1 -1
  222. package/lib/browser/scm-tree-label-provider.d.ts.map +1 -1
  223. package/lib/browser/scm-tree-label-provider.js +16 -20
  224. package/lib/browser/scm-tree-label-provider.js.map +1 -1
  225. package/lib/browser/scm-tree-model.d.ts +2 -2
  226. package/lib/browser/scm-tree-model.d.ts.map +1 -1
  227. package/lib/browser/scm-tree-model.js +27 -32
  228. package/lib/browser/scm-tree-model.js.map +1 -1
  229. package/lib/browser/scm-tree-widget.d.ts +4 -4
  230. package/lib/browser/scm-tree-widget.d.ts.map +1 -1
  231. package/lib/browser/scm-tree-widget.js +98 -122
  232. package/lib/browser/scm-tree-widget.js.map +1 -1
  233. package/lib/browser/scm-widget.d.ts +6 -6
  234. package/lib/browser/scm-widget.d.ts.map +1 -1
  235. package/lib/browser/scm-widget.js +49 -64
  236. package/lib/browser/scm-widget.js.map +1 -1
  237. package/lib/common/scm-preferences.js +21 -26
  238. package/lib/common/scm-preferences.js.map +1 -1
  239. package/lib/node/scm-backend-module.js +4 -6
  240. package/lib/node/scm-backend-module.js.map +1 -1
  241. package/package.json +16 -7
  242. package/src/browser/decorations/scm-decorations-service.ts +5 -5
  243. package/src/browser/dirty-diff/content-lines.spec.ts +3 -2
  244. package/src/browser/dirty-diff/diff-computer.spec.ts +4 -3
  245. package/src/browser/dirty-diff/diff-computer.ts +1 -1
  246. package/src/browser/dirty-diff/dirty-diff-decorator.ts +1 -1
  247. package/src/browser/dirty-diff/dirty-diff-module.ts +3 -3
  248. package/src/browser/dirty-diff/dirty-diff-navigator.ts +3 -3
  249. package/src/browser/dirty-diff/dirty-diff-widget.ts +2 -2
  250. package/src/browser/merge-editor/merge-editor-contribution.ts +2 -2
  251. package/src/browser/merge-editor/merge-editor-dev-contribution.ts +1 -1
  252. package/src/browser/merge-editor/merge-editor-module.ts +7 -7
  253. package/src/browser/merge-editor/merge-editor.ts +5 -5
  254. package/src/browser/merge-editor/model/live-diff.ts +2 -2
  255. package/src/browser/merge-editor/model/merge-editor-model.ts +8 -8
  256. package/src/browser/merge-editor/model/merge-range.ts +4 -4
  257. package/src/browser/merge-editor/model/range-editing.ts +1 -1
  258. package/src/browser/merge-editor/model/range-mapping.spec.ts +1 -1
  259. package/src/browser/merge-editor/model/range-mapping.ts +3 -3
  260. package/src/browser/merge-editor/view/diff-spacers.ts +1 -1
  261. package/src/browser/merge-editor/view/merge-editor-panes/index.ts +5 -5
  262. package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts +3 -3
  263. package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts +7 -7
  264. package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts +4 -4
  265. package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts +4 -4
  266. package/src/browser/merge-editor/view/merge-editor-scroll-sync.ts +2 -2
  267. package/src/browser/merge-editor/view/merge-editor-view-zones.ts +5 -5
  268. package/src/browser/merge-editor/view/merge-range-actions.ts +2 -2
  269. package/src/browser/multi-diff-editor/multi-diff-editor-module.ts +2 -2
  270. package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +2 -2
  271. package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +3 -3
  272. package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +1 -1
  273. package/src/browser/multi-diff-editor/multi-diff-editor.ts +1 -1
  274. package/src/browser/scm-action-button-widget.tsx +3 -3
  275. package/src/browser/scm-amend-component.tsx +3 -3
  276. package/src/browser/scm-amend-widget.tsx +3 -3
  277. package/src/browser/scm-commit-widget.tsx +2 -2
  278. package/src/browser/scm-context-key-service.spec.ts +3 -3
  279. package/src/browser/scm-contribution.ts +8 -8
  280. package/src/browser/scm-frontend-module.ts +23 -23
  281. package/src/browser/scm-groups-tree-model.ts +3 -3
  282. package/src/browser/scm-history-graph-contribution.spec.ts +3 -3
  283. package/src/browser/scm-history-graph-contribution.ts +6 -6
  284. package/src/browser/scm-history-graph-helpers.spec.ts +2 -2
  285. package/src/browser/scm-history-graph-helpers.ts +1 -1
  286. package/src/browser/scm-history-graph-lanes.spec.ts +1 -1
  287. package/src/browser/scm-history-graph-model.spec.ts +3 -3
  288. package/src/browser/scm-history-graph-model.ts +5 -5
  289. package/src/browser/scm-history-graph-tooltip.spec.ts +3 -3
  290. package/src/browser/scm-history-graph-tooltip.ts +3 -3
  291. package/src/browser/scm-history-graph-widget.spec.ts +4 -4
  292. package/src/browser/scm-history-graph-widget.tsx +8 -8
  293. package/src/browser/scm-layout-migrations.ts +1 -1
  294. package/src/browser/scm-quick-open-service.ts +1 -1
  295. package/src/browser/scm-repositories-widget.spec.ts +2 -2
  296. package/src/browser/scm-repositories-widget.tsx +4 -4
  297. package/src/browser/scm-repository.ts +2 -2
  298. package/src/browser/scm-service.spec.ts +2 -2
  299. package/src/browser/scm-service.ts +3 -3
  300. package/src/browser/scm-tree-label-provider.ts +1 -1
  301. package/src/browser/scm-tree-model.ts +2 -2
  302. package/src/browser/scm-tree-widget.tsx +4 -4
  303. package/src/browser/scm-widget.tsx +6 -6
  304. package/src/node/scm-backend-module.ts +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-model.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/merge-editor-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-editor-model.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/merge-editor-model.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAc,UAAU,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AAChF,OAAO,EAA8B,UAAU,EAAuC,MAAM,mCAAmC,CAAC;AAChI,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAIlF,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACtI,OAAO,EAAE,QAAQ,EAAiB,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,eAAO,MAAM,qBAAqB,eAAkC,CAAC;AACrE,MAAM,WAAW,qBAAqB;IAClC,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;IACnC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;IACnC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACf,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;KAClC,CAAA;CACJ;AAED,qBACa,gBAAiB,YAAW,UAAU;IAG/C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAG9C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA4B;IAEhD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAE1D,SAAS,CAAC,aAAa,EAAE,QAAQ,CAAC;IAClC,SAAS,CAAC,aAAa,EAAE,QAAQ,CAAC;IAClC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC;IAEnC,SAAS,CAAC,2BAA2B,UAAQ;IAE7C,SAAS,CAAC,QAAQ,CAAC,qBAAqB,iCAA6D;IACrG,IAAI,WAAW,IAAI,SAAS,UAAU,EAAE,CAEvC;IAED,SAAS,CAAC,QAAQ,CAAC,yBAAyB,oDAEzC;IAGH,SAAS,CAAC,QAAQ,CAAC,mCAAmC,yCAEnD;IACH,IAAI,yBAAyB,IAAI,oBAAoB,CAEpD;IAED,SAAS,CAAC,QAAQ,CAAC,mCAAmC,yCAA4E;IAClI,IAAI,yBAAyB,IAAI,oBAAoB,CAEpD;IAED,SAAS,CAAC,QAAQ,CAAC,mCAAmC,yCAEnD;IACH,IAAI,yBAAyB,IAAI,oBAAoB,CAEpD;IAED,SAAS,CAAC,QAAQ,CAAC,mCAAmC,yCAA4E;IAClI,IAAI,yBAAyB,IAAI,oBAAoB,CAEpD;IAED,SAAS,CAAC,QAAQ,CAAC,iCAAiC,yCAAmF;IACvI,IAAI,uBAAuB,IAAI,oBAAoB,CAElD;IAED,SAAS,CAAC,QAAQ,CAAC,iCAAiC,yCAA0E;IAC9H,IAAI,uBAAuB,IAAI,oBAAoB,CAElD;IAED,SAAS,CAAC,QAAQ,CAAC,iCAAiC,yCAAmF;IACvI,IAAI,uBAAuB,IAAI,oBAAoB,CAElD;IAED,SAAS,CAAC,QAAQ,CAAC,iCAAiC,yCAA0E;IAC9H,IAAI,uBAAuB,IAAI,oBAAoB,CAElD;IAED,SAAS,CAAC,QAAQ,CAAC,kCAAkC,yCAAoF;IACzI,IAAI,wBAAwB,IAAI,oBAAoB,CAEnD;IAED,SAAS,CAAC,QAAQ,CAAC,kCAAkC,yCAA2E;IAChI,IAAI,wBAAwB,IAAI,oBAAoB,CAEnD;IAID,SAAS,CAAC,QAAQ,CAAC,6BAA6B,qCAE7C;IACH,IAAI,mBAAmB,IAAI,gBAAgB,CAE1C;IAED,SAAS,CAAC,QAAQ,CAAC,6BAA6B,qCAAsE;IACtH,IAAI,mBAAmB,IAAI,gBAAgB,CAE1C;IAED,SAAS,CAAC,QAAQ,CAAC,6BAA6B,qCAE7C;IACH,IAAI,mBAAmB,IAAI,gBAAgB,CAE1C;IAED,SAAS,CAAC,QAAQ,CAAC,6BAA6B,qCAAsE;IACtH,IAAI,mBAAmB,IAAI,gBAAgB,CAE1C;IAED,SAAS,CAAC,QAAQ,CAAC,8BAA8B,qCAE9C;IACH,IAAI,oBAAoB,IAAI,gBAAgB,CAE3C;IAED,SAAS,CAAC,QAAQ,CAAC,8BAA8B,qCAAuE;IACxH,IAAI,oBAAoB,IAAI,gBAAgB,CAE3C;IAGD,SAAS,CAAC,QAAQ,CAAC,4BAA4B,uCAA2H;IAC1K,SAAS,CAAC,QAAQ,CAAC,oCAAoC,uCAAsG;IAE7J,QAAQ,CAAC,oBAAoB,4BAA2G;IAExI,SAAS,CAAC,QAAQ,CAAC,mCAAmC,2BASnD;IACH,IAAI,yBAAyB,IAAI,MAAM,CAEtC;IAED,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEjC;IAED,IAAI,YAAY,IAAI,iBAAiB,CAEpC;IAED,IAAI,aAAa,IAAI,iBAAiB,CAErC;IAED,IAAI,aAAa,IAAI,iBAAiB,CAErC;IAED,IAAI,cAAc,IAAI,iBAAiB,CAEtC;IAED,SAAS,KAAK,YAAY,IAAI,YAAY,CAEzC;IAED,IAAI,YAAY,IAAI,SAAS,wBAAwB,EAAE,CAEtD;IAED,IAAI,YAAY,IAAI,SAAS,wBAAwB,EAAE,CAEtD;IAED,IAAI,aAAa,IAAI,SAAS,wBAAwB,EAAE,CAEvD;IAGD,SAAS,CAAC,IAAI,IAAI,IAAI;IAiHtB,SAAS,CAAC,gCAAgC,CAAC,UAAU,EAAE,UAAU,GAAG,qBAAqB;cA8BzE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC,OAAO,IAAI,IAAI;IAIf,UAAU,IAAI,OAAO;IAIf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5B,SAAS,CAAC,uBAAuB,IAAI,MAAM;IAoC3C,SAAS,CAAC,kBAAkB,IAAI,UAAU,EAAE;IAI5C,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;IAI9C,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,cAAc;IAQnE,wBAAwB,CAAC,UAAU,EAAE,UAAU,GAAG,qBAAqB;IAIvE,4BAA4B,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,uBAAuB,GAAG,IAAI;IA2B1F,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;IAIpD,uBAAuB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;QACtD,QAAQ,CAAC,EAAE,KAAK,GAAG;YACf,QAAQ,CAAC,EAAE;gBACP,OAAO,IAAI,IAAI,CAAC;gBAChB,OAAO,IAAI,IAAI,CAAC;aACnB,CAAA;SACJ,CAAA;KACJ,GAAG,IAAI;IAqCR,oBAAoB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;IAIvD,SAAS,CAAC,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,gBAAgB;IA+B7E,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,GAAG,KAAK;IAK9D,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,GAAG,KAAK;IAK9D,0BAA0B,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAI/C,0BAA0B,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAI/C,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,EAAE,aAAa,EAAE,SAAS,gBAAgB,EAAE,GAAG,SAAS,gBAAgB,EAAE;IAIpJ,SAAS,CAAC,iBAAiB,IAAI,cAAc;IAI7C,SAAS,CAAC,WAAW,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,GAAG,QAAQ;IAIzG,SAAS,CAAC,uBAAuB,CAAC,iBAAiB,EAAE,SAAS,gBAAgB,EAAE,GAAG,oBAAoB;IAIvG,SAAS,CAAC,mBAAmB,CAAC,aAAa,EAAE,SAAS,YAAY,EAAE,GAAG,gBAAgB;IAIvF,SAAS,CAAC,qBAAqB,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,GAAG,kBAAkB;CAahF;AAED,0BAAkB,kBAAkB;IAChC,YAAY,IAAA;IACZ,QAAQ,IAAA;IACR,QAAQ,IAAA;CACX;AAED,qBAAa,cAAc;IACvB,QAAQ,CAAC,qBAAqB,mDAA4D;IAC1F,QAAQ,CAAC,mBAAmB,qCAAoC;CACnE"}
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2025 1C-Soft LLC and others.
4
3
  //
@@ -20,53 +19,51 @@
20
19
  *--------------------------------------------------------------------------------------------*/
21
20
  // copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts,
22
21
  // https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
23
- Object.defineProperty(exports, "__esModule", { value: true });
24
- exports.MergeRangeData = exports.MergeEditorModel = exports.MergeEditorModelProps = void 0;
25
- const tslib_1 = require("tslib");
26
- const inversify_1 = require("@theia/core/shared/inversify");
27
- const core_1 = require("@theia/core");
28
- const observable_1 = require("@theia/core/lib/common/observable");
29
- const diff_1 = require("@theia/core/lib/common/diff");
30
- const monaco_to_protocol_converter_1 = require("@theia/monaco/lib/browser/monaco-to-protocol-converter");
31
- const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
32
- const undoRedo_1 = require("@theia/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo");
33
- const merge_range_1 = require("./merge-range");
34
- const range_mapping_1 = require("./range-mapping");
35
- const live_diff_1 = require("./live-diff");
36
- const line_range_1 = require("./line-range");
37
- const range_editing_1 = require("./range-editing");
38
- const range_utils_1 = require("./range-utils");
39
- exports.MergeEditorModelProps = Symbol('MergeEditorModelProps');
22
+ import { __decorate } from "tslib";
23
+ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
24
+ import { ArrayUtils, DisposableCollection, nls } from '@theia/core';
25
+ import { Autorun, DerivedObservable, Observable, ObservableUtils, SettableObservable } from '@theia/core/lib/common/observable';
26
+ import { DiffComputer } from '@theia/core/lib/common/diff';
27
+ import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
28
+ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
29
+ import { IUndoRedoService } from '@theia/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo.js';
30
+ import { MergeRange } from './merge-range.js';
31
+ import { DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping } from './range-mapping.js';
32
+ import { LiveDiff } from './live-diff.js';
33
+ import { LineRange } from './line-range.js';
34
+ import { LineRangeEdit } from './range-editing.js';
35
+ import { RangeUtils } from './range-utils.js';
36
+ export const MergeEditorModelProps = Symbol('MergeEditorModelProps');
40
37
  let MergeEditorModel = class MergeEditorModel {
41
38
  constructor() {
42
- this.toDispose = new core_1.DisposableCollection();
39
+ this.toDispose = new DisposableCollection();
43
40
  this.shouldRecomputeHandledState = true;
44
- this.mergeRangesObservable = observable_1.DerivedObservable.create(() => this.computeMergeRanges());
45
- this.mergeRangesDataObservable = observable_1.DerivedObservable.create(() => new Map(this.mergeRanges.map(mergeRange => [mergeRange, this.newMergeRangeData()])));
41
+ this.mergeRangesObservable = DerivedObservable.create(() => this.computeMergeRanges());
42
+ this.mergeRangesDataObservable = DerivedObservable.create(() => new Map(this.mergeRanges.map(mergeRange => [mergeRange, this.newMergeRangeData()])));
46
43
  // #region Line Range Mapping
47
- this.side1ToResultLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.computeSideToResultDiff(this.side1Changes, this.resultChanges)));
48
- this.resultToSide1LineRangeMapObservable = observable_1.DerivedObservable.create(() => this.side1ToResultLineRangeMap.reverse());
49
- this.side2ToResultLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.computeSideToResultDiff(this.side2Changes, this.resultChanges)));
50
- this.resultToSide2LineRangeMapObservable = observable_1.DerivedObservable.create(() => this.side2ToResultLineRangeMap.reverse());
51
- this.baseToSide1LineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.side1Changes));
52
- this.side1ToBaseLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToSide1LineRangeMap.reverse());
53
- this.baseToSide2LineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.side2Changes));
54
- this.side2ToBaseLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToSide2LineRangeMap.reverse());
55
- this.baseToResultLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.resultChanges));
56
- this.resultToBaseLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToResultLineRangeMap.reverse());
44
+ this.side1ToResultLineRangeMapObservable = DerivedObservable.create(() => this.newDocumentLineRangeMap(this.computeSideToResultDiff(this.side1Changes, this.resultChanges)));
45
+ this.resultToSide1LineRangeMapObservable = DerivedObservable.create(() => this.side1ToResultLineRangeMap.reverse());
46
+ this.side2ToResultLineRangeMapObservable = DerivedObservable.create(() => this.newDocumentLineRangeMap(this.computeSideToResultDiff(this.side2Changes, this.resultChanges)));
47
+ this.resultToSide2LineRangeMapObservable = DerivedObservable.create(() => this.side2ToResultLineRangeMap.reverse());
48
+ this.baseToSide1LineRangeMapObservable = DerivedObservable.create(() => this.newDocumentLineRangeMap(this.side1Changes));
49
+ this.side1ToBaseLineRangeMapObservable = DerivedObservable.create(() => this.baseToSide1LineRangeMap.reverse());
50
+ this.baseToSide2LineRangeMapObservable = DerivedObservable.create(() => this.newDocumentLineRangeMap(this.side2Changes));
51
+ this.side2ToBaseLineRangeMapObservable = DerivedObservable.create(() => this.baseToSide2LineRangeMap.reverse());
52
+ this.baseToResultLineRangeMapObservable = DerivedObservable.create(() => this.newDocumentLineRangeMap(this.resultChanges));
53
+ this.resultToBaseLineRangeMapObservable = DerivedObservable.create(() => this.baseToResultLineRangeMap.reverse());
57
54
  // #endregion
58
55
  // #region Range Mapping
59
- this.baseToSide1RangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentRangeMap(this.side1Changes.flatMap(change => change.rangeMappings)));
60
- this.side1ToBaseRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToSide1RangeMap.reverse());
61
- this.baseToSide2RangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentRangeMap(this.side2Changes.flatMap(change => change.rangeMappings)));
62
- this.side2ToBaseRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToSide2RangeMap.reverse());
63
- this.baseToResultRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentRangeMap(this.resultChanges.flatMap(change => change.rangeMappings)));
64
- this.resultToBaseRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToResultRangeMap.reverse());
56
+ this.baseToSide1RangeMapObservable = DerivedObservable.create(() => this.newDocumentRangeMap(this.side1Changes.flatMap(change => change.rangeMappings)));
57
+ this.side1ToBaseRangeMapObservable = DerivedObservable.create(() => this.baseToSide1RangeMap.reverse());
58
+ this.baseToSide2RangeMapObservable = DerivedObservable.create(() => this.newDocumentRangeMap(this.side2Changes.flatMap(change => change.rangeMappings)));
59
+ this.side2ToBaseRangeMapObservable = DerivedObservable.create(() => this.baseToSide2RangeMap.reverse());
60
+ this.baseToResultRangeMapObservable = DerivedObservable.create(() => this.newDocumentRangeMap(this.resultChanges.flatMap(change => change.rangeMappings)));
61
+ this.resultToBaseRangeMapObservable = DerivedObservable.create(() => this.baseToResultRangeMap.reverse());
65
62
  // #endregion
66
- this.diffComputingStateObservable = observable_1.DerivedObservable.create(() => this.getDiffComputingState(this.side1LiveDiff, this.side2LiveDiff, this.resultLiveDiff));
67
- this.diffComputingStateForSidesObservable = observable_1.DerivedObservable.create(() => this.getDiffComputingState(this.side1LiveDiff, this.side2LiveDiff));
68
- this.isUpToDateObservable = observable_1.DerivedObservable.create(() => this.diffComputingStateObservable.get() === 1 /* DiffComputingState.UpToDate */);
69
- this.unhandledMergeRangesCountObservable = observable_1.DerivedObservable.create(() => {
63
+ this.diffComputingStateObservable = DerivedObservable.create(() => this.getDiffComputingState(this.side1LiveDiff, this.side2LiveDiff, this.resultLiveDiff));
64
+ this.diffComputingStateForSidesObservable = DerivedObservable.create(() => this.getDiffComputingState(this.side1LiveDiff, this.side2LiveDiff));
65
+ this.isUpToDateObservable = DerivedObservable.create(() => this.diffComputingStateObservable.get() === 1 /* DiffComputingState.UpToDate */);
66
+ this.unhandledMergeRangesCountObservable = DerivedObservable.create(() => {
70
67
  let result = 0;
71
68
  const mergeRangesData = this.mergeRangesDataObservable.get();
72
69
  for (const mergeRangeData of mergeRangesData.values()) {
@@ -162,31 +159,31 @@ let MergeEditorModel = class MergeEditorModel {
162
159
  this.toDispose.push(this.side1LiveDiff = this.newLiveDiff(this.baseDocument, this.side1Document));
163
160
  this.toDispose.push(this.side2LiveDiff = this.newLiveDiff(this.baseDocument, this.side2Document));
164
161
  this.toDispose.push(this.resultLiveDiff = this.newLiveDiff(this.baseDocument, this.resultDocument));
165
- this.toDispose.push(observable_1.Observable.keepObserved(this.mergeRangesDataObservable));
166
- this.toDispose.push(observable_1.Observable.keepObserved(this.side1ToResultLineRangeMapObservable));
167
- this.toDispose.push(observable_1.Observable.keepObserved(this.resultToSide1LineRangeMapObservable));
168
- this.toDispose.push(observable_1.Observable.keepObserved(this.side2ToResultLineRangeMapObservable));
169
- this.toDispose.push(observable_1.Observable.keepObserved(this.resultToSide2LineRangeMapObservable));
170
- this.toDispose.push(observable_1.Observable.keepObserved(this.baseToSide1LineRangeMapObservable));
171
- this.toDispose.push(observable_1.Observable.keepObserved(this.side1ToBaseLineRangeMapObservable));
172
- this.toDispose.push(observable_1.Observable.keepObserved(this.baseToSide2LineRangeMapObservable));
173
- this.toDispose.push(observable_1.Observable.keepObserved(this.side2ToBaseLineRangeMapObservable));
174
- this.toDispose.push(observable_1.Observable.keepObserved(this.baseToResultLineRangeMapObservable));
175
- this.toDispose.push(observable_1.Observable.keepObserved(this.resultToBaseLineRangeMapObservable));
176
- this.toDispose.push(observable_1.Observable.keepObserved(this.baseToSide1RangeMapObservable));
177
- this.toDispose.push(observable_1.Observable.keepObserved(this.side1ToBaseRangeMapObservable));
178
- this.toDispose.push(observable_1.Observable.keepObserved(this.baseToSide2RangeMapObservable));
179
- this.toDispose.push(observable_1.Observable.keepObserved(this.side2ToBaseRangeMapObservable));
180
- this.toDispose.push(observable_1.Observable.keepObserved(this.baseToResultRangeMapObservable));
181
- this.toDispose.push(observable_1.Observable.keepObserved(this.resultToBaseRangeMapObservable));
162
+ this.toDispose.push(Observable.keepObserved(this.mergeRangesDataObservable));
163
+ this.toDispose.push(Observable.keepObserved(this.side1ToResultLineRangeMapObservable));
164
+ this.toDispose.push(Observable.keepObserved(this.resultToSide1LineRangeMapObservable));
165
+ this.toDispose.push(Observable.keepObserved(this.side2ToResultLineRangeMapObservable));
166
+ this.toDispose.push(Observable.keepObserved(this.resultToSide2LineRangeMapObservable));
167
+ this.toDispose.push(Observable.keepObserved(this.baseToSide1LineRangeMapObservable));
168
+ this.toDispose.push(Observable.keepObserved(this.side1ToBaseLineRangeMapObservable));
169
+ this.toDispose.push(Observable.keepObserved(this.baseToSide2LineRangeMapObservable));
170
+ this.toDispose.push(Observable.keepObserved(this.side2ToBaseLineRangeMapObservable));
171
+ this.toDispose.push(Observable.keepObserved(this.baseToResultLineRangeMapObservable));
172
+ this.toDispose.push(Observable.keepObserved(this.resultToBaseLineRangeMapObservable));
173
+ this.toDispose.push(Observable.keepObserved(this.baseToSide1RangeMapObservable));
174
+ this.toDispose.push(Observable.keepObserved(this.side1ToBaseRangeMapObservable));
175
+ this.toDispose.push(Observable.keepObserved(this.baseToSide2RangeMapObservable));
176
+ this.toDispose.push(Observable.keepObserved(this.side2ToBaseRangeMapObservable));
177
+ this.toDispose.push(Observable.keepObserved(this.baseToResultRangeMapObservable));
178
+ this.toDispose.push(Observable.keepObserved(this.resultToBaseRangeMapObservable));
182
179
  const initializePromise = this.doInit();
183
- this._onInitialized = observable_1.ObservableUtils.waitForState(this.isUpToDateObservable).then(() => initializePromise);
180
+ this._onInitialized = ObservableUtils.waitForState(this.isUpToDateObservable).then(() => initializePromise);
184
181
  initializePromise.then(() => {
185
- this.toDispose.push(observable_1.Autorun.create(() => {
182
+ this.toDispose.push(Autorun.create(() => {
186
183
  if (!this.isUpToDateObservable.get()) {
187
184
  return;
188
185
  }
189
- observable_1.Observable.update(() => {
186
+ Observable.update(() => {
190
187
  const mergeRangesData = this.mergeRangesDataObservable.get();
191
188
  for (const [mergeRange, mergeRangeData] of mergeRangesData) {
192
189
  const state = this.computeMergeRangeStateFromResult(mergeRange);
@@ -215,7 +212,7 @@ let MergeEditorModel = class MergeEditorModel {
215
212
  const mergeRanges = [];
216
213
  for (const change of event.changes) {
217
214
  const changeBaseRange = this.translateResultRangeToBase(this.m2p.asRange(change.range));
218
- const affectedMergeRanges = this.mergeRanges.filter(mergeRange => range_utils_1.RangeUtils.touches(mergeRange.baseRange.toRange(), changeBaseRange));
215
+ const affectedMergeRanges = this.mergeRanges.filter(mergeRange => RangeUtils.touches(mergeRange.baseRange.toRange(), changeBaseRange));
219
216
  for (const mergeRange of affectedMergeRanges) {
220
217
  if (!this.isMergeRangeHandled(mergeRange)) {
221
218
  mergeRanges.push(mergeRange);
@@ -226,7 +223,7 @@ let MergeEditorModel = class MergeEditorModel {
226
223
  return;
227
224
  }
228
225
  const markMergeRangesAsHandled = (handled) => {
229
- observable_1.Observable.update(() => {
226
+ Observable.update(() => {
230
227
  const mergeRangesData = this.mergeRangesDataObservable.get();
231
228
  for (const mergeRange of mergeRanges) {
232
229
  const mergeRangeData = mergeRangesData.get(mergeRange);
@@ -266,7 +263,7 @@ let MergeEditorModel = class MergeEditorModel {
266
263
  ];
267
264
  for (const state of states) {
268
265
  const edit = mergeRange.getBaseRangeEdit(state);
269
- if (core_1.ArrayUtils.equals(edit.newLines, existingLines)) {
266
+ if (ArrayUtils.equals(edit.newLines, existingLines)) {
270
267
  return state;
271
268
  }
272
269
  }
@@ -284,7 +281,7 @@ let MergeEditorModel = class MergeEditorModel {
284
281
  return this.toDispose.disposed;
285
282
  }
286
283
  async reset() {
287
- await observable_1.ObservableUtils.waitForState(this.diffComputingStateForSidesObservable, state => state === 1 /* DiffComputingState.UpToDate */);
284
+ await ObservableUtils.waitForState(this.diffComputingStateForSidesObservable, state => state === 1 /* DiffComputingState.UpToDate */);
288
285
  this.shouldRecomputeHandledState = true;
289
286
  this.resultDocument.textEditorModel.setValue(this.computeAutoMergedResult());
290
287
  }
@@ -300,7 +297,7 @@ let MergeEditorModel = class MergeEditorModel {
300
297
  }
301
298
  let baseStartLineNumber = 0;
302
299
  for (const mergeRange of this.mergeRanges) {
303
- appendLinesToResult(baseLines, line_range_1.LineRange.fromLineNumbers(baseStartLineNumber, mergeRange.baseRange.startLineNumber));
300
+ appendLinesToResult(baseLines, LineRange.fromLineNumbers(baseStartLineNumber, mergeRange.baseRange.startLineNumber));
304
301
  if (mergeRange.side1Changes.length === 0) {
305
302
  appendLinesToResult(side2Lines, mergeRange.side2Range);
306
303
  }
@@ -315,11 +312,11 @@ let MergeEditorModel = class MergeEditorModel {
315
312
  }
316
313
  baseStartLineNumber = mergeRange.baseRange.endLineNumberExclusive;
317
314
  }
318
- appendLinesToResult(baseLines, line_range_1.LineRange.fromLineNumbers(baseStartLineNumber, baseLines.length));
315
+ appendLinesToResult(baseLines, LineRange.fromLineNumbers(baseStartLineNumber, baseLines.length));
319
316
  return resultLines.join(this.resultDocument.textEditorModel.getEOL());
320
317
  }
321
318
  computeMergeRanges() {
322
- return merge_range_1.MergeRange.computeMergeRanges(this.side1Changes, this.side2Changes, this.baseDocument, this.side1Document, this.side2Document);
319
+ return MergeRange.computeMergeRanges(this.side1Changes, this.side2Changes, this.baseDocument, this.side1Document, this.side2Document);
323
320
  }
324
321
  hasMergeRange(mergeRange) {
325
322
  return this.mergeRangesDataObservable.get().has(mergeRange);
@@ -352,7 +349,7 @@ let MergeEditorModel = class MergeEditorModel {
352
349
  }
353
350
  newLines = mergeRange.getBaseRangeEdit(state).newLines;
354
351
  }
355
- const resultEdit = new range_editing_1.LineRangeEdit(resultRange, newLines);
352
+ const resultEdit = new LineRangeEdit(resultRange, newLines);
356
353
  const editOperation = resultEdit.toRangeEdit(this.resultDocument.lineCount).toMonacoEdit();
357
354
  const cursorState = this.resultEditor.getControl().getSelections();
358
355
  this.resultDocument.textEditorModel.pushStackElement();
@@ -374,10 +371,10 @@ let MergeEditorModel = class MergeEditorModel {
374
371
  const undoRedoCallback = options?.undoRedo?.callback;
375
372
  const modelRef = new WeakRef(this);
376
373
  const dataRef = new WeakRef(mergeRangeData);
377
- standaloneServices_1.StandaloneServices.get(undoRedo_1.IUndoRedoService).pushElement({
374
+ StandaloneServices.get(IUndoRedoService).pushElement({
378
375
  type: 0 /* UndoRedoElementType.Resource */,
379
376
  resource: this.resultDocument.textEditorModel.uri,
380
- label: core_1.nls.localizeByDefault('Undo Mark As Handled'),
377
+ label: nls.localizeByDefault('Undo Mark As Handled'),
381
378
  code: 'markMergeRangeAsHandled',
382
379
  undo() {
383
380
  const model = modelRef.deref();
@@ -430,7 +427,7 @@ let MergeEditorModel = class MergeEditorModel {
430
427
  endExclusiveBase = endExclusiveResult.originalRange.endLineNumberExclusive;
431
428
  endExclusiveResult = endExclusiveResult.modifiedRange.endLineNumberExclusive;
432
429
  }
433
- return new range_mapping_1.LineRangeMapping(line_range_1.LineRange.fromLineNumbers(startBase, endExclusiveBase), line_range_1.LineRange.fromLineNumbers(startResult, endExclusiveResult));
430
+ return new LineRangeMapping(LineRange.fromLineNumbers(startBase, endExclusiveBase), LineRange.fromLineNumbers(startResult, endExclusiveResult));
434
431
  }
435
432
  translateBaseRangeToSide(range, side) {
436
433
  const rangeMap = side === 1 ? this.baseToSide1RangeMap : this.baseToSide2RangeMap;
@@ -447,19 +444,19 @@ let MergeEditorModel = class MergeEditorModel {
447
444
  return this.resultToBaseRangeMap.projectRange(range).modifiedRange;
448
445
  }
449
446
  computeSideToResultDiff(sideChanges, resultChanges) {
450
- return range_mapping_1.DocumentLineRangeMap.betweenModifiedSides(sideChanges, resultChanges).lineRangeMappings;
447
+ return DocumentLineRangeMap.betweenModifiedSides(sideChanges, resultChanges).lineRangeMappings;
451
448
  }
452
449
  newMergeRangeData() {
453
450
  return new MergeRangeData();
454
451
  }
455
452
  newLiveDiff(originalDocument, modifiedDocument) {
456
- return new live_diff_1.LiveDiff(originalDocument, modifiedDocument, this.diffComputer);
453
+ return new LiveDiff(originalDocument, modifiedDocument, this.diffComputer);
457
454
  }
458
455
  newDocumentLineRangeMap(lineRangeMappings) {
459
- return new range_mapping_1.DocumentLineRangeMap(lineRangeMappings);
456
+ return new DocumentLineRangeMap(lineRangeMappings);
460
457
  }
461
458
  newDocumentRangeMap(rangeMappings) {
462
- return new range_mapping_1.DocumentRangeMap(rangeMappings);
459
+ return new DocumentRangeMap(rangeMappings);
463
460
  }
464
461
  getDiffComputingState(...liveDiffs) {
465
462
  const liveDiffStates = liveDiffs.map(liveDiff => liveDiff.state);
@@ -472,39 +469,32 @@ let MergeEditorModel = class MergeEditorModel {
472
469
  return 1 /* DiffComputingState.UpToDate */;
473
470
  }
474
471
  };
475
- exports.MergeEditorModel = MergeEditorModel;
476
- tslib_1.__decorate([
477
- (0, inversify_1.inject)(exports.MergeEditorModelProps),
478
- tslib_1.__metadata("design:type", Object)
472
+ __decorate([
473
+ inject(MergeEditorModelProps)
479
474
  ], MergeEditorModel.prototype, "props", void 0);
480
- tslib_1.__decorate([
481
- (0, inversify_1.inject)(diff_1.DiffComputer),
482
- tslib_1.__metadata("design:type", Object)
475
+ __decorate([
476
+ inject(DiffComputer)
483
477
  ], MergeEditorModel.prototype, "diffComputer", void 0);
484
- tslib_1.__decorate([
485
- (0, inversify_1.inject)(monaco_to_protocol_converter_1.MonacoToProtocolConverter),
486
- tslib_1.__metadata("design:type", monaco_to_protocol_converter_1.MonacoToProtocolConverter)
478
+ __decorate([
479
+ inject(MonacoToProtocolConverter)
487
480
  ], MergeEditorModel.prototype, "m2p", void 0);
488
- tslib_1.__decorate([
489
- (0, inversify_1.postConstruct)(),
490
- tslib_1.__metadata("design:type", Function),
491
- tslib_1.__metadata("design:paramtypes", []),
492
- tslib_1.__metadata("design:returntype", void 0)
481
+ __decorate([
482
+ postConstruct()
493
483
  ], MergeEditorModel.prototype, "init", null);
494
- exports.MergeEditorModel = MergeEditorModel = tslib_1.__decorate([
495
- (0, inversify_1.injectable)()
484
+ MergeEditorModel = __decorate([
485
+ injectable()
496
486
  ], MergeEditorModel);
497
- class MergeRangeData {
487
+ export { MergeEditorModel };
488
+ export class MergeRangeData {
498
489
  constructor() {
499
- this.resultStateObservable = observable_1.SettableObservable.create('Base');
500
- this.isHandledObservable = observable_1.SettableObservable.create(false);
490
+ this.resultStateObservable = SettableObservable.create('Base');
491
+ this.isHandledObservable = SettableObservable.create(false);
501
492
  }
502
493
  }
503
- exports.MergeRangeData = MergeRangeData;
504
494
  class AttachedHistory {
505
495
  constructor(model) {
506
496
  this.model = model;
507
- this.toDispose = new core_1.DisposableCollection();
497
+ this.toDispose = new DisposableCollection();
508
498
  this.attachedHistory = [];
509
499
  let previousAltId = this.model.textEditorModel.getAlternativeVersionId();
510
500
  this.toDispose.push(model.textEditorModel.onDidChangeContent(event => {
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-model.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/merge-editor-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-editor-model.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/merge-editor-model.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { TextEditorDocument } from '@theia/editor/lib/browser/editor';
2
- import { DetailedLineRangeMapping } from './range-mapping';
3
- import { LineRange } from './line-range';
4
- import { LineRangeEdit, RangeEdit } from './range-editing';
2
+ import { DetailedLineRangeMapping } from './range-mapping.js';
3
+ import { LineRange } from './line-range.js';
4
+ import { LineRangeEdit, RangeEdit } from './range-editing.js';
5
5
  /**
6
6
  * Describes modifications in side 1 and side 2 for a specific range in base.
7
7
  */
@@ -1 +1 @@
1
- {"version":3,"file":"merge-range.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/merge-range.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-range.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/merge-range.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2025 1C-Soft LLC and others.
4
3
  //
@@ -19,19 +18,17 @@
19
18
  * Licensed under the MIT License. See License.txt in the project root for license information.
20
19
  *--------------------------------------------------------------------------------------------*/
21
20
  // copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.ts
22
- Object.defineProperty(exports, "__esModule", { value: true });
23
- exports.MergeRangeAcceptedState = exports.MergeRange = void 0;
24
- const core_1 = require("@theia/core");
25
- const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
26
- const range_mapping_1 = require("./range-mapping");
27
- const range_editing_1 = require("./range-editing");
28
- const range_utils_1 = require("./range-utils");
21
+ import { ArrayUtils } from '@theia/core';
22
+ import { uinteger, Position, Range } from '@theia/core/shared/vscode-languageserver-protocol';
23
+ import { DetailedLineRangeMapping, MappingAlignment } from './range-mapping.js';
24
+ import { LineRangeEdit, RangeEdit } from './range-editing.js';
25
+ import { PositionUtils, RangeUtils } from './range-utils.js';
29
26
  /**
30
27
  * Describes modifications in side 1 and side 2 for a specific range in base.
31
28
  */
32
- class MergeRange {
29
+ export class MergeRange {
33
30
  static computeMergeRanges(side1Diff, side2Diff, baseDocument, side1Document, side2Document) {
34
- const alignments = range_mapping_1.MappingAlignment.computeAlignments(side1Diff, side2Diff);
31
+ const alignments = MappingAlignment.computeAlignments(side1Diff, side2Diff);
35
32
  return alignments.map(alignment => new MergeRange(alignment.baseRange, baseDocument, alignment.side1Range, alignment.side1Mappings, side1Document, alignment.side2Range, alignment.side2Mappings, side2Document));
36
33
  }
37
34
  constructor(baseRange, baseDocument, side1Range, side1Changes, side1Document, side2Range, side2Changes, side2Document) {
@@ -43,9 +40,9 @@ class MergeRange {
43
40
  this.side2Range = side2Range;
44
41
  this.side2Changes = side2Changes;
45
42
  this.side2Document = side2Document;
46
- this.side1CombinedChange = range_mapping_1.DetailedLineRangeMapping.join(this.side1Changes);
47
- this.side2CombinedChange = range_mapping_1.DetailedLineRangeMapping.join(this.side2Changes);
48
- this.isEqualChange = core_1.ArrayUtils.equals(this.side1Changes, this.side2Changes, (a, b) => a.getLineEdit().equals(b.getLineEdit()));
43
+ this.side1CombinedChange = DetailedLineRangeMapping.join(this.side1Changes);
44
+ this.side2CombinedChange = DetailedLineRangeMapping.join(this.side2Changes);
45
+ this.isEqualChange = ArrayUtils.equals(this.side1Changes, this.side2Changes, (a, b) => a.getLineEdit().equals(b.getLineEdit()));
49
46
  if (side1Changes.length === 0 && side2Changes.length === 0) {
50
47
  throw new Error('At least one change is expected');
51
48
  }
@@ -75,13 +72,13 @@ class MergeRange {
75
72
  }
76
73
  getBaseRangeEdit(state) {
77
74
  if (state === 'Base') {
78
- return new range_editing_1.LineRangeEdit(this.baseRange, this.baseRange.getLines(this.baseDocument));
75
+ return new LineRangeEdit(this.baseRange, this.baseRange.getLines(this.baseDocument));
79
76
  }
80
77
  if (state === 'Side1') {
81
- return new range_editing_1.LineRangeEdit(this.baseRange, this.side1Range.getLines(this.side1Document));
78
+ return new LineRangeEdit(this.baseRange, this.side1Range.getLines(this.side1Document));
82
79
  }
83
80
  if (state === 'Side2') {
84
- return new range_editing_1.LineRangeEdit(this.baseRange, this.side2Range.getLines(this.side2Document));
81
+ return new LineRangeEdit(this.baseRange, this.side2Range.getLines(this.side2Document));
85
82
  }
86
83
  let edit;
87
84
  const firstSide = state.startsWith('Side1') ? 1 : 2;
@@ -101,7 +98,7 @@ class MergeRange {
101
98
  return this.smartCombinationEdit2.value;
102
99
  }
103
100
  const combinedChanges = this.side1Changes.flatMap(change => change.rangeMappings.map(rangeMapping => ({ rangeMapping, side: 1 }))).concat(this.side2Changes.flatMap(change => change.rangeMappings.map(rangeMapping => ({ rangeMapping, side: 2 })))).sort((a, b) => {
104
- let result = range_utils_1.RangeUtils.compareUsingStarts(a.rangeMapping.originalRange, b.rangeMapping.originalRange);
101
+ let result = RangeUtils.compareUsingStarts(a.rangeMapping.originalRange, b.rangeMapping.originalRange);
105
102
  if (result === 0) {
106
103
  const sideWeight = (side) => side === firstSide ? 1 : 2;
107
104
  result = sideWeight(a.side) - sideWeight(b.side);
@@ -110,7 +107,7 @@ class MergeRange {
110
107
  });
111
108
  const sortedEdits = combinedChanges.map(change => {
112
109
  const modifiedDocument = change.side === 1 ? this.side1Document : this.side2Document;
113
- return new range_editing_1.RangeEdit(change.rangeMapping.originalRange, modifiedDocument.getText(change.rangeMapping.modifiedRange));
110
+ return new RangeEdit(change.rangeMapping.originalRange, modifiedDocument.getText(change.rangeMapping.modifiedRange));
114
111
  });
115
112
  const edit = this.editsToLineRangeEdit(this.baseRange, sortedEdits, this.baseDocument);
116
113
  if (firstSide === 1) {
@@ -125,15 +122,15 @@ class MergeRange {
125
122
  let text = '';
126
123
  const startsLineBefore = range.startLineNumber > 0;
127
124
  let currentPosition = startsLineBefore
128
- ? vscode_languageserver_protocol_1.Position.create(range.startLineNumber - 1, document.getLineMaxColumn((range.startLineNumber - 1) + 1) // note that getLineMaxColumn expects a 1-based line number
125
+ ? Position.create(range.startLineNumber - 1, document.getLineMaxColumn((range.startLineNumber - 1) + 1) // note that getLineMaxColumn expects a 1-based line number
129
126
  )
130
- : vscode_languageserver_protocol_1.Position.create(range.startLineNumber, 0);
127
+ : Position.create(range.startLineNumber, 0);
131
128
  for (const edit of sortedEdits) {
132
129
  const diffStart = edit.range.start;
133
- if (!range_utils_1.PositionUtils.isBeforeOrEqual(currentPosition, diffStart)) {
130
+ if (!PositionUtils.isBeforeOrEqual(currentPosition, diffStart)) {
134
131
  return undefined;
135
132
  }
136
- let originalText = document.getText(vscode_languageserver_protocol_1.Range.create(currentPosition, diffStart));
133
+ let originalText = document.getText(Range.create(currentPosition, diffStart));
137
134
  if (diffStart.line >= document.lineCount) {
138
135
  // getText doesn't include this virtual line break, as the document ends the line before.
139
136
  // endsLineAfter will be false.
@@ -145,9 +142,9 @@ class MergeRange {
145
142
  }
146
143
  const endsLineAfter = range.endLineNumberExclusive < document.lineCount;
147
144
  const end = endsLineAfter ?
148
- vscode_languageserver_protocol_1.Position.create(range.endLineNumberExclusive, 0) :
149
- vscode_languageserver_protocol_1.Position.create(range.endLineNumberExclusive - 1, vscode_languageserver_protocol_1.uinteger.MAX_VALUE);
150
- text += document.getText(vscode_languageserver_protocol_1.Range.create(currentPosition, end));
145
+ Position.create(range.endLineNumberExclusive, 0) :
146
+ Position.create(range.endLineNumberExclusive - 1, uinteger.MAX_VALUE);
147
+ text += document.getText(Range.create(currentPosition, end));
151
148
  const lines = text.split(/\r\n|\r|\n/);
152
149
  if (startsLineBefore) {
153
150
  if (lines[0] !== '') {
@@ -161,7 +158,7 @@ class MergeRange {
161
158
  }
162
159
  lines.pop();
163
160
  }
164
- return new range_editing_1.LineRangeEdit(range, lines);
161
+ return new LineRangeEdit(range, lines);
165
162
  }
166
163
  dumbCombineChanges(firstSide) {
167
164
  if (firstSide === 1 && this.dumbCombinationEdit1) {
@@ -173,7 +170,7 @@ class MergeRange {
173
170
  const modifiedLines1 = this.side1Range.getLines(this.side1Document);
174
171
  const modifiedLines2 = this.side2Range.getLines(this.side2Document);
175
172
  const combinedLines = firstSide === 1 ? modifiedLines1.concat(modifiedLines2) : modifiedLines2.concat(modifiedLines1);
176
- const edit = new range_editing_1.LineRangeEdit(this.baseRange, combinedLines);
173
+ const edit = new LineRangeEdit(this.baseRange, combinedLines);
177
174
  if (firstSide === 1) {
178
175
  this.dumbCombinationEdit1 = edit;
179
176
  }
@@ -183,8 +180,7 @@ class MergeRange {
183
180
  return edit;
184
181
  }
185
182
  }
186
- exports.MergeRange = MergeRange;
187
- var MergeRangeAcceptedState;
183
+ export var MergeRangeAcceptedState;
188
184
  (function (MergeRangeAcceptedState) {
189
185
  function addSide(state, side, options) {
190
186
  if (state === 'Base') {
@@ -211,5 +207,5 @@ var MergeRangeAcceptedState;
211
207
  return side === 1 ? 'Side2' : 'Side1';
212
208
  }
213
209
  MergeRangeAcceptedState.removeSide = removeSide;
214
- })(MergeRangeAcceptedState || (exports.MergeRangeAcceptedState = MergeRangeAcceptedState = {}));
210
+ })(MergeRangeAcceptedState || (MergeRangeAcceptedState = {}));
215
211
  //# sourceMappingURL=merge-range.js.map