@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
@@ -22,10 +22,10 @@
22
22
  import { ArrayUtils } from '@theia/core';
23
23
  import { uinteger, Position, Range } from '@theia/core/shared/vscode-languageserver-protocol';
24
24
  import { TextEditorDocument } from '@theia/editor/lib/browser/editor';
25
- import { DetailedLineRangeMapping, MappingAlignment } from './range-mapping';
26
- import { LineRange } from './line-range';
27
- import { LineRangeEdit, RangeEdit } from './range-editing';
28
- import { PositionUtils, RangeUtils } from './range-utils';
25
+ import { DetailedLineRangeMapping, MappingAlignment } from './range-mapping.js';
26
+ import { LineRange } from './line-range.js';
27
+ import { LineRangeEdit, RangeEdit } from './range-editing.js';
28
+ import { PositionUtils, RangeUtils } from './range-utils.js';
29
29
 
30
30
  /**
31
31
  * Describes modifications in side 1 and side 2 for a specific range in base.
@@ -21,7 +21,7 @@
21
21
 
22
22
  import { ArrayUtils } from '@theia/core';
23
23
  import { Range, uinteger } from '@theia/core/shared/vscode-languageserver-protocol';
24
- import { LineRange } from './line-range';
24
+ import { LineRange } from './line-range.js';
25
25
  import * as monaco from '@theia/monaco-editor-core';
26
26
 
27
27
  /**
@@ -21,7 +21,7 @@
21
21
 
22
22
  import { expect } from 'chai';
23
23
  import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
24
- import { DocumentRangeMap, RangeMapping } from './range-mapping';
24
+ import { DocumentRangeMap, RangeMapping } from './range-mapping.js';
25
25
 
26
26
  describe('document-range-map', () => {
27
27
 
@@ -21,9 +21,9 @@
21
21
 
22
22
  import { ArrayUtils } from '@theia/core';
23
23
  import { Position, Range, TextEditorDocument } from '@theia/editor/lib/browser/editor';
24
- import { LineRange } from './line-range';
25
- import { LineRangeEdit } from './range-editing';
26
- import { PositionUtils, RangeUtils } from './range-utils';
24
+ import { LineRange } from './line-range.js';
25
+ import { LineRangeEdit } from './range-editing.js';
26
+ import { PositionUtils, RangeUtils } from './range-utils.js';
27
27
 
28
28
  /**
29
29
  * Maps a line range in the original text document to a line range in the modified text document.
@@ -16,7 +16,7 @@
16
16
 
17
17
  import { injectable } from '@theia/core/shared/inversify';
18
18
  import { ArrayUtils } from '@theia/core';
19
- import { LineRangeMapping } from '../model/range-mapping';
19
+ import { LineRangeMapping } from '../model/range-mapping.js';
20
20
 
21
21
  export interface DiffSpacers {
22
22
  /**
@@ -14,8 +14,8 @@
14
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
15
  // *****************************************************************************
16
16
 
17
- export * from './merge-editor-pane';
18
- export * from './merge-editor-pane-header';
19
- export * from './merge-editor-base-pane';
20
- export * from './merge-editor-side-pane';
21
- export * from './merge-editor-result-pane';
17
+ export * from './merge-editor-pane.js';
18
+ export * from './merge-editor-pane-header.js';
19
+ export * from './merge-editor-base-pane.js';
20
+ export * from './merge-editor-side-pane.js';
21
+ export * from './merge-editor-result-pane.js';
@@ -18,9 +18,9 @@ import { injectable } from '@theia/core/shared/inversify';
18
18
  import { nls } from '@theia/core';
19
19
  import { Autorun } from '@theia/core/lib/common/observable';
20
20
  import { EditorDecoration, Range } from '@theia/editor/lib/browser';
21
- import { MergeEditorPane } from './merge-editor-pane';
22
- import { MergeRange } from '../../model/merge-range';
23
- import { LineRange } from '../../model/line-range';
21
+ import { MergeEditorPane } from './merge-editor-pane.js';
22
+ import { MergeRange } from '../../model/merge-range.js';
23
+ import { LineRange } from '../../model/line-range.js';
24
24
 
25
25
  @injectable()
26
26
  export class MergeEditorBasePane extends MergeEditorPane {
@@ -22,13 +22,13 @@ import { EditorDecoration, EditorWidget, MinimapPosition, OverviewRulerLane, Pos
22
22
  import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
23
23
  import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
24
24
  import { Selection } from '@theia/monaco-editor-core';
25
- import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
26
- import { MergeEditor } from '../../merge-editor';
27
- import { MergeRange } from '../../model/merge-range';
28
- import { DetailedLineRangeMapping } from '../../model/range-mapping';
29
- import { LineRange } from '../../model/line-range';
30
- import { RangeUtils } from '../../model/range-utils';
31
- import { ScmColors } from '../../../scm-colors';
25
+ import { MergeEditorPaneHeader, MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
26
+ import { MergeEditor } from '../../merge-editor.js';
27
+ import { MergeRange } from '../../model/merge-range.js';
28
+ import { DetailedLineRangeMapping } from '../../model/range-mapping.js';
29
+ import { LineRange } from '../../model/line-range.js';
30
+ import { RangeUtils } from '../../model/range-utils.js';
31
+ import { ScmColors } from '../../../scm-colors.js';
32
32
 
33
33
  @injectable()
34
34
  export abstract class MergeEditorPane extends BoxPanel {
@@ -21,10 +21,10 @@ import { Autorun, ObservableUtils } from '@theia/core/lib/common/observable';
21
21
  import { EditorDecoration, Range } from '@theia/editor/lib/browser';
22
22
  import { NavigationLocation } from '@theia/editor/lib/browser/navigation/navigation-location';
23
23
  import { NavigationLocationService } from '@theia/editor/lib/browser/navigation/navigation-location-service';
24
- import { MergeEditorPane } from './merge-editor-pane';
25
- import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
26
- import { LineRange } from '../../model/line-range';
27
- import { MergeRange } from '../../model/merge-range';
24
+ import { MergeEditorPane } from './merge-editor-pane.js';
25
+ import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
26
+ import { LineRange } from '../../model/line-range.js';
27
+ import { MergeRange } from '../../model/merge-range.js';
28
28
 
29
29
  @injectable()
30
30
  export class MergeEditorResultPane extends MergeEditorPane {
@@ -19,10 +19,10 @@ import { nls, ILogger } from '@theia/core';
19
19
  import { ObservableUtils } from '@theia/core/lib/common/observable';
20
20
  import { codicon, DiffUris, LabelProvider, open, OpenerService } from '@theia/core/lib/browser';
21
21
  import { EditorDecoration, EditorOpenerOptions, Range } from '@theia/editor/lib/browser';
22
- import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../../model/merge-range';
23
- import { MergeEditorPane } from './merge-editor-pane';
24
- import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
25
- import { LineRange } from '../../model/line-range';
22
+ import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../../model/merge-range.js';
23
+ import { MergeEditorPane } from './merge-editor-pane.js';
24
+ import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header.js';
25
+ import { LineRange } from '../../model/line-range.js';
26
26
 
27
27
  @injectable()
28
28
  export abstract class MergeEditorSidePane extends MergeEditorPane {
@@ -21,8 +21,8 @@
21
21
 
22
22
  import { Disposable, DisposableCollection } from '@theia/core';
23
23
  import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
24
- import { MergeEditor } from '../merge-editor';
25
- import { DocumentLineRangeMap } from '../model/range-mapping';
24
+ import { MergeEditor } from '../merge-editor.js';
25
+ import { DocumentLineRangeMap } from '../model/range-mapping.js';
26
26
 
27
27
  export class MergeEditorScrollSync implements Disposable {
28
28
 
@@ -19,11 +19,11 @@ import { Disposable } from '@theia/core';
19
19
  import { Autorun, Observable } from '@theia/core/lib/common/observable';
20
20
  import * as monaco from '@theia/monaco-editor-core';
21
21
  import { MonacoEditorViewZone } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
22
- import { MergeEditor } from '../merge-editor';
23
- import { MergeRange } from '../model/merge-range';
24
- import { MergeRangeAction, MergeRangeActions } from './merge-range-actions';
25
- import { MergeEditorPane } from './merge-editor-panes';
26
- import { DiffSpacers, DiffSpacerService } from './diff-spacers';
22
+ import { MergeEditor } from '../merge-editor.js';
23
+ import { MergeRange } from '../model/merge-range.js';
24
+ import { MergeRangeAction, MergeRangeActions } from './merge-range-actions.js';
25
+ import { MergeEditorPane } from './merge-editor-panes/index.js';
26
+ import { DiffSpacers, DiffSpacerService } from './diff-spacers.js';
27
27
 
28
28
  export interface MergeEditorViewZone {
29
29
  create(ctx: MergeEditorViewZone.CreationContext): void;
@@ -20,8 +20,8 @@
20
20
  // copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
21
21
 
22
22
  import { DerivedObservable, ObservableUtils } from '@theia/core/lib/common/observable';
23
- import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range';
24
- import { MergeEditor } from '../merge-editor';
23
+ import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range.js';
24
+ import { MergeEditor } from '../merge-editor.js';
25
25
  import { nls } from '@theia/core';
26
26
 
27
27
  export interface MergeRangeAction {
@@ -0,0 +1,35 @@
1
+ // *****************************************************************************
2
+ // Copyright (C) 2026 EclipseSource and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ import '../../../src/browser/style/multi-diff-editor.css';
18
+
19
+ import { interfaces } from '@theia/core/shared/inversify';
20
+ import { URI } from '@theia/core';
21
+ import { LabelProviderContribution, NavigatableWidgetOptions, OpenHandler, WidgetFactory } from '@theia/core/lib/browser';
22
+ import { MultiDiffEditorOpenHandler, MultiDiffEditorLabelProvider } from './multi-diff-editor.js';
23
+ import { MultiDiffEditorWidgetFactory } from './multi-diff-editor-widget-factory.js';
24
+
25
+ export function bindMultiDiffEditor(bind: interfaces.Bind): void {
26
+ bind(MultiDiffEditorWidgetFactory).toDynamicValue(ctx => new MultiDiffEditorWidgetFactory(ctx.container)).inSingletonScope();
27
+ bind(WidgetFactory).toDynamicValue(ctx => ({
28
+ id: MultiDiffEditorOpenHandler.ID,
29
+ createWidget: (options: NavigatableWidgetOptions) => ctx.container.get(MultiDiffEditorWidgetFactory).createMultiDiffEditor(new URI(options.uri))
30
+ })).inSingletonScope();
31
+
32
+ bind(MultiDiffEditorOpenHandler).toSelf().inSingletonScope();
33
+ bind(OpenHandler).toService(MultiDiffEditorOpenHandler);
34
+ bind(LabelProviderContribution).to(MultiDiffEditorLabelProvider).inSingletonScope();
35
+ }
@@ -0,0 +1,83 @@
1
+ // *****************************************************************************
2
+ // Copyright (C) 2026 EclipseSource and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ import { isObject, URI } from '@theia/core';
18
+
19
+ export interface MultiDiffEditorResourcePair {
20
+ originalUri: URI;
21
+ modifiedUri: URI;
22
+ }
23
+
24
+ export interface MultiDiffEditorUriData {
25
+ title: string;
26
+ resources: MultiDiffEditorResourcePair[];
27
+ }
28
+
29
+ export namespace MultiDiffEditorUri {
30
+
31
+ const SCHEME = 'multi-diff-editor';
32
+
33
+ export function isMultiDiffEditorUri(uri: URI): boolean {
34
+ return uri.scheme === SCHEME;
35
+ }
36
+
37
+ export function encode(data: MultiDiffEditorUriData): URI {
38
+ const payload = JSON.stringify({
39
+ title: data.title,
40
+ resources: data.resources.map(r => [r.originalUri.toString(), r.modifiedUri.toString()])
41
+ });
42
+ return new URI().withScheme(SCHEME).withQuery(payload);
43
+ }
44
+
45
+ export function decode(uri: URI): MultiDiffEditorUriData {
46
+ if (uri.scheme !== SCHEME) {
47
+ throw new Error(`The URI must have scheme ${SCHEME}. The URI was: ${uri}`);
48
+ }
49
+ let parsed: unknown;
50
+ try {
51
+ parsed = JSON.parse(uri.query);
52
+ } catch {
53
+ throw new Error(`The URI ${uri} is not a valid URI for scheme ${SCHEME}: query is not valid JSON`);
54
+ }
55
+ if (!isValidPayload(parsed)) {
56
+ throw new Error(`The URI ${uri} is not a valid URI for scheme ${SCHEME}`);
57
+ }
58
+ return {
59
+ title: parsed.title,
60
+ resources: parsed.resources.map(pair => ({
61
+ originalUri: new URI(pair[0]),
62
+ modifiedUri: new URI(pair[1])
63
+ }))
64
+ };
65
+ }
66
+
67
+ interface ParsedPayload {
68
+ title: string;
69
+ resources: [string, string][];
70
+ }
71
+
72
+ function isValidPayload(value: unknown): value is ParsedPayload {
73
+ if (!isObject<ParsedPayload>(value)) {
74
+ return false;
75
+ }
76
+ if (typeof value.title !== 'string' || !Array.isArray(value.resources)) {
77
+ return false;
78
+ }
79
+ return value.resources.every(pair =>
80
+ Array.isArray(pair) && pair.length === 2 && pair.every(s => typeof s === 'string')
81
+ );
82
+ }
83
+ }
@@ -0,0 +1,81 @@
1
+ // *****************************************************************************
2
+ // Copyright (C) 2026 EclipseSource and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ import { Container, interfaces } from '@theia/core/shared/inversify';
18
+ import { URI } from '@theia/core';
19
+ import { DiffUris, LabelProvider } from '@theia/core/lib/browser';
20
+ import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
21
+ import * as monaco from '@theia/monaco-editor-core';
22
+ import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
23
+ import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
24
+ import { DiffEntryHeaderWidget, MultiDiffEditor, MultiDiffEditorData, MultiDiffEditorUri } from './multi-diff-editor.js';
25
+ import { MultiDiffEditorResourcePair, MultiDiffEditorUriData } from './multi-diff-editor-uri.js';
26
+
27
+ /** Options shared by embedded diff and code editors. */
28
+ const EMBEDDED_EDITOR_OPTIONS: monaco.editor.IEditorOptions = {
29
+ folding: false,
30
+ codeLens: false,
31
+ scrollBeyondLastLine: false,
32
+ stickyScroll: { enabled: false },
33
+ minimap: { enabled: false }
34
+ };
35
+
36
+ export class MultiDiffEditorWidgetFactory {
37
+
38
+ constructor(
39
+ protected readonly container: interfaces.Container,
40
+ protected readonly editorManager = container.get(EditorManager),
41
+ protected readonly labelProvider = container.get(LabelProvider),
42
+ ) { }
43
+
44
+ /** Create placeholders immediately; embedded editors load as entries approach the viewport. */
45
+ createMultiDiffEditor(uri: URI): MultiDiffEditor {
46
+ const data = MultiDiffEditorUri.decode(uri);
47
+ const editor = this.instantiateMultiDiffEditor(data);
48
+ for (const resource of data.resources) {
49
+ const headerWidget = new DiffEntryHeaderWidget(resource, this.labelProvider);
50
+ editor.addDiffEntry(resource, headerWidget, () => this.createEmbeddedEditorWidget(resource));
51
+ }
52
+ return editor;
53
+ }
54
+
55
+ protected instantiateMultiDiffEditor(data: MultiDiffEditorUriData): MultiDiffEditor {
56
+ const child = new Container({ defaultScope: 'Singleton' });
57
+ child.parent = this.container;
58
+ child.bind(MultiDiffEditorData).toConstantValue(data);
59
+ child.bind(MultiDiffEditor).toSelf();
60
+ return child.get(MultiDiffEditor);
61
+ }
62
+
63
+ protected async createEmbeddedEditorWidget(resource: MultiDiffEditorResourcePair): Promise<EditorWidget> {
64
+ const diffUri = DiffUris.encode(resource.originalUri, resource.modifiedUri);
65
+ const editorWidget = await this.editorManager.createByUri(diffUri);
66
+ this.configureEmbeddedEditor(editorWidget);
67
+ return editorWidget;
68
+ }
69
+
70
+ protected configureEmbeddedEditor(editorWidget: EditorWidget): void {
71
+ const monacoEditor = MonacoEditor.get(editorWidget);
72
+ if (monacoEditor) {
73
+ monacoEditor.detachModelOnHide = false;
74
+ }
75
+ if (monacoEditor instanceof MonacoDiffEditor) {
76
+ monacoEditor.diffEditor.updateOptions({ ...EMBEDDED_EDITOR_OPTIONS, hideUnchangedRegions: { enabled: true } });
77
+ } else if (monacoEditor) {
78
+ monacoEditor.getControl().updateOptions(EMBEDDED_EDITOR_OPTIONS);
79
+ }
80
+ }
81
+ }