@theia/scm 1.77.0-next.1 → 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,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2019 Red Hat, Inc. and others.
4
3
  //
@@ -15,20 +14,18 @@
15
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
15
  // *****************************************************************************
17
16
  var ScmWidget_1;
18
- Object.defineProperty(exports, "__esModule", { value: true });
19
- exports.ScmWidget = void 0;
20
- const tslib_1 = require("tslib");
21
- const inversify_1 = require("@theia/core/shared/inversify");
22
- const disposable_1 = require("@theia/core/lib/common/disposable");
23
- const browser_1 = require("@theia/core/lib/browser");
24
- const scm_commit_widget_1 = require("./scm-commit-widget");
25
- const scm_action_button_widget_1 = require("./scm-action-button-widget");
26
- const scm_amend_widget_1 = require("./scm-amend-widget");
27
- const scm_service_1 = require("./scm-service");
28
- const scm_tree_widget_1 = require("./scm-tree-widget");
29
- const scm_preferences_1 = require("../common/scm-preferences");
30
- const nls_1 = require("@theia/core/lib/common/nls");
31
- let ScmWidget = class ScmWidget extends browser_1.BaseWidget {
17
+ import { __decorate } from "tslib";
18
+ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
19
+ import { DisposableCollection } from '@theia/core/lib/common/disposable';
20
+ import { BaseWidget, Widget, Panel, PanelLayout, MessageLoop, CompositeTreeNode, SelectableTreeNode, ApplicationShell, NavigatableWidget, BadgeService, } from '@theia/core/lib/browser';
21
+ import { ScmCommitWidget } from './scm-commit-widget.js';
22
+ import { ScmActionButtonWidget } from './scm-action-button-widget.js';
23
+ import { ScmAmendWidget } from './scm-amend-widget.js';
24
+ import { ScmService } from './scm-service.js';
25
+ import { ScmTreeWidget } from './scm-tree-widget.js';
26
+ import { ScmPreferences } from '../common/scm-preferences.js';
27
+ import { nls } from '@theia/core/lib/common/nls';
28
+ let ScmWidget = class ScmWidget extends BaseWidget {
32
29
  static { ScmWidget_1 = this; }
33
30
  static { this.ID = 'scm-view'; }
34
31
  set viewMode(mode) {
@@ -39,17 +36,17 @@ let ScmWidget = class ScmWidget extends browser_1.BaseWidget {
39
36
  }
40
37
  constructor() {
41
38
  super();
42
- this.toDisposeOnRefresh = new disposable_1.DisposableCollection();
39
+ this.toDisposeOnRefresh = new DisposableCollection();
43
40
  this.node.tabIndex = 0;
44
41
  this.id = ScmWidget_1.ID;
45
42
  this.addClass('theia-scm');
46
43
  this.addClass('theia-scm-main-container');
47
44
  }
48
45
  init() {
49
- const layout = new browser_1.PanelLayout();
46
+ const layout = new PanelLayout();
50
47
  this.layout = layout;
51
- this.panel = new browser_1.Panel({
52
- layout: new browser_1.PanelLayout({})
48
+ this.panel = new Panel({
49
+ layout: new PanelLayout({})
53
50
  });
54
51
  this.panel.node.tabIndex = -1;
55
52
  this.panel.node.setAttribute('class', 'theia-scm-panel');
@@ -60,7 +57,7 @@ let ScmWidget = class ScmWidget extends browser_1.BaseWidget {
60
57
  this.containerLayout.addWidget(this.amendWidget);
61
58
  this.toDispose.push(this.resourceWidget.model.onNodeRefreshed(() => {
62
59
  const totalChanges = this.scmService.repositories.reduce((repoAcc, repo) => repoAcc + repo.provider.groups.reduce((groupAcc, group) => groupAcc + group.resources.length, 0), 0);
63
- this.badgeService.showBadge(this, totalChanges ? { value: totalChanges, tooltip: nls_1.nls.localizeByDefault('{0} pending changes', totalChanges) } : undefined);
60
+ this.badgeService.showBadge(this, totalChanges ? { value: totalChanges, tooltip: nls.localizeByDefault('{0} pending changes', totalChanges) } : undefined);
64
61
  }));
65
62
  this.refresh();
66
63
  this.toDispose.push(this.scmService.onDidChangeSelectedRepository(() => this.refresh()));
@@ -73,7 +70,7 @@ let ScmWidget = class ScmWidget extends browser_1.BaseWidget {
73
70
  }
74
71
  }));
75
72
  this.toDispose.push(this.shell.onDidChangeCurrentWidget(({ newValue }) => {
76
- const uri = browser_1.NavigatableWidget.getUri(newValue || undefined);
73
+ const uri = NavigatableWidget.getUri(newValue || undefined);
77
74
  if (uri) {
78
75
  this.resourceWidget.selectNodeByUri(uri);
79
76
  }
@@ -93,7 +90,7 @@ let ScmWidget = class ScmWidget extends browser_1.BaseWidget {
93
90
  this.toDisposeOnRefresh.dispose();
94
91
  this.toDispose.push(this.toDisposeOnRefresh);
95
92
  const repository = this.scmService.selectedRepository;
96
- this.title.label = nls_1.nls.localizeByDefault('Changes');
93
+ this.title.label = nls.localizeByDefault('Changes');
97
94
  this.title.caption = this.title.label;
98
95
  this.update();
99
96
  if (repository) {
@@ -115,13 +112,13 @@ let ScmWidget = class ScmWidget extends browser_1.BaseWidget {
115
112
  }
116
113
  }
117
114
  updateImmediately() {
118
- this.onUpdateRequest(browser_1.Widget.Msg.UpdateRequest);
115
+ this.onUpdateRequest(Widget.Msg.UpdateRequest);
119
116
  }
120
117
  onUpdateRequest(msg) {
121
- browser_1.MessageLoop.sendMessage(this.commitWidget, msg);
122
- browser_1.MessageLoop.sendMessage(this.actionButtonWidget, msg);
123
- browser_1.MessageLoop.sendMessage(this.resourceWidget, msg);
124
- browser_1.MessageLoop.sendMessage(this.amendWidget, msg);
118
+ MessageLoop.sendMessage(this.commitWidget, msg);
119
+ MessageLoop.sendMessage(this.actionButtonWidget, msg);
120
+ MessageLoop.sendMessage(this.resourceWidget, msg);
121
+ MessageLoop.sendMessage(this.amendWidget, msg);
125
122
  super.onUpdateRequest(msg);
126
123
  }
127
124
  onAfterAttach(msg) {
@@ -160,14 +157,14 @@ let ScmWidget = class ScmWidget extends browser_1.BaseWidget {
160
157
  collapseScmTree() {
161
158
  const { model } = this.resourceWidget;
162
159
  const root = model.root;
163
- if (browser_1.CompositeTreeNode.is(root)) {
160
+ if (CompositeTreeNode.is(root)) {
164
161
  root.children.map(group => {
165
- if (browser_1.CompositeTreeNode.is(group)) {
162
+ if (CompositeTreeNode.is(group)) {
166
163
  group.children.map(folderNode => {
167
- if (browser_1.CompositeTreeNode.is(folderNode)) {
164
+ if (CompositeTreeNode.is(folderNode)) {
168
165
  model.collapseAll(folderNode);
169
166
  }
170
- if (browser_1.SelectableTreeNode.isSelected(folderNode)) {
167
+ if (SelectableTreeNode.isSelected(folderNode)) {
171
168
  model.toggleNode(folderNode);
172
169
  }
173
170
  });
@@ -176,47 +173,35 @@ let ScmWidget = class ScmWidget extends browser_1.BaseWidget {
176
173
  }
177
174
  }
178
175
  };
179
- exports.ScmWidget = ScmWidget;
180
- tslib_1.__decorate([
181
- (0, inversify_1.inject)(browser_1.ApplicationShell),
182
- tslib_1.__metadata("design:type", browser_1.ApplicationShell)
176
+ __decorate([
177
+ inject(ApplicationShell)
183
178
  ], ScmWidget.prototype, "shell", void 0);
184
- tslib_1.__decorate([
185
- (0, inversify_1.inject)(scm_service_1.ScmService),
186
- tslib_1.__metadata("design:type", scm_service_1.ScmService)
179
+ __decorate([
180
+ inject(ScmService)
187
181
  ], ScmWidget.prototype, "scmService", void 0);
188
- tslib_1.__decorate([
189
- (0, inversify_1.inject)(scm_commit_widget_1.ScmCommitWidget),
190
- tslib_1.__metadata("design:type", scm_commit_widget_1.ScmCommitWidget)
182
+ __decorate([
183
+ inject(ScmCommitWidget)
191
184
  ], ScmWidget.prototype, "commitWidget", void 0);
192
- tslib_1.__decorate([
193
- (0, inversify_1.inject)(scm_action_button_widget_1.ScmActionButtonWidget),
194
- tslib_1.__metadata("design:type", scm_action_button_widget_1.ScmActionButtonWidget)
185
+ __decorate([
186
+ inject(ScmActionButtonWidget)
195
187
  ], ScmWidget.prototype, "actionButtonWidget", void 0);
196
- tslib_1.__decorate([
197
- (0, inversify_1.inject)(scm_tree_widget_1.ScmTreeWidget),
198
- tslib_1.__metadata("design:type", scm_tree_widget_1.ScmTreeWidget)
188
+ __decorate([
189
+ inject(ScmTreeWidget)
199
190
  ], ScmWidget.prototype, "resourceWidget", void 0);
200
- tslib_1.__decorate([
201
- (0, inversify_1.inject)(scm_amend_widget_1.ScmAmendWidget),
202
- tslib_1.__metadata("design:type", scm_amend_widget_1.ScmAmendWidget)
191
+ __decorate([
192
+ inject(ScmAmendWidget)
203
193
  ], ScmWidget.prototype, "amendWidget", void 0);
204
- tslib_1.__decorate([
205
- (0, inversify_1.inject)(scm_preferences_1.ScmPreferences),
206
- tslib_1.__metadata("design:type", Object)
194
+ __decorate([
195
+ inject(ScmPreferences)
207
196
  ], ScmWidget.prototype, "scmPreferences", void 0);
208
- tslib_1.__decorate([
209
- (0, inversify_1.inject)(browser_1.BadgeService),
210
- tslib_1.__metadata("design:type", browser_1.BadgeService)
197
+ __decorate([
198
+ inject(BadgeService)
211
199
  ], ScmWidget.prototype, "badgeService", void 0);
212
- tslib_1.__decorate([
213
- (0, inversify_1.postConstruct)(),
214
- tslib_1.__metadata("design:type", Function),
215
- tslib_1.__metadata("design:paramtypes", []),
216
- tslib_1.__metadata("design:returntype", void 0)
200
+ __decorate([
201
+ postConstruct()
217
202
  ], ScmWidget.prototype, "init", null);
218
- exports.ScmWidget = ScmWidget = ScmWidget_1 = tslib_1.__decorate([
219
- (0, inversify_1.injectable)(),
220
- tslib_1.__metadata("design:paramtypes", [])
203
+ ScmWidget = ScmWidget_1 = __decorate([
204
+ injectable()
221
205
  ], ScmWidget);
206
+ export { ScmWidget };
222
207
  //# sourceMappingURL=scm-widget.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"scm-widget.js","sourceRoot":"","sources":["../../src/browser/scm-widget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scm-widget.js","sourceRoot":"","sources":["../../src/browser/scm-widget.tsx"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2020 Ericsson and others.
4
3
  //
@@ -14,62 +13,58 @@
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.ScmPreferences = exports.ScmPreferenceContribution = exports.scmPreferenceSchema = void 0;
19
- exports.createScmPreferences = createScmPreferences;
20
- exports.bindScmPreferences = bindScmPreferences;
21
- const preferences_1 = require("@theia/core/lib/common/preferences");
22
- const nls_1 = require("@theia/core/lib/common/nls");
23
- exports.scmPreferenceSchema = {
16
+ import { createPreferenceProxy, PreferenceContribution, PreferenceService, } from '@theia/core/lib/common/preferences';
17
+ import { nls } from '@theia/core/lib/common/nls';
18
+ export const scmPreferenceSchema = {
24
19
  properties: {
25
20
  'scm.defaultViewMode': {
26
21
  type: 'string',
27
22
  enum: ['tree', 'list'],
28
23
  enumDescriptions: [
29
- nls_1.nls.localizeByDefault('Show the repository changes as a tree.'),
30
- nls_1.nls.localizeByDefault('Show the repository changes as a list.')
24
+ nls.localizeByDefault('Show the repository changes as a tree.'),
25
+ nls.localizeByDefault('Show the repository changes as a list.')
31
26
  ],
32
- description: nls_1.nls.localizeByDefault('Controls the default Source Control repository view mode.'),
27
+ description: nls.localizeByDefault('Controls the default Source Control repository view mode.'),
33
28
  default: 'list'
34
29
  },
35
30
  'scm.graph.badges': {
36
31
  type: 'string',
37
32
  enum: ['all', 'filter'],
38
33
  enumDescriptions: [
39
- nls_1.nls.localizeByDefault('Show badges of all history item groups in the Source Control Graph view.'),
40
- nls_1.nls.localizeByDefault('Show only the badges of history item groups used as a filter in the Source Control Graph view.')
34
+ nls.localizeByDefault('Show badges of all history item groups in the Source Control Graph view.'),
35
+ nls.localizeByDefault('Show only the badges of history item groups used as a filter in the Source Control Graph view.')
41
36
  ],
42
- description: nls_1.nls.localizeByDefault(
37
+ description: nls.localizeByDefault(
43
38
  // eslint-disable-next-line max-len
44
39
  'Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups.'),
45
40
  default: 'filter'
46
41
  },
47
42
  'scm.graph.pageOnScroll': {
48
43
  type: 'boolean',
49
- description: nls_1.nls.localizeByDefault('Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list.'),
44
+ description: nls.localizeByDefault('Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list.'),
50
45
  default: true
51
46
  },
52
47
  'scm.graph.pageSize': {
53
48
  type: 'number',
54
49
  minimum: 1,
55
50
  maximum: 1000,
56
- description: nls_1.nls.localizeByDefault('The number of items to show in the Source Control Graph view by default and when loading more items.'),
51
+ description: nls.localizeByDefault('The number of items to show in the Source Control Graph view by default and when loading more items.'),
57
52
  default: 50
58
53
  }
59
54
  }
60
55
  };
61
- exports.ScmPreferenceContribution = Symbol('ScmPreferenceContribution');
62
- exports.ScmPreferences = Symbol('ScmPreferences');
63
- function createScmPreferences(preferences, schema = exports.scmPreferenceSchema) {
64
- return (0, preferences_1.createPreferenceProxy)(preferences, schema);
56
+ export const ScmPreferenceContribution = Symbol('ScmPreferenceContribution');
57
+ export const ScmPreferences = Symbol('ScmPreferences');
58
+ export function createScmPreferences(preferences, schema = scmPreferenceSchema) {
59
+ return createPreferenceProxy(preferences, schema);
65
60
  }
66
- function bindScmPreferences(bind) {
67
- bind(exports.ScmPreferences).toDynamicValue((ctx) => {
68
- const preferences = ctx.container.get(preferences_1.PreferenceService);
69
- const contribution = ctx.container.get(exports.ScmPreferenceContribution);
61
+ export function bindScmPreferences(bind) {
62
+ bind(ScmPreferences).toDynamicValue((ctx) => {
63
+ const preferences = ctx.container.get(PreferenceService);
64
+ const contribution = ctx.container.get(ScmPreferenceContribution);
70
65
  return createScmPreferences(preferences, contribution.schema);
71
66
  }).inSingletonScope();
72
- bind(exports.ScmPreferenceContribution).toConstantValue({ schema: exports.scmPreferenceSchema });
73
- bind(preferences_1.PreferenceContribution).toService(exports.ScmPreferenceContribution);
67
+ bind(ScmPreferenceContribution).toConstantValue({ schema: scmPreferenceSchema });
68
+ bind(PreferenceContribution).toService(ScmPreferenceContribution);
74
69
  }
75
70
  //# sourceMappingURL=scm-preferences.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"scm-preferences.js","sourceRoot":"","sources":["../../src/common/scm-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AA8DhF,oDAEC;AAED,gDAQC;AAvED,oEAM4C;AAC5C,oDAAiD;AAEpC,QAAA,mBAAmB,GAAqB;IACjD,UAAU,EAAE;QACR,qBAAqB,EAAE;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;YACtB,gBAAgB,EAAE;gBACd,SAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;gBAC/D,SAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;aAClE;YACD,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,2DAA2D,CAAC;YAC/F,OAAO,EAAE,MAAM;SAClB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YACvB,gBAAgB,EAAE;gBACd,SAAG,CAAC,iBAAiB,CAAC,0EAA0E,CAAC;gBACjG,SAAG,CAAC,iBAAiB,CAAC,gGAAgG,CAAC;aAC1H;YACD,WAAW,EAAE,SAAG,CAAC,iBAAiB;YAC9B,mCAAmC;YACnC,oKAAoK,CAAC;YACzK,OAAO,EAAE,QAAQ;SACpB;QACD,wBAAwB,EAAE;YACtB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,yHAAyH,CAAC;YAC7J,OAAO,EAAE,IAAI;SAChB;QACD,oBAAoB,EAAE;YAClB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,sGAAsG,CAAC;YAC1I,OAAO,EAAE,EAAE;SACd;KACJ;CACJ,CAAC;AASW,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAChE,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAGvD,SAAgB,oBAAoB,CAAC,WAA8B,EAAE,SAA2B,2BAAmB;IAC/G,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAqB;IACpD,IAAI,CAAC,sBAAc,CAAC,CAAC,cAAc,CAAC,CAAC,GAAuB,EAAE,EAAE;QAC5D,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,iCAAyB,CAAC,CAAC;QAC1F,OAAO,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,iCAAyB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,2BAAmB,EAAE,CAAC,CAAC;IACjF,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,iCAAyB,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"scm-preferences.js","sourceRoot":"","sources":["../../src/common/scm-preferences.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAGhF,OAAO,EACH,qBAAqB,EACrB,sBAAsB,EAGtB,iBAAiB,GACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAqB;IACjD,UAAU,EAAE;QACR,qBAAqB,EAAE;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;YACtB,gBAAgB,EAAE;gBACd,GAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;gBAC/D,GAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;aAClE;YACD,WAAW,EAAE,GAAG,CAAC,iBAAiB,CAAC,2DAA2D,CAAC;YAC/F,OAAO,EAAE,MAAM;SAClB;QACD,kBAAkB,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YACvB,gBAAgB,EAAE;gBACd,GAAG,CAAC,iBAAiB,CAAC,0EAA0E,CAAC;gBACjG,GAAG,CAAC,iBAAiB,CAAC,gGAAgG,CAAC;aAC1H;YACD,WAAW,EAAE,GAAG,CAAC,iBAAiB;YAC9B,mCAAmC;YACnC,oKAAoK,CAAC;YACzK,OAAO,EAAE,QAAQ;SACpB;QACD,wBAAwB,EAAE;YACtB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,GAAG,CAAC,iBAAiB,CAAC,yHAAyH,CAAC;YAC7J,OAAO,EAAE,IAAI;SAChB;QACD,oBAAoB,EAAE;YAClB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,GAAG,CAAC,iBAAiB,CAAC,sGAAsG,CAAC;YAC1I,OAAO,EAAE,EAAE;SACd;KACJ;CACJ,CAAC;AASF,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAC7E,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAGvD,MAAM,UAAU,oBAAoB,CAAC,WAA8B,EAAE,SAA2B,mBAAmB;IAC/G,OAAO,qBAAqB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAqB;IACpD,IAAI,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,CAAC,GAAuB,EAAE,EAAE;QAC5D,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,iBAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,yBAAyB,CAAC,CAAC;QAC1F,OAAO,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,yBAAyB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAC;IACjF,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;AACtE,CAAC"}
@@ -1,4 +1,3 @@
1
- "use strict";
2
1
  // *****************************************************************************
3
2
  // Copyright (C) 2019 Red Hat, Inc. and others.
4
3
  //
@@ -14,10 +13,9 @@
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
- const inversify_1 = require("@theia/core/shared/inversify");
19
- const scm_preferences_1 = require("../common/scm-preferences");
20
- exports.default = new inversify_1.ContainerModule(bind => {
21
- (0, scm_preferences_1.bindScmPreferences)(bind);
16
+ import { ContainerModule } from '@theia/core/shared/inversify';
17
+ import { bindScmPreferences } from '../common/scm-preferences.js';
18
+ export default new ContainerModule(bind => {
19
+ bindScmPreferences(bind);
22
20
  });
23
21
  //# sourceMappingURL=scm-backend-module.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"scm-backend-module.js","sourceRoot":"","sources":["../../src/node/scm-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,4DAA+D;AAC/D,+DAA+D;AAC/D,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAA,oCAAkB,EAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"scm-backend-module.js","sourceRoot":"","sources":["../../src/node/scm-backend-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACtC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,12 +1,13 @@
1
1
  {
2
2
  "name": "@theia/scm",
3
- "version": "1.77.0-next.1+8b94967c4",
3
+ "version": "1.77.0-next.101+8308c936b",
4
4
  "description": "Theia - Source control Extension",
5
+ "type": "module",
5
6
  "dependencies": {
6
- "@theia/core": "1.77.0-next.1+8b94967c4",
7
- "@theia/editor": "1.77.0-next.1+8b94967c4",
8
- "@theia/filesystem": "1.77.0-next.1+8b94967c4",
9
- "@theia/monaco": "1.77.0-next.1+8b94967c4",
7
+ "@theia/core": "1.77.0-next.101+8308c936b",
8
+ "@theia/editor": "1.77.0-next.101+8308c936b",
9
+ "@theia/filesystem": "1.77.0-next.101+8308c936b",
10
+ "@theia/monaco": "1.77.0-next.101+8308c936b",
10
11
  "@theia/monaco-editor-core": "1.108.201",
11
12
  "@types/diff": "^5.2.3",
12
13
  "diff": "^5.2.2",
@@ -55,5 +56,13 @@
55
56
  "nyc": {
56
57
  "extends": "../../configs/nyc.json"
57
58
  },
58
- "gitHead": "8b94967c4cfa0dcf688a345d28b3ac2e0d7e298a"
59
+ "gitHead": "8308c936be596c357a51fc815ef30022aa62b3d5",
60
+ "exports": {
61
+ "./package.json": "./package.json",
62
+ "./lib/browser/merge-editor/view/merge-editor-panes": "./lib/browser/merge-editor/view/merge-editor-panes/index.js",
63
+ "./lib/*.json": "./lib/*.json",
64
+ "./lib/*.js": "./lib/*.js",
65
+ "./lib/*": "./lib/*.js",
66
+ "./*": "./*"
67
+ }
59
68
  }
@@ -16,13 +16,13 @@
16
16
 
17
17
  import { injectable, inject } from '@theia/core/shared/inversify';
18
18
  import { DisposableCollection, Emitter, Event, ResourceProvider } from '@theia/core';
19
- import { DirtyDiffDecorator, DirtyDiffUpdate } from '../dirty-diff/dirty-diff-decorator';
20
- import { DiffComputer } from '../dirty-diff/diff-computer';
21
- import { ContentLines } from '../dirty-diff/content-lines';
19
+ import { DirtyDiffDecorator, DirtyDiffUpdate } from '../dirty-diff/dirty-diff-decorator.js';
20
+ import { DiffComputer } from '../dirty-diff/diff-computer.js';
21
+ import { ContentLines } from '../dirty-diff/content-lines.js';
22
22
  import { EditorManager, EditorWidget, TextEditor } from '@theia/editor/lib/browser';
23
- import { ScmService } from '../scm-service';
23
+ import { ScmService } from '../scm-service.js';
24
24
 
25
- import throttle = require('@theia/core/shared/lodash.throttle');
25
+ import throttle from '@theia/core/shared/lodash.throttle';
26
26
 
27
27
  @injectable()
28
28
  export class ScmDecorationsService {
@@ -15,9 +15,10 @@
15
15
  // *****************************************************************************
16
16
 
17
17
  import * as chai from 'chai';
18
- import { ContentLines } from './content-lines';
18
+ import { ContentLines } from './content-lines.js';
19
19
  import { expect } from 'chai';
20
- chai.use(require('chai-string'));
20
+ import chaiString from 'chai-string';
21
+ chai.use(chaiString);
21
22
 
22
23
  describe('content-lines', () => {
23
24
 
@@ -16,10 +16,11 @@
16
16
 
17
17
  import * as chai from 'chai';
18
18
  import { expect } from 'chai';
19
- chai.use(require('chai-string'));
19
+ chai.use(chaiString);
20
20
 
21
- import { DiffComputer, DirtyDiff } from './diff-computer';
22
- import { ContentLines } from './content-lines';
21
+ import { DiffComputer, DirtyDiff } from './diff-computer.js';
22
+ import { ContentLines } from './content-lines.js';
23
+ import chaiString from 'chai-string';
23
24
 
24
25
  let diffComputer: DiffComputer;
25
26
 
@@ -15,7 +15,7 @@
15
15
  // *****************************************************************************
16
16
 
17
17
  import * as jsdiff from 'diff';
18
- import { ContentLinesArrayLike } from './content-lines';
18
+ import { ContentLinesArrayLike } from './content-lines.js';
19
19
  import { Position, Range, uinteger } from '@theia/core/shared/vscode-languageserver-protocol';
20
20
 
21
21
  export class DiffComputer {
@@ -23,7 +23,7 @@ import {
23
23
  TextEditor,
24
24
  MinimapPosition
25
25
  } from '@theia/editor/lib/browser';
26
- import { DirtyDiff, LineRange, Change } from './diff-computer';
26
+ import { DirtyDiff, LineRange, Change } from './diff-computer.js';
27
27
  import { URI } from '@theia/core';
28
28
 
29
29
  export enum DirtyDiffDecorationType {
@@ -15,9 +15,9 @@
15
15
  // *****************************************************************************
16
16
 
17
17
  import { interfaces } from '@theia/core/shared/inversify';
18
- import { DirtyDiffDecorator } from './dirty-diff-decorator';
19
- import { DirtyDiffNavigator } from './dirty-diff-navigator';
20
- import { DirtyDiffWidget, DirtyDiffWidgetFactory, DirtyDiffWidgetProps } from './dirty-diff-widget';
18
+ import { DirtyDiffDecorator } from './dirty-diff-decorator.js';
19
+ import { DirtyDiffNavigator } from './dirty-diff-navigator.js';
20
+ import { DirtyDiffWidget, DirtyDiffWidgetFactory, DirtyDiffWidgetProps } from './dirty-diff-widget.js';
21
21
 
22
22
  import '../../../src/browser/style/dirty-diff.css';
23
23
 
@@ -19,9 +19,9 @@ import { Disposable, DisposableCollection, URI } from '@theia/core';
19
19
  import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
20
20
  import { EditorManager, EditorMouseEvent, MouseTargetType, TextEditor } from '@theia/editor/lib/browser';
21
21
  import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
22
- import { Change, LineRange } from './diff-computer';
23
- import { DirtyDiffUpdate } from './dirty-diff-decorator';
24
- import { DirtyDiffWidget, DirtyDiffWidgetFactory } from './dirty-diff-widget';
22
+ import { Change, LineRange } from './diff-computer.js';
23
+ import { DirtyDiffUpdate } from './dirty-diff-decorator.js';
24
+ import { DirtyDiffWidget, DirtyDiffWidgetFactory } from './dirty-diff-widget.js';
25
25
 
26
26
  @injectable()
27
27
  export class DirtyDiffNavigator {
@@ -137,7 +137,7 @@ export class DirtyDiffController implements Disposable {
137
137
  if (dirtyDiff.editor === this.editor) {
138
138
  this.dirtyDiff = dirtyDiff;
139
139
  if (this.widget) {
140
- this.widget.changes = dirtyDiff.changes ;
140
+ this.widget.changes = dirtyDiff.changes;
141
141
  }
142
142
  }
143
143
  }
@@ -24,8 +24,8 @@ import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
24
24
  import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
25
25
  import { MonacoEditorPeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground }
26
26
  from '@theia/monaco/lib/browser/monaco-editor-peek-view-widget';
27
- import { Change, LineRange } from './diff-computer';
28
- import { ScmColors } from '../scm-colors';
27
+ import { Change, LineRange } from './diff-computer.js';
28
+ import { ScmColors } from '../scm-colors.js';
29
29
  import * as monaco from '@theia/monaco-editor-core';
30
30
 
31
31
  export const SCM_CHANGE_TITLE_MENU: MenuPath = ['scm-change-title-menu'];
@@ -29,8 +29,8 @@ import {
29
29
  import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
30
30
  import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
31
31
  import { Color } from '@theia/core/lib/common/color';
32
- import { ScmColors } from '../scm-colors';
33
- import { MergeEditor, MergeEditorSettings } from './merge-editor';
32
+ import { ScmColors } from '../scm-colors.js';
33
+ import { MergeEditor, MergeEditorSettings } from './merge-editor.js';
34
34
 
35
35
  export namespace MergeEditorCommands {
36
36
  export const MERGE_EDITOR_CATEGORY = 'Merge Editor';
@@ -19,7 +19,7 @@ import { Command, CommandContribution, CommandRegistry, DisposableCollection, ge
19
19
  import { ApplicationShell, open, OpenerService } from '@theia/core/lib/browser';
20
20
  import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
21
21
  import { LanguageService } from '@theia/core/lib/browser/language-service';
22
- import { MergeEditor, MergeEditorOpenerOptions, MergeEditorUri } from './merge-editor';
22
+ import { MergeEditor, MergeEditorOpenerOptions, MergeEditorUri } from './merge-editor.js';
23
23
 
24
24
  export namespace MergeEditorDevCommands {
25
25
  export const MERGE_EDITOR_DEV_CATEGORY = 'Merge Editor (Dev)';
@@ -23,13 +23,13 @@ import { FrontendApplicationContribution, KeybindingContribution, NavigatableWid
23
23
  import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
24
24
  import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
25
25
  import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
26
- import { MergeEditorModel, MergeEditorModelProps } from './model/merge-editor-model';
27
- import { MergeEditorBasePane, MergeEditorPaneHeader, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane } from './view/merge-editor-panes';
28
- import { DiffSpacerService } from './view/diff-spacers';
29
- import { MergeEditorViewZoneComputer } from './view/merge-editor-view-zones';
30
- import { MergeEditor, MergeEditorOpenHandler, MergeEditorSettings, MergeEditorUri, MergeUris } from './merge-editor';
31
- import { MergeEditorContribution } from './merge-editor-contribution';
32
- import { MergeEditorDevContribution } from './merge-editor-dev-contribution';
26
+ import { MergeEditorModel, MergeEditorModelProps } from './model/merge-editor-model.js';
27
+ import { MergeEditorBasePane, MergeEditorPaneHeader, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane } from './view/merge-editor-panes/index.js';
28
+ import { DiffSpacerService } from './view/diff-spacers.js';
29
+ import { MergeEditorViewZoneComputer } from './view/merge-editor-view-zones.js';
30
+ import { MergeEditor, MergeEditorOpenHandler, MergeEditorSettings, MergeEditorUri, MergeUris } from './merge-editor.js';
31
+ import { MergeEditorContribution } from './merge-editor-contribution.js';
32
+ import { MergeEditorDevContribution } from './merge-editor-dev-contribution.js';
33
33
 
34
34
  export function bindMergeEditor(bind: interfaces.Bind): void {
35
35
  bind(MergeEditorSettings).toSelf().inSingletonScope();
@@ -22,11 +22,11 @@ import {
22
22
  } from '@theia/core/lib/browser';
23
23
  import { Autorun, DerivedObservable, Observable, SettableObservable } from '@theia/core/lib/common/observable';
24
24
  import { Range } from '@theia/editor/lib/browser';
25
- import { MergeRange } from './model/merge-range';
26
- import { MergeEditorModel } from './model/merge-editor-model';
27
- import { MergeEditorBasePane, MergeEditorPane, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane, MergeEditorSidePane } from './view/merge-editor-panes';
28
- import { MergeEditorViewZone, MergeEditorViewZoneComputer } from './view/merge-editor-view-zones';
29
- import { MergeEditorScrollSync } from './view/merge-editor-scroll-sync';
25
+ import { MergeRange } from './model/merge-range.js';
26
+ import { MergeEditorModel } from './model/merge-editor-model.js';
27
+ import { MergeEditorBasePane, MergeEditorPane, MergeEditorResultPane, MergeEditorSide1Pane, MergeEditorSide2Pane, MergeEditorSidePane } from './view/merge-editor-panes/index.js';
28
+ import { MergeEditorViewZone, MergeEditorViewZoneComputer } from './view/merge-editor-view-zones.js';
29
+ import { MergeEditorScrollSync } from './view/merge-editor-scroll-sync.js';
30
30
 
31
31
  export interface MergeUris {
32
32
  baseUri: URI;
@@ -23,8 +23,8 @@ import { Disposable, DisposableCollection, URI } from '@theia/core';
23
23
  import { Autorun, Observable, ObservableSignal, SettableObservable } from '@theia/core/lib/common/observable';
24
24
  import { DiffComputer, LineRange as DiffLineRange } from '@theia/core/lib/common/diff';
25
25
  import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
26
- import { DetailedLineRangeMapping, RangeMapping } from './range-mapping';
27
- import { LineRange } from './line-range';
26
+ import { DetailedLineRangeMapping, RangeMapping } from './range-mapping.js';
27
+ import { LineRange } from './line-range.js';
28
28
 
29
29
  export class LiveDiff implements Disposable {
30
30
 
@@ -28,14 +28,14 @@ import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
28
28
  import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
29
29
  import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
30
30
  import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
31
- import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
32
- import { IUndoRedoService, UndoRedoElementType } from '@theia/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo';
33
- import { MergeRange, MergeRangeAcceptedState, MergeRangeResultState, MergeSide } from './merge-range';
34
- import { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping, RangeMapping } from './range-mapping';
35
- import { LiveDiff, LiveDiffState } from './live-diff';
36
- import { LineRange } from './line-range';
37
- import { LineRangeEdit } from './range-editing';
38
- import { RangeUtils } from './range-utils';
31
+ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
32
+ import { IUndoRedoService, UndoRedoElementType } from '@theia/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo.js';
33
+ import { MergeRange, MergeRangeAcceptedState, MergeRangeResultState, MergeSide } from './merge-range.js';
34
+ import { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping, RangeMapping } from './range-mapping.js';
35
+ import { LiveDiff, LiveDiffState } from './live-diff.js';
36
+ import { LineRange } from './line-range.js';
37
+ import { LineRangeEdit } from './range-editing.js';
38
+ import { RangeUtils } from './range-utils.js';
39
39
 
40
40
  export const MergeEditorModelProps = Symbol('MergeEditorModelProps');
41
41
  export interface MergeEditorModelProps {