@theia/scm 1.77.0-next.0 → 1.77.0-next.101

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 +1 @@
1
- {"version":3,"file":"dirty-diff-navigator.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-navigator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dirty-diff-navigator.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-navigator.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { Disposable, Event, MenuModelRegistry, MenuPath, URI } from '@theia/core
2
2
  import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
3
3
  import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
4
4
  import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
5
- import { Change } from './diff-computer';
5
+ import { Change } from './diff-computer.js';
6
6
  export declare const SCM_CHANGE_TITLE_MENU: MenuPath;
7
7
  /** Reserved for plugin contributions, corresponds to contribution point 'scm/change/title'. */
8
8
  export declare const PLUGIN_SCM_CHANGE_TITLE_MENU: MenuPath;
@@ -1 +1 @@
1
- {"version":3,"file":"dirty-diff-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-widget.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAe,UAAU,EAAW,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG,EAAO,MAAM,aAAa,CAAC;AAE7G,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAGxF,OAAO,EAAE,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAIpD,eAAO,MAAM,qBAAqB,EAAE,QAAoC,CAAC;AACzE,+FAA+F;AAC/F,eAAO,MAAM,4BAA4B,EAAE,QAA2C,CAAC;AAEvF,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AACnE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC;CACrC;AAED,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,eAAe,CAAC;AAEtF,qBACa,eAAgB,YAAW,UAAU;IAUZ,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,oBAAoB;IAC9C,QAAQ,CAAC,cAAc,EAAE,oBAAoB;IAChD,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAC7C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAX5E,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA0B;IAC5D,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAgC;IACnE,SAAS,CAAC,KAAK,EAAE,MAAM,CAAM;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA4B;IAC9D,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;gBAGc,KAAK,EAAE,oBAAoB,EACrC,cAAc,EAAE,oBAAoB,EACvC,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB;IAO5E,IAAI,OAAO,IAAI,SAAS,MAAM,EAAE,CAE/B;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAErC;IAED,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,GAAG,IAAI,GAAG,CAEb;IAED,IAAI,mBAAmB,IAAI,GAAG,CAE7B;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAsBhE,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAO/B,cAAc,IAAI,IAAI;IAStB,kBAAkB,IAAI,IAAI;IASpB,6BAA6B,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAMvI,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAyBnC,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B,SAAS,CAAC,qBAAqB,IAAI,MAAM;IAIzC,SAAS,CAAC,uBAAuB,IAAI,MAAM;IAO3C,SAAS,CAAC,oBAAoB,IAAI,MAAM;CAW3C"}
1
+ {"version":3,"file":"dirty-diff-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-widget.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAe,UAAU,EAAW,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG,EAAO,MAAM,aAAa,CAAC;AAE7G,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAGxF,OAAO,EAAE,MAAM,EAAa,MAAM,oBAAoB,CAAC;AAIvD,eAAO,MAAM,qBAAqB,EAAE,QAAoC,CAAC;AACzE,+FAA+F;AAC/F,eAAO,MAAM,4BAA4B,EAAE,QAA2C,CAAC;AAEvF,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AACnE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC;CACrC;AAED,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,eAAe,CAAC;AAEtF,qBACa,eAAgB,YAAW,UAAU;IAUZ,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,oBAAoB;IAC9C,QAAQ,CAAC,cAAc,EAAE,oBAAoB;IAChD,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAC7C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAX5E,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA0B;IAC5D,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAgC;IACnE,SAAS,CAAC,KAAK,EAAE,MAAM,CAAM;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA4B;IAC9D,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;gBAGc,KAAK,EAAE,oBAAoB,EACrC,cAAc,EAAE,oBAAoB,EACvC,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB;IAO5E,IAAI,OAAO,IAAI,SAAS,MAAM,EAAE,CAE/B;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAErC;IAED,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,GAAG,IAAI,GAAG,CAEb;IAED,IAAI,mBAAmB,IAAI,GAAG,CAE7B;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI;IAsBhE,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAO/B,cAAc,IAAI,IAAI;IAStB,kBAAkB,IAAI,IAAI;IASpB,6BAA6B,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAMvI,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAyBnC,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B,SAAS,CAAC,qBAAqB,IAAI,MAAM;IAIzC,SAAS,CAAC,uBAAuB,IAAI,MAAM;IAO3C,SAAS,CAAC,oBAAoB,IAAI,MAAM;CAW3C"}
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2023 1C-Soft LLC and others.
4
3
  //
@@ -14,31 +13,29 @@
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.DirtyDiffWidget = exports.DirtyDiffWidgetFactory = exports.DirtyDiffWidgetProps = exports.PLUGIN_SCM_CHANGE_TITLE_MENU = exports.SCM_CHANGE_TITLE_MENU = void 0;
19
- const tslib_1 = require("tslib");
20
- const inversify_1 = require("@theia/core/shared/inversify");
21
- const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
22
- const core_1 = require("@theia/core");
23
- const browser_1 = require("@theia/core/lib/browser");
24
- const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
25
- const monaco_editor_provider_1 = require("@theia/monaco/lib/browser/monaco-editor-provider");
26
- const monaco_editor_peek_view_widget_1 = require("@theia/monaco/lib/browser/monaco-editor-peek-view-widget");
27
- const diff_computer_1 = require("./diff-computer");
28
- const scm_colors_1 = require("../scm-colors");
29
- const monaco = require("@theia/monaco-editor-core");
30
- exports.SCM_CHANGE_TITLE_MENU = ['scm-change-title-menu'];
16
+ import { __decorate, __param } from "tslib";
17
+ import { inject, injectable } from '@theia/core/shared/inversify';
18
+ import { Position } from '@theia/core/shared/vscode-languageserver-protocol';
19
+ import { CommandMenu, Emitter, MenuModelRegistry, nls } from '@theia/core';
20
+ import { codicon } from '@theia/core/lib/browser';
21
+ import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
22
+ import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
23
+ import { MonacoEditorPeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from '@theia/monaco/lib/browser/monaco-editor-peek-view-widget';
24
+ import { Change, LineRange } from './diff-computer.js';
25
+ import { ScmColors } from '../scm-colors.js';
26
+ import * as monaco from '@theia/monaco-editor-core';
27
+ export const SCM_CHANGE_TITLE_MENU = ['scm-change-title-menu'];
31
28
  /** Reserved for plugin contributions, corresponds to contribution point 'scm/change/title'. */
32
- exports.PLUGIN_SCM_CHANGE_TITLE_MENU = ['plugin-scm-change-title-menu'];
33
- exports.DirtyDiffWidgetProps = Symbol('DirtyDiffWidgetProps');
34
- exports.DirtyDiffWidgetFactory = Symbol('DirtyDiffWidgetFactory');
29
+ export const PLUGIN_SCM_CHANGE_TITLE_MENU = ['plugin-scm-change-title-menu'];
30
+ export const DirtyDiffWidgetProps = Symbol('DirtyDiffWidgetProps');
31
+ export const DirtyDiffWidgetFactory = Symbol('DirtyDiffWidgetFactory');
35
32
  let DirtyDiffWidget = class DirtyDiffWidget {
36
33
  constructor(props, editorProvider, contextKeyService, menuModelRegistry) {
37
34
  this.props = props;
38
35
  this.editorProvider = editorProvider;
39
36
  this.contextKeyService = contextKeyService;
40
37
  this.menuModelRegistry = menuModelRegistry;
41
- this.onDidCloseEmitter = new core_1.Emitter();
38
+ this.onDidCloseEmitter = new Emitter();
42
39
  this.onDidClose = this.onDidCloseEmitter.event;
43
40
  this.index = -1;
44
41
  this.peekView = new DirtyDiffPeekView(this);
@@ -123,18 +120,18 @@ let DirtyDiffWidget = class DirtyDiffWidget {
123
120
  showCurrentChange() {
124
121
  this.updateHeading();
125
122
  const { previousRange, currentRange } = this.changes[this.index];
126
- this.peekView.show(vscode_languageserver_protocol_1.Position.create(diff_computer_1.LineRange.getEndPosition(currentRange).line, 0), this.computeHeightInLines()).then(async () => {
123
+ this.peekView.show(Position.create(LineRange.getEndPosition(currentRange).line, 0), this.computeHeightInLines()).then(async () => {
127
124
  this.editor.focus();
128
125
  const diffEditor = await this.diffEditorPromise;
129
126
  if (diffEditor.isDisposed()) {
130
127
  return;
131
128
  }
132
- let startLine = diff_computer_1.LineRange.getStartPosition(currentRange).line;
133
- let endLine = diff_computer_1.LineRange.getEndPosition(currentRange).line;
134
- if (diff_computer_1.LineRange.isEmpty(currentRange)) { // the change is a removal
129
+ let startLine = LineRange.getStartPosition(currentRange).line;
130
+ let endLine = LineRange.getEndPosition(currentRange).line;
131
+ if (LineRange.isEmpty(currentRange)) { // the change is a removal
135
132
  ++endLine;
136
133
  }
137
- else if (!diff_computer_1.LineRange.isEmpty(previousRange)) { // the change is a modification
134
+ else if (!LineRange.isEmpty(previousRange)) { // the change is a modification
138
135
  --startLine;
139
136
  ++endLine;
140
137
  }
@@ -151,8 +148,8 @@ let DirtyDiffWidget = class DirtyDiffWidget {
151
148
  computeSecondaryHeading() {
152
149
  const index = this.index + 1;
153
150
  const length = this.changes.length;
154
- return length > 1 ? core_1.nls.localizeByDefault('{0} of {1} changes', index, length) :
155
- core_1.nls.localizeByDefault('{0} of {1} change', index, length);
151
+ return length > 1 ? nls.localizeByDefault('{0} of {1} changes', index, length) :
152
+ nls.localizeByDefault('{0} of {1} change', index, length);
156
153
  }
157
154
  computeHeightInLines() {
158
155
  const editor = this.editor.getControl();
@@ -160,19 +157,18 @@ let DirtyDiffWidget = class DirtyDiffWidget {
160
157
  const editorHeight = editor.getLayoutInfo().height;
161
158
  const editorHeightInLines = Math.floor(editorHeight / lineHeight);
162
159
  const { previousRange, currentRange } = this.changes[this.index];
163
- const changeHeightInLines = diff_computer_1.LineRange.getLineCount(currentRange) + diff_computer_1.LineRange.getLineCount(previousRange);
160
+ const changeHeightInLines = LineRange.getLineCount(currentRange) + LineRange.getLineCount(previousRange);
164
161
  return Math.min(changeHeightInLines + /* padding */ 8, Math.floor(editorHeightInLines / 3));
165
162
  }
166
163
  };
167
- exports.DirtyDiffWidget = DirtyDiffWidget;
168
- exports.DirtyDiffWidget = DirtyDiffWidget = tslib_1.__decorate([
169
- (0, inversify_1.injectable)(),
170
- tslib_1.__param(0, (0, inversify_1.inject)(exports.DirtyDiffWidgetProps)),
171
- tslib_1.__param(1, (0, inversify_1.inject)(monaco_editor_provider_1.MonacoEditorProvider)),
172
- tslib_1.__param(2, (0, inversify_1.inject)(context_key_service_1.ContextKeyService)),
173
- tslib_1.__param(3, (0, inversify_1.inject)(core_1.MenuModelRegistry)),
174
- tslib_1.__metadata("design:paramtypes", [Object, monaco_editor_provider_1.MonacoEditorProvider, Object, core_1.MenuModelRegistry])
164
+ DirtyDiffWidget = __decorate([
165
+ injectable(),
166
+ __param(0, inject(DirtyDiffWidgetProps)),
167
+ __param(1, inject(MonacoEditorProvider)),
168
+ __param(2, inject(ContextKeyService)),
169
+ __param(3, inject(MenuModelRegistry))
175
170
  ], DirtyDiffWidget);
171
+ export { DirtyDiffWidget };
176
172
  function cycle(index, offset, length) {
177
173
  return (index + offset + length) % length;
178
174
  }
@@ -182,12 +178,12 @@ function applyChanges(changes, original, modified) {
182
178
  let currentLine = 1;
183
179
  for (const change of changes) {
184
180
  const { previousRange, currentRange } = change;
185
- const isInsertion = diff_computer_1.LineRange.isEmpty(previousRange);
186
- const isDeletion = diff_computer_1.LineRange.isEmpty(currentRange);
181
+ const isInsertion = LineRange.isEmpty(previousRange);
182
+ const isDeletion = LineRange.isEmpty(currentRange);
187
183
  const convert = (range) => {
188
184
  let startLineNumber;
189
185
  let endLineNumber;
190
- if (!diff_computer_1.LineRange.isEmpty(range)) {
186
+ if (!LineRange.isEmpty(range)) {
191
187
  startLineNumber = range.start + 1;
192
188
  endLineNumber = range.end;
193
189
  }
@@ -226,7 +222,7 @@ function applyChanges(changes, original, modified) {
226
222
  result.push(original.getValueInRange(new monaco.Range(currentLine, 1, original.getLineCount() + 1, 1)));
227
223
  return result.join('');
228
224
  }
229
- class DirtyDiffPeekView extends monaco_editor_peek_view_widget_1.MonacoEditorPeekViewWidget {
225
+ class DirtyDiffPeekView extends MonacoEditorPeekViewWidget {
230
226
  constructor(widget) {
231
227
  super(widget.editor, { isResizeable: true, showArrow: true, frameWidth: 1, keepEditorSelection: true, className: 'dirty-diff' });
232
228
  this.widget = widget;
@@ -260,9 +256,9 @@ class DirtyDiffPeekView extends monaco_editor_peek_view_widget_1.MonacoEditorPee
260
256
  this.style({
261
257
  arrowColor: borderColor,
262
258
  frameColor: borderColor,
263
- headerBackgroundColor: monaco_editor_peek_view_widget_1.peekViewTitleBackground,
264
- primaryHeadingColor: monaco_editor_peek_view_widget_1.peekViewTitleForeground,
265
- secondaryHeadingColor: monaco_editor_peek_view_widget_1.peekViewTitleInfoForeground
259
+ headerBackgroundColor: peekViewTitleBackground,
260
+ primaryHeadingColor: peekViewTitleForeground,
261
+ secondaryHeadingColor: peekViewTitleInfoForeground
266
262
  });
267
263
  this.updateActions();
268
264
  super.show(rangeOrPos, heightInLines);
@@ -295,16 +291,16 @@ class DirtyDiffPeekView extends monaco_editor_peek_view_widget_1.MonacoEditorPee
295
291
  getBorderColor() {
296
292
  const { currentChange } = this.widget;
297
293
  if (!currentChange) {
298
- return monaco_editor_peek_view_widget_1.peekViewBorder;
294
+ return peekViewBorder;
299
295
  }
300
- if (diff_computer_1.Change.isAddition(currentChange)) {
301
- return scm_colors_1.ScmColors.editorGutterAddedBackground;
296
+ if (Change.isAddition(currentChange)) {
297
+ return ScmColors.editorGutterAddedBackground;
302
298
  }
303
- else if (diff_computer_1.Change.isRemoval(currentChange)) {
304
- return scm_colors_1.ScmColors.editorGutterDeletedBackground;
299
+ else if (Change.isRemoval(currentChange)) {
300
+ return ScmColors.editorGutterDeletedBackground;
305
301
  }
306
302
  else {
307
- return scm_colors_1.ScmColors.editorGutterModifiedBackground;
303
+ return ScmColors.editorGutterModifiedBackground;
308
304
  }
309
305
  }
310
306
  updateActions() {
@@ -314,11 +310,11 @@ class DirtyDiffPeekView extends monaco_editor_peek_view_widget_1.MonacoEditorPee
314
310
  originalResourceScheme: this.widget.previousRevisionUri.scheme,
315
311
  originalResource: this.widget.previousRevisionUri.toString(),
316
312
  }, () => {
317
- for (const menuPath of [exports.SCM_CHANGE_TITLE_MENU, exports.PLUGIN_SCM_CHANGE_TITLE_MENU]) {
313
+ for (const menuPath of [SCM_CHANGE_TITLE_MENU, PLUGIN_SCM_CHANGE_TITLE_MENU]) {
318
314
  const menu = menuModelRegistry.getMenu(menuPath);
319
315
  if (menu) {
320
316
  for (const item of menu.children) {
321
- if (core_1.CommandMenu.is(item)) {
317
+ if (CommandMenu.is(item)) {
322
318
  const { id, label, icon } = item;
323
319
  const itemPath = [...menuPath, id];
324
320
  if (icon && item.isVisible(itemPath, contextKeyService, undefined, this.widget)) {
@@ -333,9 +329,9 @@ class DirtyDiffPeekView extends monaco_editor_peek_view_widget_1.MonacoEditorPee
333
329
  }
334
330
  }
335
331
  });
336
- this.addAction('dirtydiff.next', core_1.nls.localizeByDefault('Show Next Change'), (0, browser_1.codicon)('arrow-down'), true, () => this.widget.showNextChange());
337
- this.addAction('dirtydiff.previous', core_1.nls.localizeByDefault('Show Previous Change'), (0, browser_1.codicon)('arrow-up'), true, () => this.widget.showPreviousChange());
338
- this.addAction('peekview.close', core_1.nls.localizeByDefault('Close'), (0, browser_1.codicon)('close'), true, () => this.dispose());
332
+ this.addAction('dirtydiff.next', nls.localizeByDefault('Show Next Change'), codicon('arrow-down'), true, () => this.widget.showNextChange());
333
+ this.addAction('dirtydiff.previous', nls.localizeByDefault('Show Previous Change'), codicon('arrow-up'), true, () => this.widget.showPreviousChange());
334
+ this.addAction('peekview.close', nls.localizeByDefault('Close'), codicon('close'), true, () => this.dispose());
339
335
  }
340
336
  fillContainer(container) {
341
337
  this.setCssClass('peekview-widget');
@@ -364,7 +360,7 @@ class DirtyDiffPeekView extends monaco_editor_peek_view_widget_1.MonacoEditorPee
364
360
  this.diffEditor?.diffEditor.layout({ height, width });
365
361
  }
366
362
  doRevealRange(range) {
367
- this.editor.revealPosition(vscode_languageserver_protocol_1.Position.create(range.end.line, 0), { vertical: 'centerIfOutsideViewport' });
363
+ this.editor.revealPosition(Position.create(range.end.line, 0), { vertical: 'centerIfOutsideViewport' });
368
364
  }
369
365
  }
370
366
  //# sourceMappingURL=dirty-diff-widget.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"dirty-diff-widget.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-widget.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dirty-diff-widget.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-widget.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/li
3
3
  import { ApplicationShell, FrontendApplicationContribution, KeybindingContribution, KeybindingRegistry, LabelProvider } from '@theia/core/lib/browser';
4
4
  import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
5
5
  import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
6
- import { MergeEditor, MergeEditorSettings } from './merge-editor';
6
+ import { MergeEditor, MergeEditorSettings } from './merge-editor.js';
7
7
  export declare namespace MergeEditorCommands {
8
8
  const MERGE_EDITOR_CATEGORY = "Merge Editor";
9
9
  const ACCEPT_MERGE: Command;
@@ -21,7 +21,7 @@ export declare class MergeEditorContribution implements FrontendApplicationContr
21
21
  protected readonly labelProvider: LabelProvider;
22
22
  onStart(): void;
23
23
  onStop(): void;
24
- protected getMergeEditor(widget?: import("@lumino/widgets/types/widget").Widget | undefined): MergeEditor | undefined;
24
+ protected getMergeEditor(widget?: import("@lumino/widgets/types/widget.js").Widget | undefined): MergeEditor | undefined;
25
25
  registerCommands(commands: CommandRegistry): void;
26
26
  registerMenus(menus: MenuModelRegistry): void;
27
27
  registerToolbarItems(registry: TabBarToolbarRegistry): void;
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,EAAO,MAAM,aAAa,CAAC;AACtH,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EACH,gBAAgB,EAGhB,+BAA+B,EAC/B,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAGvE,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAElE,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,qBAAqB,iBAAiB,CAAC;IAC7C,MAAM,YAAY,SAIvB,CAAC;IACI,MAAM,6BAA6B,SAIxC,CAAC;IACI,MAAM,iCAAiC,SAI5C,CAAC;IACI,MAAM,gBAAgB,SAI3B,CAAC;IACI,MAAM,iBAAiB,SAI5B,CAAC;IACI,MAAM,SAAS,SAIpB,CAAC;IACI,MAAM,aAAa,SAIxB,CAAC;IACI,MAAM,gBAAgB,SAI3B,CAAC;CACN;AAED,qBACa,uBAAwB,YAAW,+BAA+B,EAC3E,mBAAmB,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,iBAAiB;IAG3G,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,OAAO,IAAI,IAAI;IAIf,MAAM,IAAI,IAAI;IAId,SAAS,CAAC,cAAc,CAAC,MAAM,4DAA2B,GAAG,WAAW,GAAG,SAAS;IAIpF,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAmHjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAG7C,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IA+C3D,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IAG1D;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;CAuE9C"}
1
+ {"version":3,"file":"merge-editor-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,EAAO,MAAM,aAAa,CAAC;AACtH,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EACH,gBAAgB,EAGhB,+BAA+B,EAC/B,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAGvE,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAErE,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,qBAAqB,iBAAiB,CAAC;IAC7C,MAAM,YAAY,SAIvB,CAAC;IACI,MAAM,6BAA6B,SAIxC,CAAC;IACI,MAAM,iCAAiC,SAI5C,CAAC;IACI,MAAM,gBAAgB,SAI3B,CAAC;IACI,MAAM,iBAAiB,SAI5B,CAAC;IACI,MAAM,SAAS,SAIpB,CAAC;IACI,MAAM,aAAa,SAIxB,CAAC;IACI,MAAM,gBAAgB,SAI3B,CAAC;CACN;AAED,qBACa,uBAAwB,YAAW,+BAA+B,EAC3E,mBAAmB,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,iBAAiB;IAG3G,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,OAAO,IAAI,IAAI;IAIf,MAAM,IAAI,IAAI;IAId,SAAS,CAAC,cAAc,CAAC,MAAM,+DAA2B,GAAG,WAAW,GAAG,SAAS;IAIpF,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAmHjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAG7C,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IA+C3D,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IAG1D;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;CAuE9C"}
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2025 1C-Soft LLC and others.
4
3
  //
@@ -14,59 +13,57 @@
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.MergeEditorContribution = exports.MergeEditorCommands = 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 color_1 = require("@theia/core/lib/common/color");
24
- const scm_colors_1 = require("../scm-colors");
25
- const merge_editor_1 = require("./merge-editor");
26
- var MergeEditorCommands;
16
+ import { __decorate } from "tslib";
17
+ import { inject, injectable } from '@theia/core/shared/inversify';
18
+ import { Command, nls } from '@theia/core';
19
+ import { ApplicationShell, codicon, ConfirmDialog, LabelProvider } from '@theia/core/lib/browser';
20
+ import { Color } from '@theia/core/lib/common/color';
21
+ import { ScmColors } from '../scm-colors.js';
22
+ import { MergeEditor, MergeEditorSettings } from './merge-editor.js';
23
+ export var MergeEditorCommands;
27
24
  (function (MergeEditorCommands) {
28
25
  MergeEditorCommands.MERGE_EDITOR_CATEGORY = 'Merge Editor';
29
- MergeEditorCommands.ACCEPT_MERGE = core_1.Command.toDefaultLocalizedCommand({
26
+ MergeEditorCommands.ACCEPT_MERGE = Command.toDefaultLocalizedCommand({
30
27
  id: 'mergeEditor.acceptMerge', // don't change: this is an API command
31
28
  label: 'Complete Merge',
32
29
  category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
33
30
  });
34
- MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT = core_1.Command.toDefaultLocalizedCommand({
31
+ MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT = Command.toDefaultLocalizedCommand({
35
32
  id: 'mergeEditor.goToNextUnhandledConflict',
36
33
  label: 'Go to Next Unhandled Conflict',
37
34
  category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
38
35
  });
39
- MergeEditorCommands.GO_TO_PREVIOUS_UNHANDLED_CONFLICT = core_1.Command.toDefaultLocalizedCommand({
36
+ MergeEditorCommands.GO_TO_PREVIOUS_UNHANDLED_CONFLICT = Command.toDefaultLocalizedCommand({
40
37
  id: 'mergeEditor.goToPreviousUnhandledConflict',
41
38
  label: 'Go to Previous Unhandled Conflict',
42
39
  category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
43
40
  });
44
- MergeEditorCommands.SET_MIXED_LAYOUT = core_1.Command.toDefaultLocalizedCommand({
41
+ MergeEditorCommands.SET_MIXED_LAYOUT = Command.toDefaultLocalizedCommand({
45
42
  id: 'mergeEditor.setMixedLayout',
46
43
  label: 'Mixed Layout',
47
44
  category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
48
45
  });
49
- MergeEditorCommands.SET_COLUMN_LAYOUT = core_1.Command.toDefaultLocalizedCommand({
46
+ MergeEditorCommands.SET_COLUMN_LAYOUT = Command.toDefaultLocalizedCommand({
50
47
  id: 'mergeEditor.setColumnLayout',
51
48
  label: 'Column Layout',
52
49
  category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
53
50
  });
54
- MergeEditorCommands.SHOW_BASE = core_1.Command.toDefaultLocalizedCommand({
51
+ MergeEditorCommands.SHOW_BASE = Command.toDefaultLocalizedCommand({
55
52
  id: 'mergeEditor.showBase',
56
53
  label: 'Show Base',
57
54
  category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
58
55
  });
59
- MergeEditorCommands.SHOW_BASE_TOP = core_1.Command.toDefaultLocalizedCommand({
56
+ MergeEditorCommands.SHOW_BASE_TOP = Command.toDefaultLocalizedCommand({
60
57
  id: 'mergeEditor.showBaseTop',
61
58
  label: 'Show Base Top',
62
59
  category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
63
60
  });
64
- MergeEditorCommands.SHOW_BASE_CENTER = core_1.Command.toDefaultLocalizedCommand({
61
+ MergeEditorCommands.SHOW_BASE_CENTER = Command.toDefaultLocalizedCommand({
65
62
  id: 'mergeEditor.showBaseCenter',
66
63
  label: 'Show Base Center',
67
64
  category: MergeEditorCommands.MERGE_EDITOR_CATEGORY
68
65
  });
69
- })(MergeEditorCommands || (exports.MergeEditorCommands = MergeEditorCommands = {}));
66
+ })(MergeEditorCommands || (MergeEditorCommands = {}));
70
67
  let MergeEditorContribution = class MergeEditorContribution {
71
68
  onStart() {
72
69
  this.settings.load();
@@ -75,7 +72,7 @@ let MergeEditorContribution = class MergeEditorContribution {
75
72
  this.settings.save();
76
73
  }
77
74
  getMergeEditor(widget = this.shell.currentWidget) {
78
- return widget instanceof merge_editor_1.MergeEditor ? widget : (widget?.parent ? this.getMergeEditor(widget.parent) : undefined);
75
+ return widget instanceof MergeEditor ? widget : (widget?.parent ? this.getMergeEditor(widget.parent) : undefined);
79
76
  }
80
77
  registerCommands(commands) {
81
78
  commands.registerCommand(MergeEditorCommands.ACCEPT_MERGE, {
@@ -84,10 +81,10 @@ let MergeEditorContribution = class MergeEditorContribution {
84
81
  if (editor) {
85
82
  let canceled = false;
86
83
  if (editor.model.unhandledMergeRangesCount > 0) {
87
- canceled = !(await new browser_1.ConfirmDialog({
88
- title: core_1.nls.localizeByDefault('Do you want to complete the merge of {0}?', this.labelProvider.getName(editor.resultUri)),
89
- msg: core_1.nls.localizeByDefault('The file contains unhandled conflicts.'),
90
- ok: core_1.nls.localizeByDefault('Complete with Conflicts')
84
+ canceled = !(await new ConfirmDialog({
85
+ title: nls.localizeByDefault('Do you want to complete the merge of {0}?', this.labelProvider.getName(editor.resultUri)),
86
+ msg: nls.localizeByDefault('The file contains unhandled conflicts.'),
87
+ ok: nls.localizeByDefault('Complete with Conflicts')
91
88
  }).open());
92
89
  }
93
90
  if (!canceled) {
@@ -197,14 +194,14 @@ let MergeEditorContribution = class MergeEditorContribution {
197
194
  registry.registerItem({
198
195
  id: MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT.id,
199
196
  command: MergeEditorCommands.GO_TO_NEXT_UNHANDLED_CONFLICT.id,
200
- icon: (0, browser_1.codicon)('arrow-down', true),
197
+ icon: codicon('arrow-down', true),
201
198
  group: 'navigation',
202
199
  order: 'a'
203
200
  });
204
201
  registry.registerItem({
205
202
  id: MergeEditorCommands.GO_TO_PREVIOUS_UNHANDLED_CONFLICT.id,
206
203
  command: MergeEditorCommands.GO_TO_PREVIOUS_UNHANDLED_CONFLICT.id,
207
- icon: (0, browser_1.codicon)('arrow-up', true),
204
+ icon: codicon('arrow-up', true),
208
205
  group: 'navigation',
209
206
  order: 'b'
210
207
  });
@@ -269,8 +266,8 @@ let MergeEditorContribution = class MergeEditorContribution {
269
266
  id: 'mergeEditor.conflict.unhandledUnfocused.background',
270
267
  description: 'The background color of unhandled unfocused conflicts.',
271
268
  defaults: {
272
- dark: color_1.Color.transparent('mergeEditor.conflict.unhandledUnfocused.border', 0.05),
273
- light: color_1.Color.transparent('mergeEditor.conflict.unhandledUnfocused.border', 0.05)
269
+ dark: Color.transparent('mergeEditor.conflict.unhandledUnfocused.border', 0.05),
270
+ light: Color.transparent('mergeEditor.conflict.unhandledUnfocused.border', 0.05)
274
271
  }
275
272
  }, {
276
273
  id: 'mergeEditor.conflict.unhandledFocused.border',
@@ -280,8 +277,8 @@ let MergeEditorContribution = class MergeEditorContribution {
280
277
  id: 'mergeEditor.conflict.unhandledFocused.background',
281
278
  description: 'The background color of unhandled focused conflicts.',
282
279
  defaults: {
283
- dark: color_1.Color.transparent('mergeEditor.conflict.unhandledFocused.border', 0.05),
284
- light: color_1.Color.transparent('mergeEditor.conflict.unhandledFocused.border', 0.05)
280
+ dark: Color.transparent('mergeEditor.conflict.unhandledFocused.border', 0.05),
281
+ light: Color.transparent('mergeEditor.conflict.unhandledFocused.border', 0.05)
285
282
  }
286
283
  }, {
287
284
  id: 'mergeEditor.conflict.handledUnfocused.border',
@@ -291,8 +288,8 @@ let MergeEditorContribution = class MergeEditorContribution {
291
288
  id: 'mergeEditor.conflict.handledUnfocused.background',
292
289
  description: 'The background color of handled unfocused conflicts.',
293
290
  defaults: {
294
- dark: color_1.Color.transparent('mergeEditor.conflict.handledUnfocused.border', 0.1),
295
- light: color_1.Color.transparent('mergeEditor.conflict.handledUnfocused.border', 0.1)
291
+ dark: Color.transparent('mergeEditor.conflict.handledUnfocused.border', 0.1),
292
+ light: Color.transparent('mergeEditor.conflict.handledUnfocused.border', 0.1)
296
293
  }
297
294
  }, {
298
295
  id: 'mergeEditor.conflict.handledFocused.border',
@@ -302,34 +299,31 @@ let MergeEditorContribution = class MergeEditorContribution {
302
299
  id: 'mergeEditor.conflict.handledFocused.background',
303
300
  description: 'The background color of handled focused conflicts.',
304
301
  defaults: {
305
- dark: color_1.Color.transparent('mergeEditor.conflict.handledFocused.border', 0.1),
306
- light: color_1.Color.transparent('mergeEditor.conflict.handledFocused.border', 0.1)
302
+ dark: Color.transparent('mergeEditor.conflict.handledFocused.border', 0.1),
303
+ light: Color.transparent('mergeEditor.conflict.handledFocused.border', 0.1)
307
304
  }
308
305
  }, {
309
- id: scm_colors_1.ScmColors.handledConflictMinimapOverviewRulerColor,
306
+ id: ScmColors.handledConflictMinimapOverviewRulerColor,
310
307
  description: 'Minimap gutter and overview ruler marker color for handled conflicts.',
311
308
  defaults: { dark: '#adaca8ee', light: '#adaca8ee', hcDark: '#adaca8ee', hcLight: '#adaca8ee' }
312
309
  }, {
313
- id: scm_colors_1.ScmColors.unhandledConflictMinimapOverviewRulerColor,
310
+ id: ScmColors.unhandledConflictMinimapOverviewRulerColor,
314
311
  description: 'Minimap gutter and overview ruler marker color for unhandled conflicts.',
315
312
  defaults: { dark: '#fcba03FF', light: '#fcba03FF', hcDark: '#fcba03FF', hcLight: '#fcba03FF' }
316
313
  });
317
314
  }
318
315
  };
319
- exports.MergeEditorContribution = MergeEditorContribution;
320
- tslib_1.__decorate([
321
- (0, inversify_1.inject)(merge_editor_1.MergeEditorSettings),
322
- tslib_1.__metadata("design:type", merge_editor_1.MergeEditorSettings)
316
+ __decorate([
317
+ inject(MergeEditorSettings)
323
318
  ], MergeEditorContribution.prototype, "settings", void 0);
324
- tslib_1.__decorate([
325
- (0, inversify_1.inject)(browser_1.ApplicationShell),
326
- tslib_1.__metadata("design:type", browser_1.ApplicationShell)
319
+ __decorate([
320
+ inject(ApplicationShell)
327
321
  ], MergeEditorContribution.prototype, "shell", void 0);
328
- tslib_1.__decorate([
329
- (0, inversify_1.inject)(browser_1.LabelProvider),
330
- tslib_1.__metadata("design:type", browser_1.LabelProvider)
322
+ __decorate([
323
+ inject(LabelProvider)
331
324
  ], MergeEditorContribution.prototype, "labelProvider", void 0);
332
- exports.MergeEditorContribution = MergeEditorContribution = tslib_1.__decorate([
333
- (0, inversify_1.injectable)()
325
+ MergeEditorContribution = __decorate([
326
+ injectable()
334
327
  ], MergeEditorContribution);
328
+ export { MergeEditorContribution };
335
329
  //# sourceMappingURL=merge-editor-contribution.js.map