@theia/scm 1.45.0 → 1.46.0-next.72
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.
- package/README.md +31 -31
- package/lib/browser/decorations/scm-decorations-service.d.ts +14 -14
- package/lib/browser/decorations/scm-decorations-service.js +101 -101
- package/lib/browser/decorations/scm-navigator-decorator.d.ts +25 -25
- package/lib/browser/decorations/scm-navigator-decorator.js +132 -132
- package/lib/browser/decorations/scm-tab-bar-decorator.d.ts +17 -17
- package/lib/browser/decorations/scm-tab-bar-decorator.js +93 -93
- package/lib/browser/dirty-diff/content-lines.d.ts +12 -12
- package/lib/browser/dirty-diff/content-lines.js +106 -106
- package/lib/browser/dirty-diff/content-lines.spec.d.ts +1 -1
- package/lib/browser/dirty-diff/content-lines.spec.js +39 -39
- package/lib/browser/dirty-diff/diff-computer.d.ts +29 -29
- package/lib/browser/dirty-diff/diff-computer.js +102 -102
- package/lib/browser/dirty-diff/diff-computer.spec.d.ts +1 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js +315 -315
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts +14 -14
- package/lib/browser/dirty-diff/dirty-diff-decorator.js +98 -98
- package/lib/browser/dirty-diff/dirty-diff-module.d.ts +3 -3
- package/lib/browser/dirty-diff/dirty-diff-module.js +24 -24
- package/lib/browser/scm-amend-component.d.ts +123 -123
- package/lib/browser/scm-amend-component.js +463 -463
- package/lib/browser/scm-amend-widget.d.ts +20 -20
- package/lib/browser/scm-amend-widget.js +101 -101
- package/lib/browser/scm-avatar-service.d.ts +3 -3
- package/lib/browser/scm-avatar-service.js +36 -36
- package/lib/browser/scm-commit-widget.d.ts +52 -52
- package/lib/browser/scm-commit-widget.js +199 -199
- package/lib/browser/scm-context-key-service.d.ts +10 -10
- package/lib/browser/scm-context-key-service.js +58 -58
- package/lib/browser/scm-contribution.d.ts +83 -83
- package/lib/browser/scm-contribution.js +356 -356
- package/lib/browser/scm-frontend-module.d.ts +6 -6
- package/lib/browser/scm-frontend-module.js +130 -130
- package/lib/browser/scm-groups-tree-model.d.ts +14 -14
- package/lib/browser/scm-groups-tree-model.js +97 -97
- package/lib/browser/scm-input.d.ts +53 -53
- package/lib/browser/scm-input.js +127 -127
- package/lib/browser/scm-layout-migrations.d.ts +9 -9
- package/lib/browser/scm-layout-migrations.js +79 -79
- package/lib/browser/scm-no-repository-widget.d.ts +8 -8
- package/lib/browser/scm-no-repository-widget.js +49 -49
- package/lib/browser/scm-preferences.d.ts +11 -11
- package/lib/browser/scm-preferences.js +51 -51
- package/lib/browser/scm-provider.d.ts +58 -58
- package/lib/browser/scm-provider.js +19 -19
- package/lib/browser/scm-quick-open-service.d.ts +11 -11
- package/lib/browser/scm-quick-open-service.js +73 -73
- package/lib/browser/scm-repository.d.ts +17 -17
- package/lib/browser/scm-repository.js +41 -41
- package/lib/browser/scm-service.d.ts +26 -26
- package/lib/browser/scm-service.js +108 -108
- package/lib/browser/scm-tree-label-provider.d.ts +7 -7
- package/lib/browser/scm-tree-label-provider.js +57 -57
- package/lib/browser/scm-tree-model.d.ts +74 -74
- package/lib/browser/scm-tree-model.js +351 -351
- package/lib/browser/scm-tree-widget.d.ts +208 -208
- package/lib/browser/scm-tree-widget.js +703 -703
- package/lib/browser/scm-widget.d.ts +40 -40
- package/lib/browser/scm-widget.js +218 -218
- package/package.json +6 -6
- package/src/browser/decorations/scm-decorations-service.ts +78 -78
- package/src/browser/decorations/scm-navigator-decorator.ts +121 -121
- package/src/browser/decorations/scm-tab-bar-decorator.ts +83 -83
- package/src/browser/dirty-diff/content-lines.spec.ts +42 -42
- package/src/browser/dirty-diff/content-lines.ts +112 -112
- package/src/browser/dirty-diff/diff-computer.spec.ts +387 -387
- package/src/browser/dirty-diff/diff-computer.ts +129 -129
- package/src/browser/dirty-diff/dirty-diff-decorator.ts +107 -107
- package/src/browser/dirty-diff/dirty-diff-module.ts +24 -24
- package/src/browser/scm-amend-component.tsx +600 -600
- package/src/browser/scm-amend-widget.tsx +77 -77
- package/src/browser/scm-avatar-service.ts +27 -27
- package/src/browser/scm-commit-widget.tsx +215 -215
- package/src/browser/scm-context-key-service.ts +46 -46
- package/src/browser/scm-contribution.ts +361 -361
- package/src/browser/scm-frontend-module.ts +149 -149
- package/src/browser/scm-groups-tree-model.ts +78 -78
- package/src/browser/scm-input.ts +164 -164
- package/src/browser/scm-layout-migrations.ts +64 -64
- package/src/browser/scm-no-repository-widget.tsx +41 -41
- package/src/browser/scm-preferences.ts +63 -63
- package/src/browser/scm-provider.ts +91 -91
- package/src/browser/scm-quick-open-service.ts +48 -48
- package/src/browser/scm-repository.ts +52 -52
- package/src/browser/scm-service.ts +108 -108
- package/src/browser/scm-tree-label-provider.ts +44 -44
- package/src/browser/scm-tree-model.ts +405 -405
- package/src/browser/scm-tree-widget.tsx +838 -838
- package/src/browser/scm-widget.tsx +204 -204
- package/src/browser/style/dirty-diff-decorator.css +52 -52
- package/src/browser/style/dirty-diff.css +50 -50
- package/src/browser/style/index.css +271 -271
- package/src/browser/style/scm-amend-component.css +94 -94
- package/src/browser/style/scm.svg +4 -4
|
@@ -1,352 +1,352 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// *****************************************************************************
|
|
3
|
-
// Copyright (C) 2020 Arm and others.
|
|
4
|
-
//
|
|
5
|
-
// This program and the accompanying materials are made available under the
|
|
6
|
-
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
-
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
-
//
|
|
9
|
-
// This Source Code may also be made available under the following Secondary
|
|
10
|
-
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
-
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
-
// with the GNU Classpath Exception which is available at
|
|
13
|
-
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
-
//
|
|
15
|
-
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
-
// *****************************************************************************
|
|
17
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
-
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.ScmTreeModel = exports.ScmFileChangeNode = exports.ScmFileChangeFolderNode = exports.ScmFileChangeGroupNode = exports.ScmTreeModelProps = void 0;
|
|
28
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
29
|
-
const tree_1 = require("@theia/core/lib/browser/tree");
|
|
30
|
-
const uri_1 = require("@theia/core/lib/common/uri");
|
|
31
|
-
const scm_context_key_service_1 = require("./scm-context-key-service");
|
|
32
|
-
exports.ScmTreeModelProps = Symbol('ScmTreeModelProps');
|
|
33
|
-
var ScmFileChangeGroupNode;
|
|
34
|
-
(function (ScmFileChangeGroupNode) {
|
|
35
|
-
function is(node) {
|
|
36
|
-
return 'groupId' in node && 'children' in node
|
|
37
|
-
&& !ScmFileChangeFolderNode.is(node);
|
|
38
|
-
}
|
|
39
|
-
ScmFileChangeGroupNode.is = is;
|
|
40
|
-
})(ScmFileChangeGroupNode = exports.ScmFileChangeGroupNode || (exports.ScmFileChangeGroupNode = {}));
|
|
41
|
-
var ScmFileChangeFolderNode;
|
|
42
|
-
(function (ScmFileChangeFolderNode) {
|
|
43
|
-
function is(node) {
|
|
44
|
-
return 'groupId' in node && 'sourceUri' in node && 'path' in node && 'children' in node;
|
|
45
|
-
}
|
|
46
|
-
ScmFileChangeFolderNode.is = is;
|
|
47
|
-
})(ScmFileChangeFolderNode = exports.ScmFileChangeFolderNode || (exports.ScmFileChangeFolderNode = {}));
|
|
48
|
-
var ScmFileChangeNode;
|
|
49
|
-
(function (ScmFileChangeNode) {
|
|
50
|
-
function is(node) {
|
|
51
|
-
return 'sourceUri' in node
|
|
52
|
-
&& !ScmFileChangeFolderNode.is(node);
|
|
53
|
-
}
|
|
54
|
-
ScmFileChangeNode.is = is;
|
|
55
|
-
function getGroupId(node) {
|
|
56
|
-
const parentNode = node.parent;
|
|
57
|
-
if (!(parentNode && (ScmFileChangeFolderNode.is(parentNode) || ScmFileChangeGroupNode.is(parentNode)))) {
|
|
58
|
-
throw new Error('bad node');
|
|
59
|
-
}
|
|
60
|
-
return parentNode.groupId;
|
|
61
|
-
}
|
|
62
|
-
ScmFileChangeNode.getGroupId = getGroupId;
|
|
63
|
-
})(ScmFileChangeNode = exports.ScmFileChangeNode || (exports.ScmFileChangeNode = {}));
|
|
64
|
-
let ScmTreeModel = class ScmTreeModel extends tree_1.TreeModelImpl {
|
|
65
|
-
constructor() {
|
|
66
|
-
super(...arguments);
|
|
67
|
-
this._viewMode = 'list';
|
|
68
|
-
this.compareNodes = (a, b) => this.doCompareNodes(a, b);
|
|
69
|
-
}
|
|
70
|
-
get languageId() {
|
|
71
|
-
return this._languageId;
|
|
72
|
-
}
|
|
73
|
-
set viewMode(id) {
|
|
74
|
-
const oldSelection = this.selectedNodes;
|
|
75
|
-
this._viewMode = id;
|
|
76
|
-
if (this.root) {
|
|
77
|
-
this.root = this.createTree();
|
|
78
|
-
for (const oldSelectedNode of oldSelection) {
|
|
79
|
-
const newNode = this.getNode(oldSelectedNode.id);
|
|
80
|
-
if (tree_1.SelectableTreeNode.is(newNode)) {
|
|
81
|
-
this.revealNode(newNode); // this call can run asynchronously
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
get viewMode() {
|
|
87
|
-
return this._viewMode;
|
|
88
|
-
}
|
|
89
|
-
createTree() {
|
|
90
|
-
const root = {
|
|
91
|
-
id: 'file-change-tree-root',
|
|
92
|
-
parent: undefined,
|
|
93
|
-
visible: false,
|
|
94
|
-
rootUri: this.rootUri,
|
|
95
|
-
children: []
|
|
96
|
-
};
|
|
97
|
-
const groupNodes = this.groups
|
|
98
|
-
.filter(group => !!group.resources.length || !group.hideWhenEmpty)
|
|
99
|
-
.map(group => this.toGroupNode(group, root));
|
|
100
|
-
root.children = groupNodes;
|
|
101
|
-
return root;
|
|
102
|
-
}
|
|
103
|
-
toGroupNode(group, parent) {
|
|
104
|
-
const groupNode = {
|
|
105
|
-
id: `${group.id}`,
|
|
106
|
-
groupId: group.id,
|
|
107
|
-
groupLabel: group.label,
|
|
108
|
-
parent,
|
|
109
|
-
children: [],
|
|
110
|
-
expanded: true,
|
|
111
|
-
};
|
|
112
|
-
const sortedResources = group.resources.sort((r1, r2) => r1.sourceUri.toString().localeCompare(r2.sourceUri.toString()));
|
|
113
|
-
switch (this._viewMode) {
|
|
114
|
-
case 'list':
|
|
115
|
-
groupNode.children = sortedResources.map(resource => this.toFileChangeNode(resource, groupNode));
|
|
116
|
-
break;
|
|
117
|
-
case 'tree':
|
|
118
|
-
const rootUri = group.provider.rootUri;
|
|
119
|
-
if (rootUri) {
|
|
120
|
-
const resourcePaths = sortedResources.map(resource => {
|
|
121
|
-
const relativePath = new uri_1.default(rootUri).relative(resource.sourceUri);
|
|
122
|
-
const pathParts = relativePath ? relativePath.toString().split('/') : [];
|
|
123
|
-
return { resource, pathParts };
|
|
124
|
-
});
|
|
125
|
-
groupNode.children = this.buildFileChangeTree(resourcePaths, 0, sortedResources.length, 0, groupNode);
|
|
126
|
-
}
|
|
127
|
-
break;
|
|
128
|
-
}
|
|
129
|
-
return groupNode;
|
|
130
|
-
}
|
|
131
|
-
buildFileChangeTree(sortedResources, start, end, level, parent) {
|
|
132
|
-
const result = [];
|
|
133
|
-
let folderStart = start;
|
|
134
|
-
while (folderStart < end) {
|
|
135
|
-
const firstFileChange = sortedResources[folderStart];
|
|
136
|
-
if (level === firstFileChange.pathParts.length - 1) {
|
|
137
|
-
result.push(this.toFileChangeNode(firstFileChange.resource, parent));
|
|
138
|
-
folderStart++;
|
|
139
|
-
}
|
|
140
|
-
else {
|
|
141
|
-
let index = folderStart + 1;
|
|
142
|
-
while (index < end) {
|
|
143
|
-
if (sortedResources[index].pathParts[level] !== firstFileChange.pathParts[level]) {
|
|
144
|
-
break;
|
|
145
|
-
}
|
|
146
|
-
index++;
|
|
147
|
-
}
|
|
148
|
-
const folderEnd = index;
|
|
149
|
-
const nestingThreshold = this.props.nestingThreshold || 1;
|
|
150
|
-
if (folderEnd - folderStart < nestingThreshold) {
|
|
151
|
-
// Inline these (i.e. do not create another level in the tree)
|
|
152
|
-
for (let i = folderStart; i < folderEnd; i++) {
|
|
153
|
-
result.push(this.toFileChangeNode(sortedResources[i].resource, parent));
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
else {
|
|
157
|
-
const firstFileParts = firstFileChange.pathParts;
|
|
158
|
-
const lastFileParts = sortedResources[folderEnd - 1].pathParts;
|
|
159
|
-
// Multiple files with first folder.
|
|
160
|
-
// See if more folder levels match and include those if so.
|
|
161
|
-
let thisLevel = level + 1;
|
|
162
|
-
while (thisLevel < firstFileParts.length - 1 && thisLevel < lastFileParts.length - 1 && firstFileParts[thisLevel] === lastFileParts[thisLevel]) {
|
|
163
|
-
thisLevel++;
|
|
164
|
-
}
|
|
165
|
-
const nodeRelativePath = firstFileParts.slice(level, thisLevel).join('/');
|
|
166
|
-
result.push(this.toFileChangeFolderNode(sortedResources, folderStart, folderEnd, thisLevel, nodeRelativePath, parent));
|
|
167
|
-
}
|
|
168
|
-
folderStart = folderEnd;
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
;
|
|
172
|
-
return result.sort(this.compareNodes);
|
|
173
|
-
}
|
|
174
|
-
doCompareNodes(a, b) {
|
|
175
|
-
const isFolderA = ScmFileChangeFolderNode.is(a);
|
|
176
|
-
const isFolderB = ScmFileChangeFolderNode.is(b);
|
|
177
|
-
if (isFolderA && !isFolderB) {
|
|
178
|
-
return -1;
|
|
179
|
-
}
|
|
180
|
-
if (isFolderB && !isFolderA) {
|
|
181
|
-
return 1;
|
|
182
|
-
}
|
|
183
|
-
return a.sourceUri.localeCompare(b.sourceUri);
|
|
184
|
-
}
|
|
185
|
-
toFileChangeFolderNode(resources, start, end, level, nodeRelativePath, parent) {
|
|
186
|
-
const rootUri = this.getRoot(parent).rootUri;
|
|
187
|
-
let parentPath = rootUri;
|
|
188
|
-
if (ScmFileChangeFolderNode.is(parent)) {
|
|
189
|
-
parentPath = parent.sourceUri;
|
|
190
|
-
}
|
|
191
|
-
const sourceUri = new uri_1.default(parentPath).resolve(nodeRelativePath);
|
|
192
|
-
const defaultExpansion = this.props.defaultExpansion ? (this.props.defaultExpansion === 'expanded') : true;
|
|
193
|
-
const id = `${parent.groupId}:${String(sourceUri)}`;
|
|
194
|
-
const oldNode = this.getNode(id);
|
|
195
|
-
const folderNode = {
|
|
196
|
-
id,
|
|
197
|
-
groupId: parent.groupId,
|
|
198
|
-
path: nodeRelativePath,
|
|
199
|
-
sourceUri: String(sourceUri),
|
|
200
|
-
children: [],
|
|
201
|
-
parent,
|
|
202
|
-
expanded: tree_1.ExpandableTreeNode.is(oldNode) ? oldNode.expanded : defaultExpansion,
|
|
203
|
-
selected: tree_1.SelectableTreeNode.is(oldNode) && oldNode.selected,
|
|
204
|
-
};
|
|
205
|
-
folderNode.children = this.buildFileChangeTree(resources, start, end, level, folderNode);
|
|
206
|
-
return folderNode;
|
|
207
|
-
}
|
|
208
|
-
getRoot(node) {
|
|
209
|
-
let parent = node.parent;
|
|
210
|
-
while (ScmFileChangeGroupNode.is(parent) && ScmFileChangeFolderNode.is(parent)) {
|
|
211
|
-
parent = parent.parent;
|
|
212
|
-
}
|
|
213
|
-
return parent;
|
|
214
|
-
}
|
|
215
|
-
toFileChangeNode(resource, parent) {
|
|
216
|
-
const id = `${resource.group.id}:${String(resource.sourceUri)}`;
|
|
217
|
-
const oldNode = this.getNode(id);
|
|
218
|
-
const node = {
|
|
219
|
-
id,
|
|
220
|
-
sourceUri: String(resource.sourceUri),
|
|
221
|
-
decorations: resource.decorations,
|
|
222
|
-
parent,
|
|
223
|
-
selected: tree_1.SelectableTreeNode.is(oldNode) && oldNode.selected,
|
|
224
|
-
};
|
|
225
|
-
if (node.selected) {
|
|
226
|
-
this.selectionService.addSelection(node);
|
|
227
|
-
}
|
|
228
|
-
return node;
|
|
229
|
-
}
|
|
230
|
-
async revealNode(node) {
|
|
231
|
-
if (ScmFileChangeFolderNode.is(node) || ScmFileChangeNode.is(node)) {
|
|
232
|
-
const parentNode = node.parent;
|
|
233
|
-
if (tree_1.ExpandableTreeNode.is(parentNode)) {
|
|
234
|
-
await this.revealNode(parentNode);
|
|
235
|
-
if (!parentNode.expanded) {
|
|
236
|
-
await this.expandNode(parentNode);
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
getResourceFromNode(node) {
|
|
242
|
-
const groupId = ScmFileChangeNode.getGroupId(node);
|
|
243
|
-
const group = this.findGroup(groupId);
|
|
244
|
-
if (group) {
|
|
245
|
-
return group.resources.find(r => String(r.sourceUri) === node.sourceUri);
|
|
246
|
-
}
|
|
247
|
-
}
|
|
248
|
-
getResourceGroupFromNode(node) {
|
|
249
|
-
return this.findGroup(node.groupId);
|
|
250
|
-
}
|
|
251
|
-
getResourcesFromFolderNode(node) {
|
|
252
|
-
const resources = [];
|
|
253
|
-
const group = this.findGroup(node.groupId);
|
|
254
|
-
if (group) {
|
|
255
|
-
this.collectResources(resources, node, group);
|
|
256
|
-
}
|
|
257
|
-
return resources;
|
|
258
|
-
}
|
|
259
|
-
getSelectionArgs(selectedNodes) {
|
|
260
|
-
const resources = [];
|
|
261
|
-
for (const node of selectedNodes) {
|
|
262
|
-
if (ScmFileChangeNode.is(node)) {
|
|
263
|
-
const groupId = ScmFileChangeNode.getGroupId(node);
|
|
264
|
-
const group = this.findGroup(groupId);
|
|
265
|
-
if (group) {
|
|
266
|
-
const selectedResource = group.resources.find(r => String(r.sourceUri) === node.sourceUri);
|
|
267
|
-
if (selectedResource) {
|
|
268
|
-
resources.push(selectedResource);
|
|
269
|
-
}
|
|
270
|
-
}
|
|
271
|
-
}
|
|
272
|
-
if (ScmFileChangeFolderNode.is(node)) {
|
|
273
|
-
const group = this.findGroup(node.groupId);
|
|
274
|
-
if (group) {
|
|
275
|
-
this.collectResources(resources, node, group);
|
|
276
|
-
}
|
|
277
|
-
}
|
|
278
|
-
}
|
|
279
|
-
// Remove duplicates which may occur if user selected folder and nested folder
|
|
280
|
-
return resources.filter((item1, index) => resources.findIndex(item2 => item1.sourceUri === item2.sourceUri) === index);
|
|
281
|
-
}
|
|
282
|
-
collectResources(resources, node, group) {
|
|
283
|
-
if (ScmFileChangeFolderNode.is(node)) {
|
|
284
|
-
for (const child of node.children) {
|
|
285
|
-
this.collectResources(resources, child, group);
|
|
286
|
-
}
|
|
287
|
-
}
|
|
288
|
-
else if (ScmFileChangeNode.is(node)) {
|
|
289
|
-
const resource = group.resources.find(r => String(r.sourceUri) === node.sourceUri);
|
|
290
|
-
resources.push(resource);
|
|
291
|
-
}
|
|
292
|
-
}
|
|
293
|
-
execInNodeContext(node, callback) {
|
|
294
|
-
if (!this.provider) {
|
|
295
|
-
return;
|
|
296
|
-
}
|
|
297
|
-
let groupId;
|
|
298
|
-
if (ScmFileChangeGroupNode.is(node) || ScmFileChangeFolderNode.is(node)) {
|
|
299
|
-
groupId = node.groupId;
|
|
300
|
-
}
|
|
301
|
-
else if (ScmFileChangeNode.is(node)) {
|
|
302
|
-
groupId = ScmFileChangeNode.getGroupId(node);
|
|
303
|
-
}
|
|
304
|
-
else {
|
|
305
|
-
return;
|
|
306
|
-
}
|
|
307
|
-
this.contextKeys.scmProvider.set(this.provider.id);
|
|
308
|
-
this.contextKeys.scmResourceGroup.set(groupId);
|
|
309
|
-
try {
|
|
310
|
-
callback();
|
|
311
|
-
}
|
|
312
|
-
finally {
|
|
313
|
-
}
|
|
314
|
-
}
|
|
315
|
-
/*
|
|
316
|
-
* Normally the group would always be expected to be found. However if the tree is restored
|
|
317
|
-
* in restoreState then the tree may be rendered before the groups have been created
|
|
318
|
-
* in the provider. The provider's groups property will be empty in such a situation.
|
|
319
|
-
* We want to render the tree (as that is the point of restoreState, we can render
|
|
320
|
-
* the tree in the saved state before the provider has provided status). We therefore must
|
|
321
|
-
* be prepared to render the tree without having the ScmResourceGroup or ScmResource
|
|
322
|
-
* objects.
|
|
323
|
-
*/
|
|
324
|
-
findGroup(groupId) {
|
|
325
|
-
return this.groups.find(g => g.id === groupId);
|
|
326
|
-
}
|
|
327
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
328
|
-
storeState() {
|
|
329
|
-
return {
|
|
330
|
-
...super.storeState(),
|
|
331
|
-
mode: this.viewMode,
|
|
332
|
-
};
|
|
333
|
-
}
|
|
334
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
335
|
-
restoreState(oldState) {
|
|
336
|
-
super.restoreState(oldState);
|
|
337
|
-
this.viewMode = oldState.mode === 'tree' ? 'tree' : 'list';
|
|
338
|
-
}
|
|
339
|
-
};
|
|
340
|
-
__decorate([
|
|
341
|
-
(0, inversify_1.inject)(tree_1.TreeProps),
|
|
342
|
-
__metadata("design:type", Object)
|
|
343
|
-
], ScmTreeModel.prototype, "props", void 0);
|
|
344
|
-
__decorate([
|
|
345
|
-
(0, inversify_1.inject)(scm_context_key_service_1.ScmContextKeyService),
|
|
346
|
-
__metadata("design:type", scm_context_key_service_1.ScmContextKeyService)
|
|
347
|
-
], ScmTreeModel.prototype, "contextKeys", void 0);
|
|
348
|
-
ScmTreeModel = __decorate([
|
|
349
|
-
(0, inversify_1.injectable)()
|
|
350
|
-
], ScmTreeModel);
|
|
351
|
-
exports.ScmTreeModel = ScmTreeModel;
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2020 Arm and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
+
};
|
|
23
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
+
};
|
|
26
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
+
exports.ScmTreeModel = exports.ScmFileChangeNode = exports.ScmFileChangeFolderNode = exports.ScmFileChangeGroupNode = exports.ScmTreeModelProps = void 0;
|
|
28
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
29
|
+
const tree_1 = require("@theia/core/lib/browser/tree");
|
|
30
|
+
const uri_1 = require("@theia/core/lib/common/uri");
|
|
31
|
+
const scm_context_key_service_1 = require("./scm-context-key-service");
|
|
32
|
+
exports.ScmTreeModelProps = Symbol('ScmTreeModelProps');
|
|
33
|
+
var ScmFileChangeGroupNode;
|
|
34
|
+
(function (ScmFileChangeGroupNode) {
|
|
35
|
+
function is(node) {
|
|
36
|
+
return 'groupId' in node && 'children' in node
|
|
37
|
+
&& !ScmFileChangeFolderNode.is(node);
|
|
38
|
+
}
|
|
39
|
+
ScmFileChangeGroupNode.is = is;
|
|
40
|
+
})(ScmFileChangeGroupNode = exports.ScmFileChangeGroupNode || (exports.ScmFileChangeGroupNode = {}));
|
|
41
|
+
var ScmFileChangeFolderNode;
|
|
42
|
+
(function (ScmFileChangeFolderNode) {
|
|
43
|
+
function is(node) {
|
|
44
|
+
return 'groupId' in node && 'sourceUri' in node && 'path' in node && 'children' in node;
|
|
45
|
+
}
|
|
46
|
+
ScmFileChangeFolderNode.is = is;
|
|
47
|
+
})(ScmFileChangeFolderNode = exports.ScmFileChangeFolderNode || (exports.ScmFileChangeFolderNode = {}));
|
|
48
|
+
var ScmFileChangeNode;
|
|
49
|
+
(function (ScmFileChangeNode) {
|
|
50
|
+
function is(node) {
|
|
51
|
+
return 'sourceUri' in node
|
|
52
|
+
&& !ScmFileChangeFolderNode.is(node);
|
|
53
|
+
}
|
|
54
|
+
ScmFileChangeNode.is = is;
|
|
55
|
+
function getGroupId(node) {
|
|
56
|
+
const parentNode = node.parent;
|
|
57
|
+
if (!(parentNode && (ScmFileChangeFolderNode.is(parentNode) || ScmFileChangeGroupNode.is(parentNode)))) {
|
|
58
|
+
throw new Error('bad node');
|
|
59
|
+
}
|
|
60
|
+
return parentNode.groupId;
|
|
61
|
+
}
|
|
62
|
+
ScmFileChangeNode.getGroupId = getGroupId;
|
|
63
|
+
})(ScmFileChangeNode = exports.ScmFileChangeNode || (exports.ScmFileChangeNode = {}));
|
|
64
|
+
let ScmTreeModel = class ScmTreeModel extends tree_1.TreeModelImpl {
|
|
65
|
+
constructor() {
|
|
66
|
+
super(...arguments);
|
|
67
|
+
this._viewMode = 'list';
|
|
68
|
+
this.compareNodes = (a, b) => this.doCompareNodes(a, b);
|
|
69
|
+
}
|
|
70
|
+
get languageId() {
|
|
71
|
+
return this._languageId;
|
|
72
|
+
}
|
|
73
|
+
set viewMode(id) {
|
|
74
|
+
const oldSelection = this.selectedNodes;
|
|
75
|
+
this._viewMode = id;
|
|
76
|
+
if (this.root) {
|
|
77
|
+
this.root = this.createTree();
|
|
78
|
+
for (const oldSelectedNode of oldSelection) {
|
|
79
|
+
const newNode = this.getNode(oldSelectedNode.id);
|
|
80
|
+
if (tree_1.SelectableTreeNode.is(newNode)) {
|
|
81
|
+
this.revealNode(newNode); // this call can run asynchronously
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
get viewMode() {
|
|
87
|
+
return this._viewMode;
|
|
88
|
+
}
|
|
89
|
+
createTree() {
|
|
90
|
+
const root = {
|
|
91
|
+
id: 'file-change-tree-root',
|
|
92
|
+
parent: undefined,
|
|
93
|
+
visible: false,
|
|
94
|
+
rootUri: this.rootUri,
|
|
95
|
+
children: []
|
|
96
|
+
};
|
|
97
|
+
const groupNodes = this.groups
|
|
98
|
+
.filter(group => !!group.resources.length || !group.hideWhenEmpty)
|
|
99
|
+
.map(group => this.toGroupNode(group, root));
|
|
100
|
+
root.children = groupNodes;
|
|
101
|
+
return root;
|
|
102
|
+
}
|
|
103
|
+
toGroupNode(group, parent) {
|
|
104
|
+
const groupNode = {
|
|
105
|
+
id: `${group.id}`,
|
|
106
|
+
groupId: group.id,
|
|
107
|
+
groupLabel: group.label,
|
|
108
|
+
parent,
|
|
109
|
+
children: [],
|
|
110
|
+
expanded: true,
|
|
111
|
+
};
|
|
112
|
+
const sortedResources = group.resources.sort((r1, r2) => r1.sourceUri.toString().localeCompare(r2.sourceUri.toString()));
|
|
113
|
+
switch (this._viewMode) {
|
|
114
|
+
case 'list':
|
|
115
|
+
groupNode.children = sortedResources.map(resource => this.toFileChangeNode(resource, groupNode));
|
|
116
|
+
break;
|
|
117
|
+
case 'tree':
|
|
118
|
+
const rootUri = group.provider.rootUri;
|
|
119
|
+
if (rootUri) {
|
|
120
|
+
const resourcePaths = sortedResources.map(resource => {
|
|
121
|
+
const relativePath = new uri_1.default(rootUri).relative(resource.sourceUri);
|
|
122
|
+
const pathParts = relativePath ? relativePath.toString().split('/') : [];
|
|
123
|
+
return { resource, pathParts };
|
|
124
|
+
});
|
|
125
|
+
groupNode.children = this.buildFileChangeTree(resourcePaths, 0, sortedResources.length, 0, groupNode);
|
|
126
|
+
}
|
|
127
|
+
break;
|
|
128
|
+
}
|
|
129
|
+
return groupNode;
|
|
130
|
+
}
|
|
131
|
+
buildFileChangeTree(sortedResources, start, end, level, parent) {
|
|
132
|
+
const result = [];
|
|
133
|
+
let folderStart = start;
|
|
134
|
+
while (folderStart < end) {
|
|
135
|
+
const firstFileChange = sortedResources[folderStart];
|
|
136
|
+
if (level === firstFileChange.pathParts.length - 1) {
|
|
137
|
+
result.push(this.toFileChangeNode(firstFileChange.resource, parent));
|
|
138
|
+
folderStart++;
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
let index = folderStart + 1;
|
|
142
|
+
while (index < end) {
|
|
143
|
+
if (sortedResources[index].pathParts[level] !== firstFileChange.pathParts[level]) {
|
|
144
|
+
break;
|
|
145
|
+
}
|
|
146
|
+
index++;
|
|
147
|
+
}
|
|
148
|
+
const folderEnd = index;
|
|
149
|
+
const nestingThreshold = this.props.nestingThreshold || 1;
|
|
150
|
+
if (folderEnd - folderStart < nestingThreshold) {
|
|
151
|
+
// Inline these (i.e. do not create another level in the tree)
|
|
152
|
+
for (let i = folderStart; i < folderEnd; i++) {
|
|
153
|
+
result.push(this.toFileChangeNode(sortedResources[i].resource, parent));
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
const firstFileParts = firstFileChange.pathParts;
|
|
158
|
+
const lastFileParts = sortedResources[folderEnd - 1].pathParts;
|
|
159
|
+
// Multiple files with first folder.
|
|
160
|
+
// See if more folder levels match and include those if so.
|
|
161
|
+
let thisLevel = level + 1;
|
|
162
|
+
while (thisLevel < firstFileParts.length - 1 && thisLevel < lastFileParts.length - 1 && firstFileParts[thisLevel] === lastFileParts[thisLevel]) {
|
|
163
|
+
thisLevel++;
|
|
164
|
+
}
|
|
165
|
+
const nodeRelativePath = firstFileParts.slice(level, thisLevel).join('/');
|
|
166
|
+
result.push(this.toFileChangeFolderNode(sortedResources, folderStart, folderEnd, thisLevel, nodeRelativePath, parent));
|
|
167
|
+
}
|
|
168
|
+
folderStart = folderEnd;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
;
|
|
172
|
+
return result.sort(this.compareNodes);
|
|
173
|
+
}
|
|
174
|
+
doCompareNodes(a, b) {
|
|
175
|
+
const isFolderA = ScmFileChangeFolderNode.is(a);
|
|
176
|
+
const isFolderB = ScmFileChangeFolderNode.is(b);
|
|
177
|
+
if (isFolderA && !isFolderB) {
|
|
178
|
+
return -1;
|
|
179
|
+
}
|
|
180
|
+
if (isFolderB && !isFolderA) {
|
|
181
|
+
return 1;
|
|
182
|
+
}
|
|
183
|
+
return a.sourceUri.localeCompare(b.sourceUri);
|
|
184
|
+
}
|
|
185
|
+
toFileChangeFolderNode(resources, start, end, level, nodeRelativePath, parent) {
|
|
186
|
+
const rootUri = this.getRoot(parent).rootUri;
|
|
187
|
+
let parentPath = rootUri;
|
|
188
|
+
if (ScmFileChangeFolderNode.is(parent)) {
|
|
189
|
+
parentPath = parent.sourceUri;
|
|
190
|
+
}
|
|
191
|
+
const sourceUri = new uri_1.default(parentPath).resolve(nodeRelativePath);
|
|
192
|
+
const defaultExpansion = this.props.defaultExpansion ? (this.props.defaultExpansion === 'expanded') : true;
|
|
193
|
+
const id = `${parent.groupId}:${String(sourceUri)}`;
|
|
194
|
+
const oldNode = this.getNode(id);
|
|
195
|
+
const folderNode = {
|
|
196
|
+
id,
|
|
197
|
+
groupId: parent.groupId,
|
|
198
|
+
path: nodeRelativePath,
|
|
199
|
+
sourceUri: String(sourceUri),
|
|
200
|
+
children: [],
|
|
201
|
+
parent,
|
|
202
|
+
expanded: tree_1.ExpandableTreeNode.is(oldNode) ? oldNode.expanded : defaultExpansion,
|
|
203
|
+
selected: tree_1.SelectableTreeNode.is(oldNode) && oldNode.selected,
|
|
204
|
+
};
|
|
205
|
+
folderNode.children = this.buildFileChangeTree(resources, start, end, level, folderNode);
|
|
206
|
+
return folderNode;
|
|
207
|
+
}
|
|
208
|
+
getRoot(node) {
|
|
209
|
+
let parent = node.parent;
|
|
210
|
+
while (ScmFileChangeGroupNode.is(parent) && ScmFileChangeFolderNode.is(parent)) {
|
|
211
|
+
parent = parent.parent;
|
|
212
|
+
}
|
|
213
|
+
return parent;
|
|
214
|
+
}
|
|
215
|
+
toFileChangeNode(resource, parent) {
|
|
216
|
+
const id = `${resource.group.id}:${String(resource.sourceUri)}`;
|
|
217
|
+
const oldNode = this.getNode(id);
|
|
218
|
+
const node = {
|
|
219
|
+
id,
|
|
220
|
+
sourceUri: String(resource.sourceUri),
|
|
221
|
+
decorations: resource.decorations,
|
|
222
|
+
parent,
|
|
223
|
+
selected: tree_1.SelectableTreeNode.is(oldNode) && oldNode.selected,
|
|
224
|
+
};
|
|
225
|
+
if (node.selected) {
|
|
226
|
+
this.selectionService.addSelection(node);
|
|
227
|
+
}
|
|
228
|
+
return node;
|
|
229
|
+
}
|
|
230
|
+
async revealNode(node) {
|
|
231
|
+
if (ScmFileChangeFolderNode.is(node) || ScmFileChangeNode.is(node)) {
|
|
232
|
+
const parentNode = node.parent;
|
|
233
|
+
if (tree_1.ExpandableTreeNode.is(parentNode)) {
|
|
234
|
+
await this.revealNode(parentNode);
|
|
235
|
+
if (!parentNode.expanded) {
|
|
236
|
+
await this.expandNode(parentNode);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
getResourceFromNode(node) {
|
|
242
|
+
const groupId = ScmFileChangeNode.getGroupId(node);
|
|
243
|
+
const group = this.findGroup(groupId);
|
|
244
|
+
if (group) {
|
|
245
|
+
return group.resources.find(r => String(r.sourceUri) === node.sourceUri);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
getResourceGroupFromNode(node) {
|
|
249
|
+
return this.findGroup(node.groupId);
|
|
250
|
+
}
|
|
251
|
+
getResourcesFromFolderNode(node) {
|
|
252
|
+
const resources = [];
|
|
253
|
+
const group = this.findGroup(node.groupId);
|
|
254
|
+
if (group) {
|
|
255
|
+
this.collectResources(resources, node, group);
|
|
256
|
+
}
|
|
257
|
+
return resources;
|
|
258
|
+
}
|
|
259
|
+
getSelectionArgs(selectedNodes) {
|
|
260
|
+
const resources = [];
|
|
261
|
+
for (const node of selectedNodes) {
|
|
262
|
+
if (ScmFileChangeNode.is(node)) {
|
|
263
|
+
const groupId = ScmFileChangeNode.getGroupId(node);
|
|
264
|
+
const group = this.findGroup(groupId);
|
|
265
|
+
if (group) {
|
|
266
|
+
const selectedResource = group.resources.find(r => String(r.sourceUri) === node.sourceUri);
|
|
267
|
+
if (selectedResource) {
|
|
268
|
+
resources.push(selectedResource);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
if (ScmFileChangeFolderNode.is(node)) {
|
|
273
|
+
const group = this.findGroup(node.groupId);
|
|
274
|
+
if (group) {
|
|
275
|
+
this.collectResources(resources, node, group);
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
// Remove duplicates which may occur if user selected folder and nested folder
|
|
280
|
+
return resources.filter((item1, index) => resources.findIndex(item2 => item1.sourceUri === item2.sourceUri) === index);
|
|
281
|
+
}
|
|
282
|
+
collectResources(resources, node, group) {
|
|
283
|
+
if (ScmFileChangeFolderNode.is(node)) {
|
|
284
|
+
for (const child of node.children) {
|
|
285
|
+
this.collectResources(resources, child, group);
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
else if (ScmFileChangeNode.is(node)) {
|
|
289
|
+
const resource = group.resources.find(r => String(r.sourceUri) === node.sourceUri);
|
|
290
|
+
resources.push(resource);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
execInNodeContext(node, callback) {
|
|
294
|
+
if (!this.provider) {
|
|
295
|
+
return;
|
|
296
|
+
}
|
|
297
|
+
let groupId;
|
|
298
|
+
if (ScmFileChangeGroupNode.is(node) || ScmFileChangeFolderNode.is(node)) {
|
|
299
|
+
groupId = node.groupId;
|
|
300
|
+
}
|
|
301
|
+
else if (ScmFileChangeNode.is(node)) {
|
|
302
|
+
groupId = ScmFileChangeNode.getGroupId(node);
|
|
303
|
+
}
|
|
304
|
+
else {
|
|
305
|
+
return;
|
|
306
|
+
}
|
|
307
|
+
this.contextKeys.scmProvider.set(this.provider.id);
|
|
308
|
+
this.contextKeys.scmResourceGroup.set(groupId);
|
|
309
|
+
try {
|
|
310
|
+
callback();
|
|
311
|
+
}
|
|
312
|
+
finally {
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
/*
|
|
316
|
+
* Normally the group would always be expected to be found. However if the tree is restored
|
|
317
|
+
* in restoreState then the tree may be rendered before the groups have been created
|
|
318
|
+
* in the provider. The provider's groups property will be empty in such a situation.
|
|
319
|
+
* We want to render the tree (as that is the point of restoreState, we can render
|
|
320
|
+
* the tree in the saved state before the provider has provided status). We therefore must
|
|
321
|
+
* be prepared to render the tree without having the ScmResourceGroup or ScmResource
|
|
322
|
+
* objects.
|
|
323
|
+
*/
|
|
324
|
+
findGroup(groupId) {
|
|
325
|
+
return this.groups.find(g => g.id === groupId);
|
|
326
|
+
}
|
|
327
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
328
|
+
storeState() {
|
|
329
|
+
return {
|
|
330
|
+
...super.storeState(),
|
|
331
|
+
mode: this.viewMode,
|
|
332
|
+
};
|
|
333
|
+
}
|
|
334
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
335
|
+
restoreState(oldState) {
|
|
336
|
+
super.restoreState(oldState);
|
|
337
|
+
this.viewMode = oldState.mode === 'tree' ? 'tree' : 'list';
|
|
338
|
+
}
|
|
339
|
+
};
|
|
340
|
+
__decorate([
|
|
341
|
+
(0, inversify_1.inject)(tree_1.TreeProps),
|
|
342
|
+
__metadata("design:type", Object)
|
|
343
|
+
], ScmTreeModel.prototype, "props", void 0);
|
|
344
|
+
__decorate([
|
|
345
|
+
(0, inversify_1.inject)(scm_context_key_service_1.ScmContextKeyService),
|
|
346
|
+
__metadata("design:type", scm_context_key_service_1.ScmContextKeyService)
|
|
347
|
+
], ScmTreeModel.prototype, "contextKeys", void 0);
|
|
348
|
+
ScmTreeModel = __decorate([
|
|
349
|
+
(0, inversify_1.injectable)()
|
|
350
|
+
], ScmTreeModel);
|
|
351
|
+
exports.ScmTreeModel = ScmTreeModel;
|
|
352
352
|
//# sourceMappingURL=scm-tree-model.js.map
|