@theia/scm 1.48.2 → 1.49.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/lib/browser/decorations/scm-decorations-service.d.ts +9 -3
  2. package/lib/browser/decorations/scm-decorations-service.d.ts.map +1 -1
  3. package/lib/browser/decorations/scm-decorations-service.js +50 -30
  4. package/lib/browser/decorations/scm-decorations-service.js.map +1 -1
  5. package/lib/browser/dirty-diff/content-lines.d.ts +2 -0
  6. package/lib/browser/dirty-diff/content-lines.d.ts.map +1 -1
  7. package/lib/browser/dirty-diff/content-lines.js +7 -0
  8. package/lib/browser/dirty-diff/content-lines.js.map +1 -1
  9. package/lib/browser/dirty-diff/diff-computer.d.ts +23 -14
  10. package/lib/browser/dirty-diff/diff-computer.d.ts.map +1 -1
  11. package/lib/browser/dirty-diff/diff-computer.js +91 -27
  12. package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
  13. package/lib/browser/dirty-diff/diff-computer.spec.js +120 -52
  14. package/lib/browser/dirty-diff/diff-computer.spec.js.map +1 -1
  15. package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts +5 -3
  16. package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts.map +1 -1
  17. package/lib/browser/dirty-diff/dirty-diff-decorator.js +14 -7
  18. package/lib/browser/dirty-diff/dirty-diff-decorator.js.map +1 -1
  19. package/lib/browser/dirty-diff/dirty-diff-module.d.ts.map +1 -1
  20. package/lib/browser/dirty-diff/dirty-diff-module.js +9 -0
  21. package/lib/browser/dirty-diff/dirty-diff-module.js.map +1 -1
  22. package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts +49 -0
  23. package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts.map +1 -0
  24. package/lib/browser/dirty-diff/dirty-diff-navigator.js +292 -0
  25. package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -0
  26. package/lib/browser/dirty-diff/dirty-diff-widget.d.ts +47 -0
  27. package/lib/browser/dirty-diff/dirty-diff-widget.d.ts.map +1 -0
  28. package/lib/browser/dirty-diff/dirty-diff-widget.js +320 -0
  29. package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -0
  30. package/lib/browser/scm-colors.d.ts +6 -0
  31. package/lib/browser/scm-colors.d.ts.map +1 -0
  32. package/lib/browser/scm-colors.js +25 -0
  33. package/lib/browser/scm-colors.js.map +1 -0
  34. package/lib/browser/scm-contribution.d.ts +20 -6
  35. package/lib/browser/scm-contribution.d.ts.map +1 -1
  36. package/lib/browser/scm-contribution.js +112 -22
  37. package/lib/browser/scm-contribution.js.map +1 -1
  38. package/lib/browser/scm-tree-widget.js +1 -1
  39. package/lib/browser/scm-tree-widget.js.map +1 -1
  40. package/package.json +8 -6
  41. package/src/browser/decorations/scm-decorations-service.ts +60 -36
  42. package/src/browser/dirty-diff/content-lines.ts +9 -0
  43. package/src/browser/dirty-diff/diff-computer.spec.ts +120 -52
  44. package/src/browser/dirty-diff/diff-computer.ts +88 -40
  45. package/src/browser/dirty-diff/dirty-diff-decorator.ts +17 -10
  46. package/src/browser/dirty-diff/dirty-diff-module.ts +9 -0
  47. package/src/browser/dirty-diff/dirty-diff-navigator.ts +288 -0
  48. package/src/browser/dirty-diff/dirty-diff-widget.ts +364 -0
  49. package/src/browser/scm-colors.ts +21 -0
  50. package/src/browser/scm-contribution.ts +97 -6
  51. package/src/browser/scm-tree-widget.tsx +1 -1
  52. package/src/browser/style/dirty-diff-decorator.css +2 -1
@@ -35,9 +35,12 @@ describe('dirty-diff-computer', () => {
35
35
  'THIRD'
36
36
  ]);
37
37
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
38
- added: [],
39
- modified: [],
40
- removed: [0],
38
+ changes: [
39
+ {
40
+ previousRange: { start: 1, end: 2 },
41
+ currentRange: { start: 1, end: 1 },
42
+ },
43
+ ],
41
44
  });
42
45
  });
43
46
  [1, 2, 3, 20].forEach(lines => {
@@ -45,18 +48,25 @@ describe('dirty-diff-computer', () => {
45
48
  const dirtyDiff = computeDirtyDiff(sequenceOfN(2)
46
49
  .concat(sequenceOfN(lines, () => 'TO-BE-REMOVED')), sequenceOfN(2));
47
50
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
48
- modified: [],
49
- removed: [1],
50
- added: [],
51
+ changes: [
52
+ {
53
+ previousRange: { start: 2, end: 2 + lines },
54
+ currentRange: { start: 2, end: 2 },
55
+ },
56
+ ],
51
57
  });
52
58
  });
53
59
  });
54
60
  it('remove all lines', () => {
55
- const dirtyDiff = computeDirtyDiff(sequenceOfN(10, () => 'TO-BE-REMOVED'), ['']);
61
+ const numberOfLines = 10;
62
+ const dirtyDiff = computeDirtyDiff(sequenceOfN(numberOfLines, () => 'TO-BE-REMOVED'), ['']);
56
63
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
57
- added: [],
58
- modified: [],
59
- removed: [0],
64
+ changes: [
65
+ {
66
+ previousRange: { start: 0, end: numberOfLines },
67
+ currentRange: { start: 0, end: 0 },
68
+ },
69
+ ],
60
70
  });
61
71
  });
62
72
  [1, 2, 3, 20].forEach(lines => {
@@ -64,9 +74,12 @@ describe('dirty-diff-computer', () => {
64
74
  const dirtyDiff = computeDirtyDiff(sequenceOfN(lines, () => 'TO-BE-REMOVED')
65
75
  .concat(sequenceOfN(2)), sequenceOfN(2));
66
76
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
67
- modified: [],
68
- removed: [0],
69
- added: [],
77
+ changes: [
78
+ {
79
+ previousRange: { start: 0, end: lines },
80
+ currentRange: { start: 0, end: 0 },
81
+ },
82
+ ],
70
83
  });
71
84
  });
72
85
  });
@@ -76,9 +89,12 @@ describe('dirty-diff-computer', () => {
76
89
  const modified = insertIntoArray(previous, 2, ...sequenceOfN(lines, () => 'ADDED LINE'));
77
90
  const dirtyDiff = computeDirtyDiff(previous, modified);
78
91
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
79
- modified: [],
80
- removed: [],
81
- added: [{ start: 2, end: 2 + lines - 1 }],
92
+ changes: [
93
+ {
94
+ previousRange: { start: 2, end: 2 },
95
+ currentRange: { start: 2, end: 2 + lines },
96
+ },
97
+ ],
82
98
  });
83
99
  });
84
100
  });
@@ -87,9 +103,12 @@ describe('dirty-diff-computer', () => {
87
103
  const dirtyDiff = computeDirtyDiff(sequenceOfN(2), sequenceOfN(lines, () => 'ADDED LINE')
88
104
  .concat(sequenceOfN(2)));
89
105
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
90
- modified: [],
91
- removed: [],
92
- added: [{ start: 0, end: lines - 1 }],
106
+ changes: [
107
+ {
108
+ previousRange: { start: 0, end: 0 },
109
+ currentRange: { start: 0, end: lines },
110
+ },
111
+ ],
93
112
  });
94
113
  });
95
114
  });
@@ -97,9 +116,12 @@ describe('dirty-diff-computer', () => {
97
116
  const numberOfLines = 3;
98
117
  const dirtyDiff = computeDirtyDiff([''], sequenceOfN(numberOfLines, () => 'ADDED LINE'));
99
118
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
100
- modified: [],
101
- removed: [],
102
- added: [{ start: 0, end: numberOfLines - 1 }],
119
+ changes: [
120
+ {
121
+ previousRange: { start: 0, end: 0 },
122
+ currentRange: { start: 0, end: numberOfLines },
123
+ },
124
+ ],
103
125
  });
104
126
  });
105
127
  it('add empty lines', () => {
@@ -113,9 +135,12 @@ describe('dirty-diff-computer', () => {
113
135
  '2'
114
136
  ]);
115
137
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
116
- modified: [],
117
- removed: [],
118
- added: [{ start: 1, end: 2 }],
138
+ changes: [
139
+ {
140
+ previousRange: { start: 1, end: 1 },
141
+ currentRange: { start: 1, end: 3 },
142
+ },
143
+ ],
119
144
  });
120
145
  });
121
146
  it('add empty line after single line', () => {
@@ -126,9 +151,12 @@ describe('dirty-diff-computer', () => {
126
151
  ''
127
152
  ]);
128
153
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
129
- modified: [],
130
- removed: [],
131
- added: [{ start: 1, end: 1 }],
154
+ changes: [
155
+ {
156
+ previousRange: { start: 1, end: 1 },
157
+ currentRange: { start: 1, end: 2 },
158
+ },
159
+ ],
132
160
  });
133
161
  });
134
162
  [1, 2, 3, 20].forEach(lines => {
@@ -136,9 +164,12 @@ describe('dirty-diff-computer', () => {
136
164
  const dirtyDiff = computeDirtyDiff(sequenceOfN(2), sequenceOfN(2)
137
165
  .concat(new Array(lines).map(() => '')));
138
166
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
139
- modified: [],
140
- removed: [],
141
- added: [{ start: 2, end: 1 + lines }],
167
+ changes: [
168
+ {
169
+ previousRange: { start: 2, end: 2 },
170
+ currentRange: { start: 2, end: 2 + lines },
171
+ },
172
+ ],
142
173
  });
143
174
  });
144
175
  });
@@ -156,18 +187,24 @@ describe('dirty-diff-computer', () => {
156
187
  'LAST'
157
188
  ]);
158
189
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
159
- modified: [],
160
- removed: [],
161
- added: [{ start: 1, end: 5 }],
190
+ changes: [
191
+ {
192
+ previousRange: { start: 1, end: 1 },
193
+ currentRange: { start: 1, end: 6 },
194
+ },
195
+ ],
162
196
  });
163
197
  });
164
198
  [1, 2, 3, 4, 5].forEach(lines => {
165
199
  it(`add ${formatLines(lines)} after single line`, () => {
166
200
  const dirtyDiff = computeDirtyDiff(['0'], ['0'].concat(sequenceOfN(lines, () => 'ADDED LINE')));
167
201
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
168
- modified: [],
169
- removed: [],
170
- added: [{ start: 1, end: lines }],
202
+ changes: [
203
+ {
204
+ previousRange: { start: 1, end: 1 },
205
+ currentRange: { start: 1, end: lines + 1 },
206
+ },
207
+ ],
171
208
  });
172
209
  });
173
210
  });
@@ -182,18 +219,24 @@ describe('dirty-diff-computer', () => {
182
219
  'LAST'
183
220
  ]);
184
221
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
185
- removed: [],
186
- added: [],
187
- modified: [{ start: 1, end: 1 }],
222
+ changes: [
223
+ {
224
+ previousRange: { start: 1, end: 2 },
225
+ currentRange: { start: 1, end: 2 },
226
+ },
227
+ ],
188
228
  });
189
229
  });
190
230
  it('modify all lines', () => {
191
231
  const numberOfLines = 10;
192
232
  const dirtyDiff = computeDirtyDiff(sequenceOfN(numberOfLines, () => 'TO-BE-MODIFIED'), sequenceOfN(numberOfLines, () => 'MODIFIED'));
193
233
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
194
- removed: [],
195
- added: [],
196
- modified: [{ start: 0, end: numberOfLines - 1 }],
234
+ changes: [
235
+ {
236
+ previousRange: { start: 0, end: numberOfLines },
237
+ currentRange: { start: 0, end: numberOfLines },
238
+ },
239
+ ],
197
240
  });
198
241
  });
199
242
  it('modify lines at the end', () => {
@@ -208,9 +251,12 @@ describe('dirty-diff-computer', () => {
208
251
  '3-changed'
209
252
  ]);
210
253
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
211
- removed: [],
212
- added: [],
213
- modified: [{ start: 1, end: 2 }],
254
+ changes: [
255
+ {
256
+ previousRange: { start: 1, end: 4 },
257
+ currentRange: { start: 1, end: 3 },
258
+ },
259
+ ],
214
260
  });
215
261
  });
216
262
  it('multiple diffs', () => {
@@ -241,9 +287,20 @@ describe('dirty-diff-computer', () => {
241
287
  ''
242
288
  ]);
243
289
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
244
- removed: [3],
245
- added: [{ start: 10, end: 11 }],
246
- modified: [{ start: 0, end: 0 }],
290
+ changes: [
291
+ {
292
+ previousRange: { start: 0, end: 1 },
293
+ currentRange: { start: 0, end: 1 },
294
+ },
295
+ {
296
+ previousRange: { start: 4, end: 5 },
297
+ currentRange: { start: 4, end: 4 },
298
+ },
299
+ {
300
+ previousRange: { start: 11, end: 11 },
301
+ currentRange: { start: 10, end: 12 },
302
+ },
303
+ ],
247
304
  });
248
305
  });
249
306
  it('multiple additions', () => {
@@ -273,9 +330,20 @@ describe('dirty-diff-computer', () => {
273
330
  ''
274
331
  ]);
275
332
  (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
276
- removed: [11],
277
- added: [{ start: 5, end: 5 }, { start: 9, end: 9 }],
278
- modified: [],
333
+ changes: [
334
+ {
335
+ previousRange: { start: 5, end: 5 },
336
+ currentRange: { start: 5, end: 6 },
337
+ },
338
+ {
339
+ previousRange: { start: 8, end: 8 },
340
+ currentRange: { start: 9, end: 10 },
341
+ },
342
+ {
343
+ previousRange: { start: 9, end: 10 },
344
+ currentRange: { start: 12, end: 12 },
345
+ },
346
+ ],
279
347
  });
280
348
  });
281
349
  });
@@ -1 +1 @@
1
- {"version":3,"file":"diff-computer.spec.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/diff-computer.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,6BAA6B;AAC7B,+BAA8B;AAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;AAEjC,mDAA0D;AAC1D,mDAA+C;AAE/C,IAAI,YAA0B,CAAC;AAE/B,MAAM,CAAC,GAAG,EAAE;IACR,YAAY,GAAG,IAAI,4BAAY,EAAE,CAAC;AACtC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAEjC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC1B,MAAM,SAAS,GAAG,gBAAgB,CAC9B;YACI,OAAO;YACP,sBAAsB;YACtB,OAAO;SACV,EACD;YACI,OAAO;YACP,OAAO;SACV,CACJ,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,CAAC,CAAC,CAAC;SACf,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC1B,EAAE,CAAC,UAAU,WAAW,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE;YAC/C,MAAM,SAAS,GAAG,gBAAgB,CAC9B,WAAW,CAAC,CAAC,CAAC;iBACT,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,EACtD,WAAW,CAAC,CAAC,CAAC,CACjB,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;gBAC1C,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,CAAC,CAAC,CAAC;gBACZ,KAAK,EAAE,EAAE;aACZ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;QACxB,MAAM,SAAS,GAAG,gBAAgB,CAC9B,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,EACtC,CAAC,EAAE,CAAC,CACP,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,CAAC,CAAC,CAAC;SACf,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC1B,EAAE,CAAC,UAAU,WAAW,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE;YACrD,MAAM,SAAS,GAAG,gBAAgB,CAC9B,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC;iBACpC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAC3B,WAAW,CAAC,CAAC,CAAC,CACjB,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;gBAC1C,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,CAAC,CAAC,CAAC;gBACZ,KAAK,EAAE,EAAE;aACZ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC1B,EAAE,CAAC,OAAO,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE;YACjC,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;YACzF,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACvD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;gBAC1C,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,EAAE;gBACX,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC;aAC5C,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC1B,EAAE,CAAC,OAAO,WAAW,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE;YAClD,MAAM,SAAS,GAAG,gBAAgB,CAC9B,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC;iBACjC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAC9B,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;gBAC1C,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,EAAE;gBACX,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC;aACxC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QAC/B,MAAM,aAAa,GAAG,CAAC,CAAC;QACxB,MAAM,SAAS,GAAG,gBAAgB,CAC9B,CAAC,EAAE,CAAC,EACJ,WAAW,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,CACjD,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC;SAChD,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACvB,MAAM,SAAS,GAAG,gBAAgB,CAC9B;YACI,GAAG;YACH,GAAG;SACN,EACD;YACI,GAAG;YACH,EAAE;YACF,EAAE;YACF,GAAG;SACN,CACJ,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SAChC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QACxC,MAAM,SAAS,GAAG,gBAAgB,CAC9B;YACI,GAAG;SACN,EACD;YACI,GAAG;YACH,EAAE;SACL,CACJ,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SAChC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC1B,EAAE,CAAC,OAAO,WAAW,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,EAAE;YACpD,MAAM,SAAS,GAAG,gBAAgB,CAC9B,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,CAAC,CAAC;iBACT,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAC9C,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;gBAC1C,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,EAAE;gBACX,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC;aACxC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,MAAM,SAAS,GAAG,gBAAgB,CAC9B;YACI,OAAO;YACP,MAAM;SACT,EACD;YACI,OAAO;YACP,UAAU;YACV,UAAU;YACV,UAAU;YACV,UAAU;YACV,UAAU;YACV,MAAM;SACT,CACJ,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SAChC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC5B,EAAE,CAAC,OAAO,WAAW,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACnD,MAAM,SAAS,GAAG,gBAAgB,CAC9B,CAAC,GAAG,CAAC,EACL,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CACvD,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;gBAC1C,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,EAAE;gBACX,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;aACpC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC1B,MAAM,SAAS,GAAG,gBAAgB,CAC9B;YACI,OAAO;YACP,gBAAgB;YAChB,MAAM;SACT,EACD;YACI,OAAO;YACP,UAAU;YACV,MAAM;SACT,CACJ,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SACnC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;QACxB,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,MAAM,SAAS,GAAG,gBAAgB,CAC9B,WAAW,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,EAClD,WAAW,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,CAC/C,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC;SACnD,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QAC/B,MAAM,SAAS,GAAG,gBAAgB,CAC9B;YACI,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;SACN,EACD;YACI,GAAG;YACH,WAAW;YACX,WAAW;SACd,CACJ,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SACnC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;QACtB,MAAM,SAAS,GAAG,gBAAgB,CAC9B;YACI,eAAe;YACf,GAAG;YACH,GAAG;YACH,GAAG;YACH,eAAe;YACf,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;SACN,EACD;YACI,SAAS;YACT,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,GAAG;YACH,OAAO;YACP,EAAE;SACL,CACJ,CAAC;QACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,OAAO,EAAE,CAAC,CAAC,CAAC;YACZ,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;YAC/B,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SACnC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC1B,MAAM,SAAS,GAAG,gBAAgB,CAC9B;YACI,YAAY;YACZ,EAAE;YACF,uBAAuB;YACvB,uBAAuB;YACvB,EAAE;YACF,EAAE;YACF,EAAE;YACF,EAAE;YACF,EAAE;YACF,WAAW;SACd,EACD;YACI,YAAY;YACZ,EAAE;YACF,uBAAuB;YACvB,uBAAuB;YACvB,EAAE;YACF,UAAU;YACV,EAAE;YACF,EAAE;YACF,EAAE;YACF,WAAW;YACX,EAAE;YACF,EAAE;SACL,CAAC,CAAC;QACP,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAY;YAC1C,OAAO,EAAE,CAAC,EAAE,CAAC;YACb,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;YACnD,QAAQ,EAAE,EAAE;SACf,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC;AAEH,SAAS,gBAAgB,CAAC,QAAkB,EAAE,QAAkB;IAC5D,MAAM,CAAC,GAAG,4BAAY,CAAC,SAAS,CAAC;QAC7B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,cAAc,EAAE,IAAI,CAAC,EAAE;YACnB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,KAAK,KAAK,SAAS,EAAE;gBACrB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aAC1B;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;KACJ,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,4BAAY,CAAC,SAAS,CAAC;QAC7B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,cAAc,EAAE,IAAI,CAAC,EAAE;YACnB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,KAAK,KAAK,SAAS,EAAE;gBACrB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aAC1B;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;KACJ,CAAC,CAAC;IACH,OAAO,YAAY,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,WAAW,CAAC,CAAS,EAAE,QAAmC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,WAAW,CAAC,CAAS;IAC1B,OAAO,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,eAAe,CAAC,MAAgB,EAAE,KAAa,EAAE,GAAG,KAAe;IACxE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"diff-computer.spec.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/diff-computer.spec.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
- import { EditorDecoration, EditorDecorationOptions, EditorDecorator, TextEditor } from '@theia/editor/lib/browser';
2
- import { DirtyDiff, LineRange } from './diff-computer';
1
+ import { EditorDecoration, EditorDecorator, TextEditor } from '@theia/editor/lib/browser';
2
+ import { DirtyDiff, Change } from './diff-computer';
3
+ import { URI } from '@theia/core';
3
4
  export declare enum DirtyDiffDecorationType {
4
5
  AddedLine = "dirty-diff-added-line",
5
6
  RemovedLine = "dirty-diff-removed-line",
@@ -7,9 +8,10 @@ export declare enum DirtyDiffDecorationType {
7
8
  }
8
9
  export interface DirtyDiffUpdate extends DirtyDiff {
9
10
  readonly editor: TextEditor;
11
+ readonly previousRevisionUri?: URI;
10
12
  }
11
13
  export declare class DirtyDiffDecorator extends EditorDecorator {
12
14
  applyDecorations(update: DirtyDiffUpdate): void;
13
- protected toDeltaDecoration(from: LineRange | number, options: EditorDecorationOptions): EditorDecoration;
15
+ protected toDeltaDecoration(change: Change): EditorDecoration;
14
16
  }
15
17
  //# sourceMappingURL=dirty-diff-decorator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dirty-diff-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-decorator.ts"],"names":[],"mappings":"AAiBA,OAAO,EAGH,gBAAgB,EAChB,uBAAuB,EAEvB,eAAe,EACf,UAAU,EAEb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvD,oBAAY,uBAAuB;IAC/B,SAAS,0BAA0B;IACnC,WAAW,4BAA4B;IACvC,YAAY,6BAA6B;CAC5C;AAqDD,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAC9C,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC/B;AAED,qBACa,kBAAmB,SAAQ,eAAe;IAEnD,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAQ/C,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,EAAE,OAAO,EAAE,uBAAuB,GAAG,gBAAgB;CAK5G"}
1
+ {"version":3,"file":"dirty-diff-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-decorator.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,gBAAgB,EAGhB,eAAe,EACf,UAAU,EAEb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAa,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,oBAAY,uBAAuB;IAC/B,SAAS,0BAA0B;IACnC,WAAW,4BAA4B;IACvC,YAAY,6BAA6B;CAC5C;AA+DD,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAC9C,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,GAAG,CAAC;CACtC;AAED,qBACa,kBAAmB,SAAQ,eAAe;IAEnD,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAK/C,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB;CAKhE"}
@@ -19,6 +19,7 @@ exports.DirtyDiffDecorator = exports.DirtyDiffDecorationType = void 0;
19
19
  const tslib_1 = require("tslib");
20
20
  const inversify_1 = require("@theia/core/shared/inversify");
21
21
  const browser_1 = require("@theia/editor/lib/browser");
22
+ const diff_computer_1 = require("./diff-computer");
22
23
  var DirtyDiffDecorationType;
23
24
  (function (DirtyDiffDecorationType) {
24
25
  DirtyDiffDecorationType["AddedLine"] = "dirty-diff-added-line";
@@ -73,17 +74,23 @@ const ModifiedLineDecoration = {
73
74
  },
74
75
  isWholeLine: true
75
76
  };
77
+ function getEditorDecorationOptions(change) {
78
+ if (diff_computer_1.Change.isAddition(change)) {
79
+ return AddedLineDecoration;
80
+ }
81
+ if (diff_computer_1.Change.isRemoval(change)) {
82
+ return RemovedLineDecoration;
83
+ }
84
+ return ModifiedLineDecoration;
85
+ }
76
86
  let DirtyDiffDecorator = class DirtyDiffDecorator extends browser_1.EditorDecorator {
77
87
  applyDecorations(update) {
78
- const modifications = update.modified.map(range => this.toDeltaDecoration(range, ModifiedLineDecoration));
79
- const additions = update.added.map(range => this.toDeltaDecoration(range, AddedLineDecoration));
80
- const removals = update.removed.map(line => this.toDeltaDecoration(line, RemovedLineDecoration));
81
- const decorations = [...modifications, ...additions, ...removals];
88
+ const decorations = update.changes.map(change => this.toDeltaDecoration(change));
82
89
  this.setDecorations(update.editor, decorations);
83
90
  }
84
- toDeltaDecoration(from, options) {
85
- const [start, end] = (typeof from === 'number') ? [from, from] : [from.start, from.end];
86
- const range = browser_1.Range.create(browser_1.Position.create(start, 0), browser_1.Position.create(end, 0));
91
+ toDeltaDecoration(change) {
92
+ const range = diff_computer_1.LineRange.toRange(change.currentRange);
93
+ const options = getEditorDecorationOptions(change);
87
94
  return { range, options };
88
95
  }
89
96
  };
@@ -1 +1 @@
1
- {"version":3,"file":"dirty-diff-decorator.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-decorator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dirty-diff-decorator.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-decorator.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,4DAA0D;AAC1D,uDAOmC;AACnC,mDAA+D;AAG/D,IAAY,uBAIX;AAJD,WAAY,uBAAuB;IAC/B,8DAAmC,CAAA;IACnC,kEAAuC,CAAA;IACvC,oEAAyC,CAAA;AAC7C,CAAC,EAJW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAIlC;AAED,MAAM,mBAAmB,GAA4B;IACjD,yBAAyB,EAAE,wCAAwC;IACnE,aAAa,EAAE;QACX,KAAK,EAAE;YACH,EAAE,EAAE,qCAAqC;SAC5C;QACD,QAAQ,EAAE,2BAAiB,CAAC,IAAI;KACnC;IACD,OAAO,EAAE;QACL,KAAK,EAAE;YACH,EAAE,EAAE,+BAA+B;SACtC;QACD,QAAQ,EAAE,yBAAe,CAAC,MAAM;KACnC;IACD,WAAW,EAAE,IAAI;CACpB,CAAC;AAEF,MAAM,qBAAqB,GAA4B;IACnD,yBAAyB,EAAE,0CAA0C;IACrE,aAAa,EAAE;QACX,KAAK,EAAE;YACH,EAAE,EAAE,uCAAuC;SAC9C;QACD,QAAQ,EAAE,2BAAiB,CAAC,IAAI;KACnC;IACD,OAAO,EAAE;QACL,KAAK,EAAE;YACH,EAAE,EAAE,iCAAiC;SACxC;QACD,QAAQ,EAAE,yBAAe,CAAC,MAAM;KACnC;IACD,WAAW,EAAE,KAAK;CACrB,CAAC;AAEF,MAAM,sBAAsB,GAA4B;IACpD,yBAAyB,EAAE,2CAA2C;IACtE,aAAa,EAAE;QACX,KAAK,EAAE;YACH,EAAE,EAAE,wCAAwC;SAC/C;QACD,QAAQ,EAAE,2BAAiB,CAAC,IAAI;KACnC;IACD,OAAO,EAAE;QACL,KAAK,EAAE;YACH,EAAE,EAAE,kCAAkC;SACzC;QACD,QAAQ,EAAE,yBAAe,CAAC,MAAM;KACnC;IACD,WAAW,EAAE,IAAI;CACpB,CAAC;AAEF,SAAS,0BAA0B,CAAC,MAAc;IAC9C,IAAI,sBAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,mBAAmB,CAAC;KAC9B;IACD,IAAI,sBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;QAC1B,OAAO,qBAAqB,CAAC;KAChC;IACD,OAAO,sBAAsB,CAAC;AAClC,CAAC;AAQD,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,yBAAe;IAEnD,gBAAgB,CAAC,MAAuB;QACpC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;IAES,iBAAiB,CAAC,MAAc;QACtC,MAAM,KAAK,GAAG,yBAAS,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;IAC9B,CAAC;CACJ,CAAA;AAZY,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAY9B;AAZY,gDAAkB"}
@@ -1 +1 @@
1
- {"version":3,"file":"dirty-diff-module.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG1D,OAAO,2CAA2C,CAAC;AAEnD,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAEzD"}
1
+ {"version":3,"file":"dirty-diff-module.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAK1D,OAAO,2CAA2C,CAAC;AAEnD,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CASzD"}
@@ -17,9 +17,18 @@
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.bindDirtyDiff = void 0;
19
19
  const dirty_diff_decorator_1 = require("./dirty-diff-decorator");
20
+ const dirty_diff_navigator_1 = require("./dirty-diff-navigator");
21
+ const dirty_diff_widget_1 = require("./dirty-diff-widget");
20
22
  require("../../../src/browser/style/dirty-diff.css");
21
23
  function bindDirtyDiff(bind) {
22
24
  bind(dirty_diff_decorator_1.DirtyDiffDecorator).toSelf().inSingletonScope();
25
+ bind(dirty_diff_navigator_1.DirtyDiffNavigator).toSelf().inSingletonScope();
26
+ bind(dirty_diff_widget_1.DirtyDiffWidgetFactory).toFactory(({ container }) => props => {
27
+ const child = container.createChild();
28
+ child.bind(dirty_diff_widget_1.DirtyDiffWidgetProps).toConstantValue(props);
29
+ child.bind(dirty_diff_widget_1.DirtyDiffWidget).toSelf();
30
+ return child.get(dirty_diff_widget_1.DirtyDiffWidget);
31
+ });
23
32
  }
24
33
  exports.bindDirtyDiff = bindDirtyDiff;
25
34
  //# sourceMappingURL=dirty-diff-module.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"dirty-diff-module.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,iEAA4D;AAE5D,qDAAmD;AAEnD,SAAgB,aAAa,CAAC,IAAqB;IAC/C,IAAI,CAAC,yCAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AACzD,CAAC;AAFD,sCAEC"}
1
+ {"version":3,"file":"dirty-diff-module.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,iEAA4D;AAC5D,iEAA4D;AAC5D,2DAAoG;AAEpG,qDAAmD;AAEnD,SAAgB,aAAa,CAAC,IAAqB;IAC/C,IAAI,CAAC,yCAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,yCAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE;QAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,wCAAoB,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACxD,KAAK,CAAC,IAAI,CAAC,mCAAe,CAAC,CAAC,MAAM,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC,GAAG,CAAC,mCAAe,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC;AATD,sCASC"}
@@ -0,0 +1,49 @@
1
+ import { Disposable, DisposableCollection, URI } from '@theia/core';
2
+ import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
3
+ import { EditorManager, EditorMouseEvent, TextEditor } from '@theia/editor/lib/browser';
4
+ import { Change } from './diff-computer';
5
+ import { DirtyDiffUpdate } from './dirty-diff-decorator';
6
+ import { DirtyDiffWidget, DirtyDiffWidgetFactory } from './dirty-diff-widget';
7
+ export declare class DirtyDiffNavigator {
8
+ protected readonly controllers: Map<TextEditor, DirtyDiffController>;
9
+ protected readonly contextKeyService: ContextKeyService;
10
+ protected readonly editorManager: EditorManager;
11
+ protected readonly widgetFactory: DirtyDiffWidgetFactory;
12
+ protected init(): void;
13
+ handleDirtyDiffUpdate(update: DirtyDiffUpdate): void;
14
+ canNavigate(): boolean;
15
+ gotoNextChange(): void;
16
+ gotoPreviousChange(): void;
17
+ canShowChange(): boolean;
18
+ showNextChange(): void;
19
+ showPreviousChange(): void;
20
+ isShowingChange(): boolean;
21
+ closeChangePeekView(): void;
22
+ protected get activeController(): DirtyDiffController | undefined;
23
+ protected createController(editor: TextEditor): DirtyDiffController;
24
+ }
25
+ export declare class DirtyDiffController implements Disposable {
26
+ protected readonly editor: TextEditor;
27
+ protected readonly toDispose: DisposableCollection;
28
+ widgetFactory?: DirtyDiffWidgetFactory;
29
+ protected widget?: DirtyDiffWidget;
30
+ protected dirtyDiff?: DirtyDiffUpdate;
31
+ constructor(editor: TextEditor);
32
+ dispose(): void;
33
+ handleDirtyDiffUpdate(dirtyDiff: DirtyDiffUpdate): void;
34
+ canNavigate(): boolean;
35
+ gotoNextChange(): void;
36
+ gotoPreviousChange(): void;
37
+ canShowChange(): boolean;
38
+ showNextChange(): void;
39
+ showPreviousChange(): void;
40
+ isShowingChange(): boolean;
41
+ closeWidget(): void;
42
+ protected get changes(): readonly Change[] | undefined;
43
+ protected get previousRevisionUri(): URI | undefined;
44
+ protected createWidget(): DirtyDiffWidget | undefined;
45
+ protected findNextClosestChange(line: number, inclusive: boolean): number;
46
+ protected findPreviousClosestChange(line: number, inclusive: boolean): number;
47
+ protected handleEditorMouseDown({ event, target }: EditorMouseEvent): void;
48
+ }
49
+ //# sourceMappingURL=dirty-diff-navigator.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dirty-diff-navigator.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-navigator.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAc,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAmB,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEzG,OAAO,EAAE,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,qBACa,kBAAkB;IAE3B,SAAS,CAAC,QAAQ,CAAC,WAAW,uCAA8C;IAG5E,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,sBAAsB,CAAC;IAGzD,SAAS,CAAC,IAAI,IAAI,IAAI;IA+BtB,qBAAqB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAKpD,WAAW,IAAI,OAAO;IAItB,cAAc,IAAI,IAAI;IAItB,kBAAkB,IAAI,IAAI;IAI1B,aAAa,IAAI,OAAO;IAIxB,cAAc,IAAI,IAAI;IAItB,kBAAkB,IAAI,IAAI;IAI1B,eAAe,IAAI,OAAO;IAI1B,mBAAmB,IAAI,IAAI;IAI3B,SAAS,KAAK,gBAAgB,IAAI,mBAAmB,GAAG,SAAS,CAGhE;IAED,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,mBAAmB;CAGtE;AAED,qBAAa,mBAAoB,YAAW,UAAU;IAQtC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU;IANjD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAE1D,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,SAAS,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC;IACnC,SAAS,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC;gBAEP,MAAM,EAAE,UAAU;IAIjD,OAAO,IAAI,IAAI;IAKf,qBAAqB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAOvD,WAAW,IAAI,OAAO;IAItB,cAAc,IAAI,IAAI;IAWtB,kBAAkB,IAAI,IAAI;IAW1B,aAAa,IAAI,OAAO;IAIxB,cAAc,IAAI,IAAI;IAStB,kBAAkB,IAAI,IAAI;IAS1B,eAAe,IAAI,OAAO;IAI1B,WAAW,IAAI,IAAI;IAOnB,SAAS,KAAK,OAAO,IAAI,SAAS,MAAM,EAAE,GAAG,SAAS,CAErD;IAED,SAAS,KAAK,mBAAmB,IAAI,GAAG,GAAG,SAAS,CAEnD;IAED,SAAS,CAAC,YAAY,IAAI,eAAe,GAAG,SAAS;IAWrD,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM;IAqBzE,SAAS,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM;IAqB7E,SAAS,CAAC,qBAAqB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,gBAAgB,GAAG,IAAI;CAyB7E"}