@theia/scm 1.77.0-next.1 → 1.77.0-next.108

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 (319) 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 -16
  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 -15
  14. package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
  15. package/lib/browser/dirty-diff/diff-computer.spec.js +26 -27
  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.d.ts +4 -0
  112. package/lib/browser/multi-diff-editor/multi-diff-editor-module.d.ts.map +1 -0
  113. package/lib/browser/multi-diff-editor/multi-diff-editor-module.js +31 -0
  114. package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -0
  115. package/lib/browser/multi-diff-editor/multi-diff-editor-uri.d.ts +15 -0
  116. package/lib/browser/multi-diff-editor/multi-diff-editor-uri.d.ts.map +1 -0
  117. package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +65 -0
  118. package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -0
  119. package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +18 -0
  120. package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -0
  121. package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +72 -0
  122. package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -0
  123. package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.d.ts +2 -0
  124. package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.d.ts.map +1 -0
  125. package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +832 -0
  126. package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -0
  127. package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +163 -0
  128. package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -0
  129. package/lib/browser/multi-diff-editor/multi-diff-editor.js +552 -0
  130. package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -0
  131. package/lib/browser/multi-diff-editor/multi-diff-editor.spec.d.ts +2 -0
  132. package/lib/browser/multi-diff-editor/multi-diff-editor.spec.d.ts.map +1 -0
  133. package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +165 -0
  134. package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -0
  135. package/lib/browser/scm-action-button-widget.d.ts +2 -2
  136. package/lib/browser/scm-action-button-widget.d.ts.map +1 -1
  137. package/lib/browser/scm-action-button-widget.js +30 -39
  138. package/lib/browser/scm-action-button-widget.js.map +1 -1
  139. package/lib/browser/scm-amend-component.d.ts +3 -3
  140. package/lib/browser/scm-amend-component.d.ts.map +1 -1
  141. package/lib/browser/scm-amend-component.js +24 -28
  142. package/lib/browser/scm-amend-component.js.map +1 -1
  143. package/lib/browser/scm-amend-widget.d.ts +2 -2
  144. package/lib/browser/scm-amend-widget.d.ts.map +1 -1
  145. package/lib/browser/scm-amend-widget.js +26 -36
  146. package/lib/browser/scm-amend-widget.js.map +1 -1
  147. package/lib/browser/scm-avatar-service.js +7 -10
  148. package/lib/browser/scm-avatar-service.js.map +1 -1
  149. package/lib/browser/scm-colors.js +2 -5
  150. package/lib/browser/scm-colors.js.map +1 -1
  151. package/lib/browser/scm-commit-widget.d.ts +2 -2
  152. package/lib/browser/scm-commit-widget.d.ts.map +1 -1
  153. package/lib/browser/scm-commit-widget.js +25 -31
  154. package/lib/browser/scm-commit-widget.js.map +1 -1
  155. package/lib/browser/scm-context-key-service.js +10 -17
  156. package/lib/browser/scm-context-key-service.js.map +1 -1
  157. package/lib/browser/scm-context-key-service.spec.js +33 -35
  158. package/lib/browser/scm-context-key-service.spec.js.map +1 -1
  159. package/lib/browser/scm-contribution.d.ts +8 -8
  160. package/lib/browser/scm-contribution.d.ts.map +1 -1
  161. package/lib/browser/scm-contribution.js +114 -131
  162. package/lib/browser/scm-contribution.js.map +1 -1
  163. package/lib/browser/scm-frontend-module.d.ts.map +1 -1
  164. package/lib/browser/scm-frontend-module.js +99 -101
  165. package/lib/browser/scm-frontend-module.js.map +1 -1
  166. package/lib/browser/scm-groups-tree-model.d.ts +3 -3
  167. package/lib/browser/scm-groups-tree-model.d.ts.map +1 -1
  168. package/lib/browser/scm-groups-tree-model.js +15 -22
  169. package/lib/browser/scm-groups-tree-model.js.map +1 -1
  170. package/lib/browser/scm-history-graph-contribution.d.ts +4 -4
  171. package/lib/browser/scm-history-graph-contribution.d.ts.map +1 -1
  172. package/lib/browser/scm-history-graph-contribution.js +52 -60
  173. package/lib/browser/scm-history-graph-contribution.js.map +1 -1
  174. package/lib/browser/scm-history-graph-contribution.spec.js +35 -37
  175. package/lib/browser/scm-history-graph-contribution.spec.js.map +1 -1
  176. package/lib/browser/scm-history-graph-helpers.d.ts +1 -1
  177. package/lib/browser/scm-history-graph-helpers.d.ts.map +1 -1
  178. package/lib/browser/scm-history-graph-helpers.js +14 -30
  179. package/lib/browser/scm-history-graph-helpers.js.map +1 -1
  180. package/lib/browser/scm-history-graph-helpers.spec.js +44 -46
  181. package/lib/browser/scm-history-graph-helpers.spec.js.map +1 -1
  182. package/lib/browser/scm-history-graph-lanes.js +1 -4
  183. package/lib/browser/scm-history-graph-lanes.js.map +1 -1
  184. package/lib/browser/scm-history-graph-lanes.spec.js +135 -137
  185. package/lib/browser/scm-history-graph-lanes.spec.js.map +1 -1
  186. package/lib/browser/scm-history-graph-model.d.ts +4 -4
  187. package/lib/browser/scm-history-graph-model.d.ts.map +1 -1
  188. package/lib/browser/scm-history-graph-model.js +34 -43
  189. package/lib/browser/scm-history-graph-model.js.map +1 -1
  190. package/lib/browser/scm-history-graph-model.spec.js +74 -76
  191. package/lib/browser/scm-history-graph-model.spec.js.map +1 -1
  192. package/lib/browser/scm-history-graph-tooltip.d.ts +2 -2
  193. package/lib/browser/scm-history-graph-tooltip.d.ts.map +1 -1
  194. package/lib/browser/scm-history-graph-tooltip.js +33 -42
  195. package/lib/browser/scm-history-graph-tooltip.js.map +1 -1
  196. package/lib/browser/scm-history-graph-tooltip.spec.js +63 -65
  197. package/lib/browser/scm-history-graph-tooltip.spec.js.map +1 -1
  198. package/lib/browser/scm-history-graph-widget.d.ts +7 -7
  199. package/lib/browser/scm-history-graph-widget.d.ts.map +1 -1
  200. package/lib/browser/scm-history-graph-widget.js +116 -134
  201. package/lib/browser/scm-history-graph-widget.js.map +1 -1
  202. package/lib/browser/scm-history-graph-widget.spec.js +40 -42
  203. package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
  204. package/lib/browser/scm-input.js +10 -14
  205. package/lib/browser/scm-input.js.map +1 -1
  206. package/lib/browser/scm-layout-migrations.js +15 -18
  207. package/lib/browser/scm-layout-migrations.js.map +1 -1
  208. package/lib/browser/scm-provider.d.ts +2 -0
  209. package/lib/browser/scm-provider.d.ts.map +1 -1
  210. package/lib/browser/scm-provider.js +1 -4
  211. package/lib/browser/scm-provider.js.map +1 -1
  212. package/lib/browser/scm-quick-open-service.d.ts +1 -1
  213. package/lib/browser/scm-quick-open-service.d.ts.map +1 -1
  214. package/lib/browser/scm-quick-open-service.js +20 -27
  215. package/lib/browser/scm-quick-open-service.js.map +1 -1
  216. package/lib/browser/scm-repositories-widget.d.ts +4 -4
  217. package/lib/browser/scm-repositories-widget.d.ts.map +1 -1
  218. package/lib/browser/scm-repositories-widget.js +55 -67
  219. package/lib/browser/scm-repositories-widget.js.map +1 -1
  220. package/lib/browser/scm-repositories-widget.spec.js +86 -88
  221. package/lib/browser/scm-repositories-widget.spec.js.map +1 -1
  222. package/lib/browser/scm-repository.d.ts +2 -2
  223. package/lib/browser/scm-repository.d.ts.map +1 -1
  224. package/lib/browser/scm-repository.js +6 -10
  225. package/lib/browser/scm-repository.js.map +1 -1
  226. package/lib/browser/scm-service.d.ts +3 -3
  227. package/lib/browser/scm-service.d.ts.map +1 -1
  228. package/lib/browser/scm-service.js +18 -22
  229. package/lib/browser/scm-service.js.map +1 -1
  230. package/lib/browser/scm-service.spec.js +15 -17
  231. package/lib/browser/scm-service.spec.js.map +1 -1
  232. package/lib/browser/scm-tree-label-provider.d.ts +1 -1
  233. package/lib/browser/scm-tree-label-provider.d.ts.map +1 -1
  234. package/lib/browser/scm-tree-label-provider.js +16 -20
  235. package/lib/browser/scm-tree-label-provider.js.map +1 -1
  236. package/lib/browser/scm-tree-model.d.ts +2 -2
  237. package/lib/browser/scm-tree-model.d.ts.map +1 -1
  238. package/lib/browser/scm-tree-model.js +27 -32
  239. package/lib/browser/scm-tree-model.js.map +1 -1
  240. package/lib/browser/scm-tree-widget.d.ts +4 -4
  241. package/lib/browser/scm-tree-widget.d.ts.map +1 -1
  242. package/lib/browser/scm-tree-widget.js +98 -122
  243. package/lib/browser/scm-tree-widget.js.map +1 -1
  244. package/lib/browser/scm-widget.d.ts +6 -6
  245. package/lib/browser/scm-widget.d.ts.map +1 -1
  246. package/lib/browser/scm-widget.js +49 -64
  247. package/lib/browser/scm-widget.js.map +1 -1
  248. package/lib/common/scm-preferences.js +21 -26
  249. package/lib/common/scm-preferences.js.map +1 -1
  250. package/lib/node/scm-backend-module.js +4 -6
  251. package/lib/node/scm-backend-module.js.map +1 -1
  252. package/package.json +15 -6
  253. package/src/browser/decorations/scm-decorations-service.ts +5 -5
  254. package/src/browser/dirty-diff/content-lines.spec.ts +3 -2
  255. package/src/browser/dirty-diff/diff-computer.spec.ts +4 -3
  256. package/src/browser/dirty-diff/diff-computer.ts +1 -1
  257. package/src/browser/dirty-diff/dirty-diff-decorator.ts +1 -1
  258. package/src/browser/dirty-diff/dirty-diff-module.ts +3 -3
  259. package/src/browser/dirty-diff/dirty-diff-navigator.ts +4 -4
  260. package/src/browser/dirty-diff/dirty-diff-widget.ts +2 -2
  261. package/src/browser/merge-editor/merge-editor-contribution.ts +2 -2
  262. package/src/browser/merge-editor/merge-editor-dev-contribution.ts +1 -1
  263. package/src/browser/merge-editor/merge-editor-module.ts +7 -7
  264. package/src/browser/merge-editor/merge-editor.ts +5 -5
  265. package/src/browser/merge-editor/model/live-diff.ts +2 -2
  266. package/src/browser/merge-editor/model/merge-editor-model.ts +8 -8
  267. package/src/browser/merge-editor/model/merge-range.ts +4 -4
  268. package/src/browser/merge-editor/model/range-editing.ts +1 -1
  269. package/src/browser/merge-editor/model/range-mapping.spec.ts +1 -1
  270. package/src/browser/merge-editor/model/range-mapping.ts +3 -3
  271. package/src/browser/merge-editor/view/diff-spacers.ts +1 -1
  272. package/src/browser/merge-editor/view/merge-editor-panes/index.ts +5 -5
  273. package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts +3 -3
  274. package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts +7 -7
  275. package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts +4 -4
  276. package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts +4 -4
  277. package/src/browser/merge-editor/view/merge-editor-scroll-sync.ts +2 -2
  278. package/src/browser/merge-editor/view/merge-editor-view-zones.ts +5 -5
  279. package/src/browser/merge-editor/view/merge-range-actions.ts +2 -2
  280. package/src/browser/multi-diff-editor/multi-diff-editor-module.ts +35 -0
  281. package/src/browser/multi-diff-editor/multi-diff-editor-uri.ts +83 -0
  282. package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +81 -0
  283. package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +878 -0
  284. package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +189 -0
  285. package/src/browser/multi-diff-editor/multi-diff-editor.ts +628 -0
  286. package/src/browser/scm-action-button-widget.tsx +3 -3
  287. package/src/browser/scm-amend-component.tsx +3 -3
  288. package/src/browser/scm-amend-widget.tsx +3 -3
  289. package/src/browser/scm-commit-widget.tsx +2 -2
  290. package/src/browser/scm-context-key-service.spec.ts +3 -3
  291. package/src/browser/scm-contribution.ts +8 -8
  292. package/src/browser/scm-frontend-module.ts +25 -22
  293. package/src/browser/scm-groups-tree-model.ts +3 -3
  294. package/src/browser/scm-history-graph-contribution.spec.ts +3 -3
  295. package/src/browser/scm-history-graph-contribution.ts +6 -6
  296. package/src/browser/scm-history-graph-helpers.spec.ts +2 -2
  297. package/src/browser/scm-history-graph-helpers.ts +1 -1
  298. package/src/browser/scm-history-graph-lanes.spec.ts +1 -1
  299. package/src/browser/scm-history-graph-model.spec.ts +3 -3
  300. package/src/browser/scm-history-graph-model.ts +5 -5
  301. package/src/browser/scm-history-graph-tooltip.spec.ts +3 -3
  302. package/src/browser/scm-history-graph-tooltip.ts +3 -3
  303. package/src/browser/scm-history-graph-widget.spec.ts +4 -4
  304. package/src/browser/scm-history-graph-widget.tsx +8 -8
  305. package/src/browser/scm-input.ts +1 -1
  306. package/src/browser/scm-layout-migrations.ts +1 -1
  307. package/src/browser/scm-provider.ts +2 -0
  308. package/src/browser/scm-quick-open-service.ts +1 -1
  309. package/src/browser/scm-repositories-widget.spec.ts +2 -2
  310. package/src/browser/scm-repositories-widget.tsx +4 -4
  311. package/src/browser/scm-repository.ts +2 -2
  312. package/src/browser/scm-service.spec.ts +2 -2
  313. package/src/browser/scm-service.ts +3 -3
  314. package/src/browser/scm-tree-label-provider.ts +1 -1
  315. package/src/browser/scm-tree-model.ts +2 -2
  316. package/src/browser/scm-tree-widget.tsx +4 -4
  317. package/src/browser/scm-widget.tsx +6 -6
  318. package/src/browser/style/multi-diff-editor.css +113 -0
  319. package/src/node/scm-backend-module.ts +1 -1
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2025 1C-Soft LLC and others.
4
3
  //
@@ -14,17 +13,15 @@
14
13
  //
15
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
15
  // *****************************************************************************
17
- Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.MergeEditorResultPane = void 0;
19
- const tslib_1 = require("tslib");
20
- const inversify_1 = require("@theia/core/shared/inversify");
21
- const core_1 = require("@theia/core");
22
- const browser_1 = require("@theia/core/lib/browser");
23
- const observable_1 = require("@theia/core/lib/common/observable");
24
- const navigation_location_1 = require("@theia/editor/lib/browser/navigation/navigation-location");
25
- const navigation_location_service_1 = require("@theia/editor/lib/browser/navigation/navigation-location-service");
26
- const merge_editor_pane_1 = require("./merge-editor-pane");
27
- let MergeEditorResultPane = class MergeEditorResultPane extends merge_editor_pane_1.MergeEditorPane {
16
+ import { __decorate } from "tslib";
17
+ import { inject, injectable, named } from '@theia/core/shared/inversify';
18
+ import { nls, ILogger } from '@theia/core';
19
+ import { ACTION_ITEM, codicon, ConfirmDialog, Dialog, DISABLED_CLASS } from '@theia/core/lib/browser';
20
+ import { Autorun, ObservableUtils } from '@theia/core/lib/common/observable';
21
+ import { NavigationLocation } from '@theia/editor/lib/browser/navigation/navigation-location';
22
+ import { NavigationLocationService } from '@theia/editor/lib/browser/navigation/navigation-location-service';
23
+ import { MergeEditorPane } from './merge-editor-pane.js';
24
+ let MergeEditorResultPane = class MergeEditorResultPane extends MergeEditorPane {
28
25
  constructor() {
29
26
  super();
30
27
  this.addClass('result');
@@ -35,10 +32,10 @@ let MergeEditorResultPane = class MergeEditorResultPane extends merge_editor_pan
35
32
  }
36
33
  initSelectionSynchronizer() {
37
34
  super.initSelectionSynchronizer();
38
- this.toDispose.push(observable_1.Autorun.create(() => {
35
+ this.toDispose.push(Autorun.create(() => {
39
36
  const selection = this.selectionObservable.get();
40
37
  if (selection?.length === 1) {
41
- this.navigationLocationService.navigate(service => service.register(navigation_location_1.NavigationLocation.create(this.editor, selection[0])));
38
+ this.navigationLocationService.navigate(service => service.register(NavigationLocation.create(this.editor, selection[0])));
42
39
  }
43
40
  }));
44
41
  }
@@ -53,17 +50,17 @@ let MergeEditorResultPane = class MergeEditorResultPane extends merge_editor_pan
53
50
  this.mergeEditor.activate();
54
51
  }
55
52
  reset() {
56
- new browser_1.ConfirmDialog({
57
- title: core_1.nls.localize('theia/scm/mergeEditor/resetConfirmationTitle', 'Do you really want to reset the merge result in this editor?'),
58
- msg: core_1.nls.localizeByDefault('This action cannot be undone.'),
59
- ok: browser_1.Dialog.YES,
60
- cancel: browser_1.Dialog.NO,
53
+ new ConfirmDialog({
54
+ title: nls.localize('theia/scm/mergeEditor/resetConfirmationTitle', 'Do you really want to reset the merge result in this editor?'),
55
+ msg: nls.localizeByDefault('This action cannot be undone.'),
56
+ ok: Dialog.YES,
57
+ cancel: Dialog.NO,
61
58
  }).open().then(async (confirmed) => {
62
59
  if (confirmed) {
63
60
  this.activate();
64
61
  const { model } = this.mergeEditor;
65
62
  await model.reset();
66
- await observable_1.ObservableUtils.waitForState(model.isUpToDateObservable);
63
+ await ObservableUtils.waitForState(model.isUpToDateObservable);
67
64
  this.mergeEditor.goToFirstMergeRange(mergeRange => !model.isMergeRangeHandled(mergeRange));
68
65
  }
69
66
  }).catch(e => this.logger.error(e));
@@ -75,20 +72,20 @@ let MergeEditorResultPane = class MergeEditorResultPane extends merge_editor_pan
75
72
  {
76
73
  id: 'nextConflict',
77
74
  label: unhandledMergeRangesCount === 1 ?
78
- core_1.nls.localizeByDefault('{0} Conflict Remaining', unhandledMergeRangesCount) :
79
- core_1.nls.localizeByDefault('{0} Conflicts Remaining ', unhandledMergeRangesCount),
75
+ nls.localizeByDefault('{0} Conflict Remaining', unhandledMergeRangesCount) :
76
+ nls.localizeByDefault('{0} Conflicts Remaining ', unhandledMergeRangesCount),
80
77
  tooltip: unhandledMergeRangesCount ?
81
- core_1.nls.localizeByDefault('Go to next conflict') :
82
- core_1.nls.localizeByDefault('All conflicts handled, the merge can be completed now.'),
83
- className: browser_1.ACTION_ITEM + (unhandledMergeRangesCount ? '' : ' ' + browser_1.DISABLED_CLASS),
78
+ nls.localizeByDefault('Go to next conflict') :
79
+ nls.localizeByDefault('All conflicts handled, the merge can be completed now.'),
80
+ className: ACTION_ITEM + (unhandledMergeRangesCount ? '' : ' ' + DISABLED_CLASS),
84
81
  onClick: unhandledMergeRangesCount ?
85
82
  () => this.goToNextUnhandledMergeRange() :
86
83
  undefined
87
84
  },
88
85
  {
89
86
  id: 'reset',
90
- tooltip: core_1.nls.localizeByDefault('Reset'),
91
- className: (0, browser_1.codicon)('discard', true),
87
+ tooltip: nls.localizeByDefault('Reset'),
88
+ className: codicon('discard', true),
92
89
  onClick: () => this.reset()
93
90
  }
94
91
  ];
@@ -110,18 +107,15 @@ let MergeEditorResultPane = class MergeEditorResultPane extends merge_editor_pan
110
107
  return result;
111
108
  }
112
109
  };
113
- exports.MergeEditorResultPane = MergeEditorResultPane;
114
- tslib_1.__decorate([
115
- (0, inversify_1.inject)(core_1.ILogger),
116
- (0, inversify_1.named)('scm:MergeEditorResultPane'),
117
- tslib_1.__metadata("design:type", Object)
110
+ __decorate([
111
+ inject(ILogger),
112
+ named('scm:MergeEditorResultPane')
118
113
  ], MergeEditorResultPane.prototype, "logger", void 0);
119
- tslib_1.__decorate([
120
- (0, inversify_1.inject)(navigation_location_service_1.NavigationLocationService),
121
- tslib_1.__metadata("design:type", navigation_location_service_1.NavigationLocationService)
114
+ __decorate([
115
+ inject(NavigationLocationService)
122
116
  ], MergeEditorResultPane.prototype, "navigationLocationService", void 0);
123
- exports.MergeEditorResultPane = MergeEditorResultPane = tslib_1.__decorate([
124
- (0, inversify_1.injectable)(),
125
- tslib_1.__metadata("design:paramtypes", [])
117
+ MergeEditorResultPane = __decorate([
118
+ injectable()
126
119
  ], MergeEditorResultPane);
120
+ export { MergeEditorResultPane };
127
121
  //# sourceMappingURL=merge-editor-result-pane.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-result-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-editor-result-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,10 @@
1
1
  import { ILogger } from '@theia/core';
2
2
  import { LabelProvider, OpenerService } from '@theia/core/lib/browser';
3
3
  import { EditorDecoration, Range } from '@theia/editor/lib/browser';
4
- import { MergeRange, MergeSide } from '../../model/merge-range';
5
- import { MergeEditorPane } from './merge-editor-pane';
6
- import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
7
- import { LineRange } from '../../model/line-range';
4
+ import { MergeRange, MergeSide } from '../../model/merge-range.js';
5
+ import { MergeEditorPane } from './merge-editor-pane.js';
6
+ import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
7
+ import { LineRange } from '../../model/line-range.js';
8
8
  export declare abstract class MergeEditorSidePane extends MergeEditorPane {
9
9
  protected readonly labelProvider: LabelProvider;
10
10
  protected readonly openerService: OpenerService;
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-side-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAO,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAqB,aAAa,EAAQ,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAuB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACzF,OAAO,EAAE,UAAU,EAA2B,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,8BACsB,mBAAoB,SAAQ,eAAe;IAG7D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,QAAQ,KAAK,SAAS,IAAI,SAAS,CAAC;;IAO3B,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;cAIlD,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAIpD,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC,eAAe,IAAI,IAAI;cAYJ,eAAe,IAAI,0BAA0B,EAAE;cAiB/C,wBAAwB,IAAI,gBAAgB,EAAE;CAmBpE;AAED,qBACa,oBAAqB,SAAQ,mBAAmB;IAEzD,QAAQ,CAAC,SAAS,KAAK;;CAM1B;AAED,qBACa,oBAAqB,SAAQ,mBAAmB;IAEzD,QAAQ,CAAC,SAAS,KAAK;;CAM1B"}
1
+ {"version":3,"file":"merge-editor-side-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAO,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAqB,aAAa,EAAQ,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAuB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACzF,OAAO,EAAE,UAAU,EAA2B,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,8BACsB,mBAAoB,SAAQ,eAAe;IAG7D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,QAAQ,KAAK,SAAS,IAAI,SAAS,CAAC;;IAO3B,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;cAIlD,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAIpD,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC,eAAe,IAAI,IAAI;cAYJ,eAAe,IAAI,0BAA0B,EAAE;cAiB/C,wBAAwB,IAAI,gBAAgB,EAAE;CAmBpE;AAED,qBACa,oBAAqB,SAAQ,mBAAmB;IAEzD,QAAQ,CAAC,SAAS,KAAK;;CAM1B;AAED,qBACa,oBAAqB,SAAQ,mBAAmB;IAEzD,QAAQ,CAAC,SAAS,KAAK;;CAM1B"}
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2025 1C-Soft LLC and others.
4
3
  //
@@ -14,16 +13,14 @@
14
13
  //
15
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
15
  // *****************************************************************************
17
- Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.MergeEditorSide2Pane = exports.MergeEditorSide1Pane = exports.MergeEditorSidePane = void 0;
19
- const tslib_1 = require("tslib");
20
- const inversify_1 = require("@theia/core/shared/inversify");
21
- const core_1 = require("@theia/core");
22
- const observable_1 = require("@theia/core/lib/common/observable");
23
- const browser_1 = require("@theia/core/lib/browser");
24
- const merge_range_1 = require("../../model/merge-range");
25
- const merge_editor_pane_1 = require("./merge-editor-pane");
26
- let MergeEditorSidePane = class MergeEditorSidePane extends merge_editor_pane_1.MergeEditorPane {
16
+ import { __decorate } from "tslib";
17
+ import { inject, injectable, named } from '@theia/core/shared/inversify';
18
+ import { nls, ILogger } from '@theia/core';
19
+ import { ObservableUtils } from '@theia/core/lib/common/observable';
20
+ import { codicon, DiffUris, LabelProvider, open, OpenerService } from '@theia/core/lib/browser';
21
+ import { MergeRangeAcceptedState } from '../../model/merge-range.js';
22
+ import { MergeEditorPane } from './merge-editor-pane.js';
23
+ let MergeEditorSidePane = class MergeEditorSidePane extends MergeEditorPane {
27
24
  constructor() {
28
25
  super();
29
26
  this.addClass('side');
@@ -39,13 +36,13 @@ let MergeEditorSidePane = class MergeEditorSidePane extends merge_editor_pane_1.
39
36
  resultPane.activate();
40
37
  const selections = resultPane.editor.getControl().getSelections();
41
38
  for (const mergeRange of model.mergeRanges) {
42
- await observable_1.ObservableUtils.waitForState(model.isUpToDateObservable);
39
+ await ObservableUtils.waitForState(model.isUpToDateObservable);
43
40
  resultPane.goToMergeRange(mergeRange, { reveal: false });
44
41
  let state = model.getMergeRangeResultState(mergeRange);
45
42
  if (state === 'Unrecognized') {
46
43
  state = 'Base';
47
44
  }
48
- model.applyMergeRangeAcceptedState(mergeRange, merge_range_1.MergeRangeAcceptedState.addSide(state, this.mergeSide));
45
+ model.applyMergeRangeAcceptedState(mergeRange, MergeRangeAcceptedState.addSide(state, this.mergeSide));
49
46
  }
50
47
  if (selections) {
51
48
  resultPane.editor.getControl().setSelections(selections);
@@ -56,9 +53,9 @@ let MergeEditorSidePane = class MergeEditorSidePane extends merge_editor_pane_1.
56
53
  if (label) {
57
54
  label += ': ';
58
55
  }
59
- label += `${core_1.nls.localizeByDefault('Base')} ⟷ ${this.header.title.label}`;
56
+ label += `${nls.localizeByDefault('Base')} ⟷ ${this.header.title.label}`;
60
57
  const options = { selection: { start: this.editor.cursor } };
61
- (0, browser_1.open)(this.openerService, browser_1.DiffUris.encode(this.mergeEditor.baseUri, this.editor.uri, label), options).catch(e => {
58
+ open(this.openerService, DiffUris.encode(this.mergeEditor.baseUri, this.editor.uri, label), options).catch(e => {
62
59
  this.logger.error(e);
63
60
  });
64
61
  }
@@ -66,14 +63,14 @@ let MergeEditorSidePane = class MergeEditorSidePane extends merge_editor_pane_1.
66
63
  return [
67
64
  {
68
65
  id: 'acceptAllChanges',
69
- tooltip: core_1.nls.localizeByDefault(this.mergeSide === 1 ? 'Accept All Changes from Left' : 'Accept All Changes from Right'),
70
- className: (0, browser_1.codicon)('check-all', true),
66
+ tooltip: nls.localizeByDefault(this.mergeSide === 1 ? 'Accept All Changes from Left' : 'Accept All Changes from Right'),
67
+ className: codicon('check-all', true),
71
68
  onClick: () => this.acceptAllChanges()
72
69
  },
73
70
  {
74
71
  id: 'compareWithBase',
75
- tooltip: core_1.nls.localizeByDefault('Compare With Base'),
76
- className: (0, browser_1.codicon)('compare-changes', true),
72
+ tooltip: nls.localizeByDefault('Compare With Base'),
73
+ className: codicon('compare-changes', true),
77
74
  onClick: () => this.compareWithBase()
78
75
  }
79
76
  ];
@@ -95,24 +92,20 @@ let MergeEditorSidePane = class MergeEditorSidePane extends merge_editor_pane_1.
95
92
  return result;
96
93
  }
97
94
  };
98
- exports.MergeEditorSidePane = MergeEditorSidePane;
99
- tslib_1.__decorate([
100
- (0, inversify_1.inject)(browser_1.LabelProvider),
101
- tslib_1.__metadata("design:type", browser_1.LabelProvider)
95
+ __decorate([
96
+ inject(LabelProvider)
102
97
  ], MergeEditorSidePane.prototype, "labelProvider", void 0);
103
- tslib_1.__decorate([
104
- (0, inversify_1.inject)(browser_1.OpenerService),
105
- tslib_1.__metadata("design:type", Object)
98
+ __decorate([
99
+ inject(OpenerService)
106
100
  ], MergeEditorSidePane.prototype, "openerService", void 0);
107
- tslib_1.__decorate([
108
- (0, inversify_1.inject)(core_1.ILogger),
109
- (0, inversify_1.named)('scm:MergeEditorSidePane'),
110
- tslib_1.__metadata("design:type", Object)
101
+ __decorate([
102
+ inject(ILogger),
103
+ named('scm:MergeEditorSidePane')
111
104
  ], MergeEditorSidePane.prototype, "logger", void 0);
112
- exports.MergeEditorSidePane = MergeEditorSidePane = tslib_1.__decorate([
113
- (0, inversify_1.injectable)(),
114
- tslib_1.__metadata("design:paramtypes", [])
105
+ MergeEditorSidePane = __decorate([
106
+ injectable()
115
107
  ], MergeEditorSidePane);
108
+ export { MergeEditorSidePane };
116
109
  let MergeEditorSide1Pane = class MergeEditorSide1Pane extends MergeEditorSidePane {
117
110
  constructor() {
118
111
  super();
@@ -120,11 +113,10 @@ let MergeEditorSide1Pane = class MergeEditorSide1Pane extends MergeEditorSidePan
120
113
  this.addClass('side1');
121
114
  }
122
115
  };
123
- exports.MergeEditorSide1Pane = MergeEditorSide1Pane;
124
- exports.MergeEditorSide1Pane = MergeEditorSide1Pane = tslib_1.__decorate([
125
- (0, inversify_1.injectable)(),
126
- tslib_1.__metadata("design:paramtypes", [])
116
+ MergeEditorSide1Pane = __decorate([
117
+ injectable()
127
118
  ], MergeEditorSide1Pane);
119
+ export { MergeEditorSide1Pane };
128
120
  let MergeEditorSide2Pane = class MergeEditorSide2Pane extends MergeEditorSidePane {
129
121
  constructor() {
130
122
  super();
@@ -132,9 +124,8 @@ let MergeEditorSide2Pane = class MergeEditorSide2Pane extends MergeEditorSidePan
132
124
  this.addClass('side2');
133
125
  }
134
126
  };
135
- exports.MergeEditorSide2Pane = MergeEditorSide2Pane;
136
- exports.MergeEditorSide2Pane = MergeEditorSide2Pane = tslib_1.__decorate([
137
- (0, inversify_1.injectable)(),
138
- tslib_1.__metadata("design:paramtypes", [])
127
+ MergeEditorSide2Pane = __decorate([
128
+ injectable()
139
129
  ], MergeEditorSide2Pane);
130
+ export { MergeEditorSide2Pane };
140
131
  //# sourceMappingURL=merge-editor-side-pane.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-side-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-editor-side-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAEhG,OAAO,EAAc,uBAAuB,EAAa,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAKlD,IAAe,mBAAmB,GAAlC,MAAe,mBAAoB,SAAQ,eAAe;IAa7D;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAEQ,yBAAyB,CAAC,UAAsB;QACrD,OAAO,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;IAEkB,kBAAkB,CAAC,KAAY;QAC9C,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,wBAAwB,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC/C,UAAU,CAAC,QAAQ,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;QAClE,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAC/D,UAAU,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YACzD,IAAI,KAAK,GAAG,KAAK,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;YACvD,IAAI,KAAK,KAAK,cAAc,EAAE,CAAC;gBAC3B,KAAK,GAAG,MAAM,CAAC;YACnB,CAAC;YACD,KAAK,CAAC,4BAA4B,CAAC,UAAU,EAAE,uBAAuB,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3G,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACb,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC7D,CAAC;IACL,CAAC;IAED,eAAe;QACX,IAAI,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,KAAK,EAAE,CAAC;YACR,KAAK,IAAI,IAAI,CAAC;QAClB,CAAC;QACD,KAAK,IAAI,GAAG,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzE,MAAM,OAAO,GAAwB,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QAClF,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YAC3G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,eAAe;QAC9B,OAAO;YACH;gBACI,EAAE,EAAE,kBAAkB;gBACtB,OAAO,EAAE,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,+BAA+B,CAAC;gBACvH,SAAS,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC;gBACrC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE;aACzC;YACD;gBACI,EAAE,EAAE,iBAAiB;gBACrB,OAAO,EAAE,GAAG,CAAC,iBAAiB,CAAC,mBAAmB,CAAC;gBACnD,SAAS,EAAE,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;gBAC3C,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE;aACxC;SACJ,CAAC;IACN,CAAC;IAEkB,wBAAwB;QACvC,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;QAElF,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE;gBAC/C,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC;gBAChD,SAAS,EAAE,UAAU,KAAK,iBAAiB;gBAC3C,UAAU,EAAE,SAAS,CAAC,eAAe,GAAG,QAAQ,CAAC,SAAS;aAC7D,CAAC,CAAC,CAAC;QACR,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC;QAC/E,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC5E,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AAzFsB;IADlB,MAAM,CAAC,aAAa,CAAC;0DAC0B;AAG7B;IADlB,MAAM,CAAC,aAAa,CAAC;0DAC0B;AAG7B;IADlB,MAAM,CAAC,OAAO,CAAC;IAAE,KAAK,CAAC,yBAAyB,CAAC;mDACf;AATjB,mBAAmB;IADxC,UAAU,EAAE;GACS,mBAAmB,CA4FxC;;AAGM,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mBAAmB;IAIzD;QACI,KAAK,EAAE,CAAC;QAHH,cAAS,GAAG,CAAC,CAAC;QAInB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CACJ,CAAA;AARY,oBAAoB;IADhC,UAAU,EAAE;GACA,oBAAoB,CAQhC;;AAGM,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mBAAmB;IAIzD;QACI,KAAK,EAAE,CAAC;QAHH,cAAS,GAAG,CAAC,CAAC;QAInB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CACJ,CAAA;AARY,oBAAoB;IADhC,UAAU,EAAE;GACA,oBAAoB,CAQhC"}
@@ -1,7 +1,7 @@
1
1
  import { Disposable, DisposableCollection } from '@theia/core';
2
2
  import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
3
- import { MergeEditor } from '../merge-editor';
4
- import { DocumentLineRangeMap } from '../model/range-mapping';
3
+ import { MergeEditor } from '../merge-editor.js';
4
+ import { DocumentLineRangeMap } from '../model/range-mapping.js';
5
5
  export declare class MergeEditorScrollSync implements Disposable {
6
6
  protected readonly mergeEditor: MergeEditor;
7
7
  protected readonly toDispose: DisposableCollection;
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-scroll-sync.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-scroll-sync.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,qBAAa,qBAAsB,YAAW,UAAU;IAKxC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAHvD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,SAAS,CAAC,SAAS,UAAS;gBAEG,WAAW,EAAE,WAAW;IA4DvD,OAAO,IAAI,IAAI;IAIf,gBAAgB,IAAI,OAAO;IAI3B,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAWxC,MAAM,IAAI,IAAI;IAad,SAAS,CAAC,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAoB9D,SAAS,CAAC,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAoB9D,SAAS,CAAC,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAyB/D,SAAS,CAAC,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAyB7D,SAAS,CAAC,sBAAsB,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,oBAAoB,GAAG,MAAM;CAgEvI"}
1
+ {"version":3,"file":"merge-editor-scroll-sync.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-scroll-sync.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,qBAAa,qBAAsB,YAAW,UAAU;IAKxC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAHvD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,SAAS,CAAC,SAAS,UAAS;gBAEG,WAAW,EAAE,WAAW;IA4DvD,OAAO,IAAI,IAAI;IAIf,gBAAgB,IAAI,OAAO;IAI3B,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAWxC,MAAM,IAAI,IAAI;IAad,SAAS,CAAC,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAoB9D,SAAS,CAAC,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAoB9D,SAAS,CAAC,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAyB/D,SAAS,CAAC,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAyB7D,SAAS,CAAC,sBAAsB,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,oBAAoB,GAAG,MAAM;CAgEvI"}
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2025 1C-Soft LLC and others.
4
3
  //
@@ -19,13 +18,11 @@
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/view/scrollSynchronizer.ts
22
- Object.defineProperty(exports, "__esModule", { value: true });
23
- exports.MergeEditorScrollSync = void 0;
24
- const core_1 = require("@theia/core");
25
- class MergeEditorScrollSync {
21
+ import { DisposableCollection } from '@theia/core';
22
+ export class MergeEditorScrollSync {
26
23
  constructor(mergeEditor) {
27
24
  this.mergeEditor = mergeEditor;
28
- this.toDispose = new core_1.DisposableCollection();
25
+ this.toDispose = new DisposableCollection();
29
26
  this.isSyncing = false;
30
27
  const { side1Pane, side2Pane, resultPane, basePane } = mergeEditor;
31
28
  const syncingHandler = (handler) => (event) => {
@@ -237,7 +234,6 @@ class MergeEditorScrollSync {
237
234
  return targetScrollTop;
238
235
  }
239
236
  }
240
- exports.MergeEditorScrollSync = MergeEditorScrollSync;
241
237
  class ScrollState {
242
238
  static get(editor) {
243
239
  const visibleRanges = editor.getVisibleRanges();
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-scroll-sync.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-scroll-sync.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-editor-scroll-sync.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-scroll-sync.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
1
  import { Disposable } from '@theia/core';
2
2
  import { Observable } from '@theia/core/lib/common/observable';
3
3
  import { MonacoEditorViewZone } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
4
- import { MergeEditor } from '../merge-editor';
5
- import { MergeRange } from '../model/merge-range';
6
- import { MergeRangeAction, MergeRangeActions } from './merge-range-actions';
7
- import { MergeEditorPane } from './merge-editor-panes';
8
- import { DiffSpacerService } from './diff-spacers';
4
+ import { MergeEditor } from '../merge-editor.js';
5
+ import { MergeRange } from '../model/merge-range.js';
6
+ import { MergeRangeAction, MergeRangeActions } from './merge-range-actions.js';
7
+ import { MergeEditorPane } from './merge-editor-panes/index.js';
8
+ import { DiffSpacerService } from './diff-spacers.js';
9
9
  export interface MergeEditorViewZone {
10
10
  create(ctx: MergeEditorViewZone.CreationContext): void;
11
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-view-zones.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-view-zones.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-editor-view-zones.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-view-zones.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
  //
@@ -14,15 +13,13 @@
14
13
  //
15
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
15
  // *****************************************************************************
17
- Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.MergeEditorSpacerZone = exports.MergeEditorActionZonePlaceholder = exports.MergeEditorActionZone = exports.MergeEditorViewZoneComputer = void 0;
19
- const tslib_1 = require("tslib");
20
- const inversify_1 = require("@theia/core/shared/inversify");
21
- const core_1 = require("@theia/core");
22
- const observable_1 = require("@theia/core/lib/common/observable");
23
- const monaco = require("@theia/monaco-editor-core");
24
- const merge_range_actions_1 = require("./merge-range-actions");
25
- const diff_spacers_1 = require("./diff-spacers");
16
+ import { __decorate } from "tslib";
17
+ import { inject, injectable } from '@theia/core/shared/inversify';
18
+ import { Disposable } from '@theia/core';
19
+ import { Autorun } from '@theia/core/lib/common/observable';
20
+ import * as monaco from '@theia/monaco-editor-core';
21
+ import { MergeRangeActions } from './merge-range-actions.js';
22
+ import { DiffSpacerService } from './diff-spacers.js';
26
23
  let MergeEditorViewZoneComputer = class MergeEditorViewZoneComputer {
27
24
  computeViewZones(mergeEditor) {
28
25
  const baseViewZones = [];
@@ -81,7 +78,7 @@ let MergeEditorViewZoneComputer = class MergeEditorViewZoneComputer {
81
78
  }
82
79
  }
83
80
  newMergeRangeActions(mergeEditor, mergeRange) {
84
- return new merge_range_actions_1.MergeRangeActions(mergeEditor, mergeRange);
81
+ return new MergeRangeActions(mergeEditor, mergeRange);
85
82
  }
86
83
  getActionZoneMinHeight(pane) {
87
84
  return pane.editor.getControl().getOption(monaco.editor.EditorOption.lineHeight);
@@ -96,15 +93,14 @@ let MergeEditorViewZoneComputer = class MergeEditorViewZoneComputer {
96
93
  return new MergeEditorSpacerZone(afterLineNumber, heightInLines);
97
94
  }
98
95
  };
99
- exports.MergeEditorViewZoneComputer = MergeEditorViewZoneComputer;
100
- tslib_1.__decorate([
101
- (0, inversify_1.inject)(diff_spacers_1.DiffSpacerService),
102
- tslib_1.__metadata("design:type", diff_spacers_1.DiffSpacerService)
96
+ __decorate([
97
+ inject(DiffSpacerService)
103
98
  ], MergeEditorViewZoneComputer.prototype, "diffSpacerService", void 0);
104
- exports.MergeEditorViewZoneComputer = MergeEditorViewZoneComputer = tslib_1.__decorate([
105
- (0, inversify_1.injectable)()
99
+ MergeEditorViewZoneComputer = __decorate([
100
+ injectable()
106
101
  ], MergeEditorViewZoneComputer);
107
- class MergeEditorActionZone {
102
+ export { MergeEditorViewZoneComputer };
103
+ export class MergeEditorActionZone {
108
104
  static { this.counter = 0; }
109
105
  constructor(pane, actionsObservable, afterLineNumber, heightInPx) {
110
106
  this.pane = pane;
@@ -134,13 +130,13 @@ class MergeEditorActionZone {
134
130
  getPosition: () => null
135
131
  };
136
132
  editor.addOverlayWidget(overlayWidget);
137
- ctx.register(core_1.Disposable.create(() => {
133
+ ctx.register(Disposable.create(() => {
138
134
  editor.removeOverlayWidget(overlayWidget);
139
135
  }));
140
136
  const actionContainer = document.createElement('div');
141
137
  actionContainer.className = 'codelens-decoration';
142
138
  overlayWidgetNode.appendChild(actionContainer);
143
- ctx.register(observable_1.Autorun.create(() => this.renderActions(actionContainer, this.actionsObservable.get())));
139
+ ctx.register(Autorun.create(() => this.renderActions(actionContainer, this.actionsObservable.get())));
144
140
  }
145
141
  ;
146
142
  renderActions(parent, actions) {
@@ -182,8 +178,7 @@ class MergeEditorActionZone {
182
178
  return action.text;
183
179
  }
184
180
  }
185
- exports.MergeEditorActionZone = MergeEditorActionZone;
186
- class MergeEditorActionZonePlaceholder {
181
+ export class MergeEditorActionZonePlaceholder {
187
182
  constructor(afterLineNumber, heightInPx) {
188
183
  this.afterLineNumber = afterLineNumber;
189
184
  this.heightInPx = heightInPx;
@@ -198,8 +193,7 @@ class MergeEditorActionZonePlaceholder {
198
193
  });
199
194
  }
200
195
  }
201
- exports.MergeEditorActionZonePlaceholder = MergeEditorActionZonePlaceholder;
202
- class MergeEditorSpacerZone {
196
+ export class MergeEditorSpacerZone {
203
197
  constructor(afterLineNumber, heightInLines) {
204
198
  this.afterLineNumber = afterLineNumber;
205
199
  this.heightInLines = heightInLines;
@@ -214,5 +208,4 @@ class MergeEditorSpacerZone {
214
208
  });
215
209
  }
216
210
  }
217
- exports.MergeEditorSpacerZone = MergeEditorSpacerZone;
218
211
  //# sourceMappingURL=merge-editor-view-zones.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-view-zones.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-view-zones.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-editor-view-zones.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-view-zones.ts"],"names":[],"mappings":"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"}