@theia/scm 1.36.0-next.28 → 1.36.0-next.30
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.
|
@@ -4,9 +4,8 @@ import URI from '@theia/core/lib/common/uri';
|
|
|
4
4
|
import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
5
5
|
import { TreeWidget, TreeNode, SelectableTreeNode, TreeProps, NodeProps } from '@theia/core/lib/browser/tree';
|
|
6
6
|
import { ScmTreeModel, ScmFileChangeGroupNode, ScmFileChangeFolderNode, ScmFileChangeNode } from './scm-tree-model';
|
|
7
|
-
import { MenuModelRegistry, ActionMenuNode, CompoundMenuNode, MenuPath } from '@theia/core/lib/common/menu';
|
|
7
|
+
import { MenuCommandExecutor, MenuModelRegistry, ActionMenuNode, CompoundMenuNode, MenuPath } from '@theia/core/lib/common/menu';
|
|
8
8
|
import { ScmResource } from './scm-provider';
|
|
9
|
-
import { CommandRegistry } from '@theia/core/lib/common/command';
|
|
10
9
|
import { ContextMenuRenderer, LabelProvider, CorePreferences } from '@theia/core/lib/browser';
|
|
11
10
|
import { ScmContextKeyService } from './scm-context-key-service';
|
|
12
11
|
import { EditorWidget, EditorManager, DiffNavigatorProvider } from '@theia/editor/lib/browser';
|
|
@@ -21,8 +20,8 @@ export declare class ScmTreeWidget extends TreeWidget {
|
|
|
21
20
|
static RESOURCE_FOLDER_INLINE_MENU: string[];
|
|
22
21
|
static RESOURCE_CONTEXT_MENU: string[];
|
|
23
22
|
static RESOURCE_INLINE_MENU: string[];
|
|
23
|
+
protected readonly menuCommandExecutor: MenuCommandExecutor;
|
|
24
24
|
protected readonly menus: MenuModelRegistry;
|
|
25
|
-
protected readonly commands: CommandRegistry;
|
|
26
25
|
protected readonly contextKeys: ScmContextKeyService;
|
|
27
26
|
protected readonly editorManager: EditorManager;
|
|
28
27
|
protected readonly diffNavigatorProvider: DiffNavigatorProvider;
|
|
@@ -93,7 +92,6 @@ export declare namespace ScmTreeWidget {
|
|
|
93
92
|
interface Props {
|
|
94
93
|
treeNode: TreeNode;
|
|
95
94
|
model: ScmTreeModel;
|
|
96
|
-
commands: CommandRegistry;
|
|
97
95
|
menus: MenuModelRegistry;
|
|
98
96
|
contextKeys: ScmContextKeyService;
|
|
99
97
|
labelProvider: LabelProvider;
|
|
@@ -117,6 +115,7 @@ export declare abstract class ScmElement<P extends ScmElement.Props = ScmElement
|
|
|
117
115
|
export declare namespace ScmElement {
|
|
118
116
|
interface Props extends ScmTreeWidget.Props {
|
|
119
117
|
renderExpansionToggle: () => React.ReactNode;
|
|
118
|
+
commandExecutor: MenuCommandExecutor;
|
|
120
119
|
}
|
|
121
120
|
interface State {
|
|
122
121
|
hover: boolean;
|
|
@@ -177,7 +176,8 @@ export declare namespace ScmInlineActions {
|
|
|
177
176
|
interface Props {
|
|
178
177
|
hover: boolean;
|
|
179
178
|
menu: CompoundMenuNode;
|
|
180
|
-
|
|
179
|
+
menuPath: MenuPath;
|
|
180
|
+
commandExecutor: MenuCommandExecutor;
|
|
181
181
|
model: ScmTreeModel;
|
|
182
182
|
treeNode: TreeNode;
|
|
183
183
|
contextKeys: ScmContextKeyService;
|
|
@@ -192,7 +192,8 @@ export declare class ScmInlineAction extends React.Component<ScmInlineAction.Pro
|
|
|
192
192
|
export declare namespace ScmInlineAction {
|
|
193
193
|
interface Props {
|
|
194
194
|
node: ActionMenuNode;
|
|
195
|
-
|
|
195
|
+
commandExecutor: MenuCommandExecutor;
|
|
196
|
+
menuPath: MenuPath;
|
|
196
197
|
model: ScmTreeModel;
|
|
197
198
|
treeNode: TreeNode;
|
|
198
199
|
contextKeys: ScmContextKeyService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scm-tree-widget.d.ts","sourceRoot":"","sources":["../../src/browser/scm-tree-widget.tsx"],"names":[],"mappings":";AAkBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAc,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,kBAAkB,EAAa,SAAS,EAAE,SAAS,EAAyD,MAAM,8BAA8B,CAAC;AAChL,OAAO,EAAE,YAAY,EAAyB,sBAAsB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC3I,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"scm-tree-widget.d.ts","sourceRoot":"","sources":["../../src/browser/scm-tree-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,6 @@ const disposable_1 = require("@theia/core/lib/common/disposable");
|
|
|
38
38
|
const tree_1 = require("@theia/core/lib/browser/tree");
|
|
39
39
|
const scm_tree_model_1 = require("./scm-tree-model");
|
|
40
40
|
const menu_1 = require("@theia/core/lib/common/menu");
|
|
41
|
-
const command_1 = require("@theia/core/lib/common/command");
|
|
42
41
|
const browser_1 = require("@theia/core/lib/browser");
|
|
43
42
|
const scm_context_key_service_1 = require("./scm-context-key-service");
|
|
44
43
|
const browser_2 = require("@theia/editor/lib/browser");
|
|
@@ -77,17 +76,17 @@ let ScmTreeWidget = ScmTreeWidget_1 = class ScmTreeWidget extends tree_1.TreeWid
|
|
|
77
76
|
// The group nodes should not be subject to highlighting.
|
|
78
77
|
const caption = (searchHighlights && !scm_tree_model_1.ScmFileChangeGroupNode.is(node)) ? this.toReactNode(label, searchHighlights) : label;
|
|
79
78
|
if (scm_tree_model_1.ScmFileChangeGroupNode.is(node)) {
|
|
80
|
-
const content = React.createElement(ScmResourceGroupElement, { key: `${node.groupId}`, model: this.model, treeNode: node, renderExpansionToggle: () => this.renderExpansionToggle(node, props),
|
|
79
|
+
const content = React.createElement(ScmResourceGroupElement, { key: `${node.groupId}`, model: this.model, treeNode: node, renderExpansionToggle: () => this.renderExpansionToggle(node, props), commandExecutor: this.menuCommandExecutor, contextMenuRenderer: this.contextMenuRenderer, menus: this.menus, contextKeys: this.contextKeys, labelProvider: this.labelProvider, corePreferences: this.corePreferences, caption: caption });
|
|
81
80
|
return React.createElement('div', attributes, content);
|
|
82
81
|
}
|
|
83
82
|
if (scm_tree_model_1.ScmFileChangeFolderNode.is(node)) {
|
|
84
|
-
const content = React.createElement(ScmResourceFolderElement, { key: String(node.sourceUri), model: this.model, treeNode: node, sourceUri: node.sourceUri, renderExpansionToggle: () => this.renderExpansionToggle(node, props),
|
|
83
|
+
const content = React.createElement(ScmResourceFolderElement, { key: String(node.sourceUri), model: this.model, treeNode: node, sourceUri: node.sourceUri, renderExpansionToggle: () => this.renderExpansionToggle(node, props), commandExecutor: this.menuCommandExecutor, contextMenuRenderer: this.contextMenuRenderer, menus: this.menus, contextKeys: this.contextKeys, labelProvider: this.labelProvider, corePreferences: this.corePreferences, caption: caption });
|
|
85
84
|
return React.createElement('div', attributes, content);
|
|
86
85
|
}
|
|
87
86
|
if (scm_tree_model_1.ScmFileChangeNode.is(node)) {
|
|
88
87
|
const parentPath = (node.parent && scm_tree_model_1.ScmFileChangeFolderNode.is(node.parent))
|
|
89
88
|
? new uri_1.default(node.parent.sourceUri) : new uri_1.default(this.model.rootUri);
|
|
90
|
-
const content = React.createElement(ScmResourceComponent, Object.assign({ key: node.sourceUri, model: this.model, treeNode: node, contextMenuRenderer: this.contextMenuRenderer,
|
|
89
|
+
const content = React.createElement(ScmResourceComponent, Object.assign({ key: node.sourceUri, model: this.model, treeNode: node, contextMenuRenderer: this.contextMenuRenderer, commandExecutor: this.menuCommandExecutor, menus: this.menus, contextKeys: this.contextKeys, labelProvider: this.labelProvider, corePreferences: this.corePreferences, caption: caption }, Object.assign(Object.assign({}, this.props), { parentPath, sourceUri: node.sourceUri, decoration: this.decorationsService.getDecoration(new uri_1.default(node.sourceUri), true)[0], colors: this.colors, renderExpansionToggle: () => this.renderExpansionToggle(node, props) })));
|
|
91
90
|
return React.createElement('div', attributes, content);
|
|
92
91
|
}
|
|
93
92
|
return super.renderNode(node, props);
|
|
@@ -369,14 +368,14 @@ ScmTreeWidget.RESOURCE_FOLDER_CONTEXT_MENU = ['RESOURCE_FOLDER_CONTEXT_MENU'];
|
|
|
369
368
|
ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU = ['RESOURCE_FOLDER_CONTEXT_MENU', 'inline'];
|
|
370
369
|
ScmTreeWidget.RESOURCE_CONTEXT_MENU = ['RESOURCE_CONTEXT_MENU'];
|
|
371
370
|
ScmTreeWidget.RESOURCE_INLINE_MENU = ['RESOURCE_CONTEXT_MENU', 'inline'];
|
|
371
|
+
__decorate([
|
|
372
|
+
(0, inversify_1.inject)(menu_1.MenuCommandExecutor),
|
|
373
|
+
__metadata("design:type", Object)
|
|
374
|
+
], ScmTreeWidget.prototype, "menuCommandExecutor", void 0);
|
|
372
375
|
__decorate([
|
|
373
376
|
(0, inversify_1.inject)(menu_1.MenuModelRegistry),
|
|
374
377
|
__metadata("design:type", menu_1.MenuModelRegistry)
|
|
375
378
|
], ScmTreeWidget.prototype, "menus", void 0);
|
|
376
|
-
__decorate([
|
|
377
|
-
(0, inversify_1.inject)(command_1.CommandRegistry),
|
|
378
|
-
__metadata("design:type", command_1.CommandRegistry)
|
|
379
|
-
], ScmTreeWidget.prototype, "commands", void 0);
|
|
380
379
|
__decorate([
|
|
381
380
|
(0, inversify_1.inject)(scm_context_key_service_1.ScmContextKeyService),
|
|
382
381
|
__metadata("design:type", scm_context_key_service_1.ScmContextKeyService)
|
|
@@ -497,7 +496,7 @@ class ScmResourceComponent extends ScmElement {
|
|
|
497
496
|
render() {
|
|
498
497
|
var _a;
|
|
499
498
|
const { hover } = this.state;
|
|
500
|
-
const { model, treeNode, colors, parentPath, sourceUri, decoration, labelProvider,
|
|
499
|
+
const { model, treeNode, colors, parentPath, sourceUri, decoration, labelProvider, commandExecutor, menus, contextKeys, caption } = this.props;
|
|
501
500
|
const resourceUri = new uri_1.default(sourceUri);
|
|
502
501
|
const icon = labelProvider.getIcon(resourceUri);
|
|
503
502
|
const color = decoration && decoration.colorId ? `var(${colors.toCssVariableName(decoration.colorId)})` : '';
|
|
@@ -518,8 +517,9 @@ class ScmResourceComponent extends ScmElement {
|
|
|
518
517
|
React.createElement(ScmInlineActions, Object.assign({}, {
|
|
519
518
|
hover,
|
|
520
519
|
menu: menus.getMenu(ScmTreeWidget.RESOURCE_INLINE_MENU),
|
|
520
|
+
menuPath: ScmTreeWidget.RESOURCE_INLINE_MENU,
|
|
521
|
+
commandExecutor,
|
|
521
522
|
args: this.contextMenuArgs,
|
|
522
|
-
commands,
|
|
523
523
|
contextKeys,
|
|
524
524
|
model,
|
|
525
525
|
treeNode
|
|
@@ -558,7 +558,7 @@ class ScmResourceGroupElement extends ScmElement {
|
|
|
558
558
|
}
|
|
559
559
|
render() {
|
|
560
560
|
const { hover } = this.state;
|
|
561
|
-
const { model, treeNode, menus,
|
|
561
|
+
const { model, treeNode, menus, commandExecutor, contextKeys, caption } = this.props;
|
|
562
562
|
return React.createElement("div", { className: `theia-header scm-theia-header ${tree_1.TREE_NODE_SEGMENT_GROW_CLASS}`, onContextMenu: this.renderContextMenu, onMouseEnter: this.showHover, onMouseLeave: this.hideHover, ref: this.detectHover },
|
|
563
563
|
this.props.renderExpansionToggle(),
|
|
564
564
|
React.createElement("div", { className: `noWrapInfo ${tree_1.TREE_NODE_SEGMENT_GROW_CLASS}` }, caption),
|
|
@@ -566,7 +566,8 @@ class ScmResourceGroupElement extends ScmElement {
|
|
|
566
566
|
hover,
|
|
567
567
|
args: this.contextMenuArgs,
|
|
568
568
|
menu: menus.getMenu(ScmTreeWidget.RESOURCE_GROUP_INLINE_MENU),
|
|
569
|
-
|
|
569
|
+
menuPath: ScmTreeWidget.RESOURCE_GROUP_INLINE_MENU,
|
|
570
|
+
commandExecutor,
|
|
570
571
|
contextKeys,
|
|
571
572
|
model,
|
|
572
573
|
treeNode
|
|
@@ -596,7 +597,7 @@ class ScmResourceFolderElement extends ScmElement {
|
|
|
596
597
|
}
|
|
597
598
|
render() {
|
|
598
599
|
const { hover } = this.state;
|
|
599
|
-
const { model, treeNode, sourceUri, labelProvider,
|
|
600
|
+
const { model, treeNode, sourceUri, labelProvider, commandExecutor, menus, contextKeys, caption } = this.props;
|
|
600
601
|
const sourceFileStat = files_1.FileStat.dir(sourceUri);
|
|
601
602
|
const icon = labelProvider.getIcon(sourceFileStat);
|
|
602
603
|
const title = new uri_1.default(sourceUri).path.fsPath();
|
|
@@ -608,8 +609,9 @@ class ScmResourceFolderElement extends ScmElement {
|
|
|
608
609
|
React.createElement(ScmInlineActions, Object.assign({}, {
|
|
609
610
|
hover,
|
|
610
611
|
menu: menus.getMenu(ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU),
|
|
612
|
+
menuPath: ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU,
|
|
613
|
+
commandExecutor,
|
|
611
614
|
args: this.contextMenuArgs,
|
|
612
|
-
commands,
|
|
613
615
|
contextKeys,
|
|
614
616
|
model,
|
|
615
617
|
treeNode
|
|
@@ -631,10 +633,11 @@ class ScmResourceFolderElement extends ScmElement {
|
|
|
631
633
|
exports.ScmResourceFolderElement = ScmResourceFolderElement;
|
|
632
634
|
class ScmInlineActions extends React.Component {
|
|
633
635
|
render() {
|
|
634
|
-
const { hover, menu, args,
|
|
636
|
+
const { hover, menu, menuPath, args, commandExecutor, model, treeNode, contextKeys, children } = this.props;
|
|
635
637
|
return React.createElement("div", { className: 'theia-scm-inline-actions-container' },
|
|
636
638
|
React.createElement("div", { className: 'theia-scm-inline-actions' }, hover && menu.children
|
|
637
|
-
.map((node, index) => node instanceof menu_1.ActionMenuNode &&
|
|
639
|
+
.map((node, index) => node instanceof menu_1.ActionMenuNode &&
|
|
640
|
+
React.createElement(ScmInlineAction, Object.assign({ key: index }, { node, menuPath, args, commandExecutor, model, treeNode, contextKeys })))),
|
|
638
641
|
children);
|
|
639
642
|
}
|
|
640
643
|
}
|
|
@@ -644,17 +647,17 @@ class ScmInlineAction extends React.Component {
|
|
|
644
647
|
super(...arguments);
|
|
645
648
|
this.execute = (event) => {
|
|
646
649
|
event.stopPropagation();
|
|
647
|
-
const {
|
|
648
|
-
|
|
650
|
+
const { commandExecutor, menuPath, node, args } = this.props;
|
|
651
|
+
commandExecutor.executeCommand([menuPath[0]], node.command, ...args);
|
|
649
652
|
};
|
|
650
653
|
}
|
|
651
654
|
render() {
|
|
652
|
-
const { node, model, treeNode, args,
|
|
655
|
+
const { node, model, treeNode, args, commandExecutor, menuPath, contextKeys } = this.props;
|
|
653
656
|
let isActive = false;
|
|
654
657
|
model.execInNodeContext(treeNode, () => {
|
|
655
658
|
isActive = contextKeys.match(node.when);
|
|
656
659
|
});
|
|
657
|
-
if (!
|
|
660
|
+
if (!commandExecutor.isVisible(menuPath, node.command, ...args) || !isActive) {
|
|
658
661
|
return false;
|
|
659
662
|
}
|
|
660
663
|
return React.createElement("div", { className: 'theia-scm-inline-action' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scm-tree-widget.js","sourceRoot":"","sources":["../../src/browser/scm-tree-widget.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"scm-tree-widget.js","sourceRoot":"","sources":["../../src/browser/scm-tree-widget.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/scm",
|
|
3
|
-
"version": "1.36.0-next.
|
|
3
|
+
"version": "1.36.0-next.30+afdae6330",
|
|
4
4
|
"description": "Theia - Source control Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.36.0-next.
|
|
7
|
-
"@theia/editor": "1.36.0-next.
|
|
8
|
-
"@theia/filesystem": "1.36.0-next.
|
|
6
|
+
"@theia/core": "1.36.0-next.30+afdae6330",
|
|
7
|
+
"@theia/editor": "1.36.0-next.30+afdae6330",
|
|
8
|
+
"@theia/filesystem": "1.36.0-next.30+afdae6330",
|
|
9
9
|
"@types/diff": "^3.2.2",
|
|
10
10
|
"diff": "^3.4.0",
|
|
11
11
|
"p-debounce": "^2.1.0",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"nyc": {
|
|
51
51
|
"extends": "../../configs/nyc.json"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "afdae6330743220a48019f888092985ee8a31644"
|
|
54
54
|
}
|
|
@@ -23,9 +23,8 @@ import { isOSX } from '@theia/core/lib/common/os';
|
|
|
23
23
|
import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
|
|
24
24
|
import { TreeWidget, TreeNode, SelectableTreeNode, TreeModel, TreeProps, NodeProps, TREE_NODE_SEGMENT_CLASS, TREE_NODE_SEGMENT_GROW_CLASS } from '@theia/core/lib/browser/tree';
|
|
25
25
|
import { ScmTreeModel, ScmFileChangeRootNode, ScmFileChangeGroupNode, ScmFileChangeFolderNode, ScmFileChangeNode } from './scm-tree-model';
|
|
26
|
-
import { MenuModelRegistry, ActionMenuNode, CompoundMenuNode, MenuPath } from '@theia/core/lib/common/menu';
|
|
26
|
+
import { MenuCommandExecutor, MenuModelRegistry, ActionMenuNode, CompoundMenuNode, MenuPath } from '@theia/core/lib/common/menu';
|
|
27
27
|
import { ScmResource } from './scm-provider';
|
|
28
|
-
import { CommandRegistry } from '@theia/core/lib/common/command';
|
|
29
28
|
import { ContextMenuRenderer, LabelProvider, CorePreferences, DiffUris, ACTION_ITEM } from '@theia/core/lib/browser';
|
|
30
29
|
import { ScmContextKeyService } from './scm-context-key-service';
|
|
31
30
|
import { EditorWidget, EditorManager, DiffNavigatorProvider } from '@theia/editor/lib/browser';
|
|
@@ -48,8 +47,8 @@ export class ScmTreeWidget extends TreeWidget {
|
|
|
48
47
|
static RESOURCE_CONTEXT_MENU = ['RESOURCE_CONTEXT_MENU'];
|
|
49
48
|
static RESOURCE_INLINE_MENU = ['RESOURCE_CONTEXT_MENU', 'inline'];
|
|
50
49
|
|
|
50
|
+
@inject(MenuCommandExecutor) protected readonly menuCommandExecutor: MenuCommandExecutor;
|
|
51
51
|
@inject(MenuModelRegistry) protected readonly menus: MenuModelRegistry;
|
|
52
|
-
@inject(CommandRegistry) protected readonly commands: CommandRegistry;
|
|
53
52
|
@inject(ScmContextKeyService) protected readonly contextKeys: ScmContextKeyService;
|
|
54
53
|
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
55
54
|
@inject(DiffNavigatorProvider) protected readonly diffNavigatorProvider: DiffNavigatorProvider;
|
|
@@ -102,8 +101,8 @@ export class ScmTreeWidget extends TreeWidget {
|
|
|
102
101
|
model={this.model}
|
|
103
102
|
treeNode={node}
|
|
104
103
|
renderExpansionToggle={() => this.renderExpansionToggle(node, props)}
|
|
104
|
+
commandExecutor={this.menuCommandExecutor}
|
|
105
105
|
contextMenuRenderer={this.contextMenuRenderer}
|
|
106
|
-
commands={this.commands}
|
|
107
106
|
menus={this.menus}
|
|
108
107
|
contextKeys={this.contextKeys}
|
|
109
108
|
labelProvider={this.labelProvider}
|
|
@@ -121,8 +120,8 @@ export class ScmTreeWidget extends TreeWidget {
|
|
|
121
120
|
treeNode={node}
|
|
122
121
|
sourceUri={node.sourceUri}
|
|
123
122
|
renderExpansionToggle={() => this.renderExpansionToggle(node, props)}
|
|
123
|
+
commandExecutor={this.menuCommandExecutor}
|
|
124
124
|
contextMenuRenderer={this.contextMenuRenderer}
|
|
125
|
-
commands={this.commands}
|
|
126
125
|
menus={this.menus}
|
|
127
126
|
contextKeys={this.contextKeys}
|
|
128
127
|
labelProvider={this.labelProvider}
|
|
@@ -142,7 +141,7 @@ export class ScmTreeWidget extends TreeWidget {
|
|
|
142
141
|
model={this.model}
|
|
143
142
|
treeNode={node}
|
|
144
143
|
contextMenuRenderer={this.contextMenuRenderer}
|
|
145
|
-
|
|
144
|
+
commandExecutor={this.menuCommandExecutor}
|
|
146
145
|
menus={this.menus}
|
|
147
146
|
contextKeys={this.contextKeys}
|
|
148
147
|
labelProvider={this.labelProvider}
|
|
@@ -455,7 +454,6 @@ export namespace ScmTreeWidget {
|
|
|
455
454
|
export interface Props {
|
|
456
455
|
treeNode: TreeNode;
|
|
457
456
|
model: ScmTreeModel;
|
|
458
|
-
commands: CommandRegistry;
|
|
459
457
|
menus: MenuModelRegistry;
|
|
460
458
|
contextKeys: ScmContextKeyService;
|
|
461
459
|
labelProvider: LabelProvider;
|
|
@@ -518,7 +516,8 @@ export abstract class ScmElement<P extends ScmElement.Props = ScmElement.Props>
|
|
|
518
516
|
}
|
|
519
517
|
export namespace ScmElement {
|
|
520
518
|
export interface Props extends ScmTreeWidget.Props {
|
|
521
|
-
renderExpansionToggle: () => React.ReactNode
|
|
519
|
+
renderExpansionToggle: () => React.ReactNode;
|
|
520
|
+
commandExecutor: MenuCommandExecutor;
|
|
522
521
|
}
|
|
523
522
|
export interface State {
|
|
524
523
|
hover: boolean
|
|
@@ -529,7 +528,7 @@ export class ScmResourceComponent extends ScmElement<ScmResourceComponent.Props>
|
|
|
529
528
|
|
|
530
529
|
override render(): JSX.Element | undefined {
|
|
531
530
|
const { hover } = this.state;
|
|
532
|
-
const { model, treeNode, colors, parentPath, sourceUri, decoration, labelProvider,
|
|
531
|
+
const { model, treeNode, colors, parentPath, sourceUri, decoration, labelProvider, commandExecutor, menus, contextKeys, caption } = this.props;
|
|
533
532
|
const resourceUri = new URI(sourceUri);
|
|
534
533
|
|
|
535
534
|
const icon = labelProvider.getIcon(resourceUri);
|
|
@@ -561,8 +560,9 @@ export class ScmResourceComponent extends ScmElement<ScmResourceComponent.Props>
|
|
|
561
560
|
<ScmInlineActions {...{
|
|
562
561
|
hover,
|
|
563
562
|
menu: menus.getMenu(ScmTreeWidget.RESOURCE_INLINE_MENU),
|
|
563
|
+
menuPath: ScmTreeWidget.RESOURCE_INLINE_MENU,
|
|
564
|
+
commandExecutor,
|
|
564
565
|
args: this.contextMenuArgs,
|
|
565
|
-
commands,
|
|
566
566
|
contextKeys,
|
|
567
567
|
model,
|
|
568
568
|
treeNode
|
|
@@ -644,7 +644,7 @@ export class ScmResourceGroupElement extends ScmElement<ScmResourceGroupComponen
|
|
|
644
644
|
|
|
645
645
|
override render(): JSX.Element {
|
|
646
646
|
const { hover } = this.state;
|
|
647
|
-
const { model, treeNode, menus,
|
|
647
|
+
const { model, treeNode, menus, commandExecutor, contextKeys, caption } = this.props;
|
|
648
648
|
return <div className={`theia-header scm-theia-header ${TREE_NODE_SEGMENT_GROW_CLASS}`}
|
|
649
649
|
onContextMenu={this.renderContextMenu}
|
|
650
650
|
onMouseEnter={this.showHover}
|
|
@@ -656,7 +656,8 @@ export class ScmResourceGroupElement extends ScmElement<ScmResourceGroupComponen
|
|
|
656
656
|
hover,
|
|
657
657
|
args: this.contextMenuArgs,
|
|
658
658
|
menu: menus.getMenu(ScmTreeWidget.RESOURCE_GROUP_INLINE_MENU),
|
|
659
|
-
|
|
659
|
+
menuPath: ScmTreeWidget.RESOURCE_GROUP_INLINE_MENU,
|
|
660
|
+
commandExecutor,
|
|
660
661
|
contextKeys,
|
|
661
662
|
model,
|
|
662
663
|
treeNode
|
|
@@ -694,7 +695,7 @@ export class ScmResourceFolderElement extends ScmElement<ScmResourceFolderElemen
|
|
|
694
695
|
|
|
695
696
|
override render(): JSX.Element {
|
|
696
697
|
const { hover } = this.state;
|
|
697
|
-
const { model, treeNode, sourceUri, labelProvider,
|
|
698
|
+
const { model, treeNode, sourceUri, labelProvider, commandExecutor, menus, contextKeys, caption } = this.props;
|
|
698
699
|
const sourceFileStat = FileStat.dir(sourceUri);
|
|
699
700
|
const icon = labelProvider.getIcon(sourceFileStat);
|
|
700
701
|
const title = new URI(sourceUri).path.fsPath();
|
|
@@ -715,8 +716,9 @@ export class ScmResourceFolderElement extends ScmElement<ScmResourceFolderElemen
|
|
|
715
716
|
<ScmInlineActions {...{
|
|
716
717
|
hover,
|
|
717
718
|
menu: menus.getMenu(ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU),
|
|
719
|
+
menuPath: ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU,
|
|
720
|
+
commandExecutor,
|
|
718
721
|
args: this.contextMenuArgs,
|
|
719
|
-
commands,
|
|
720
722
|
contextKeys,
|
|
721
723
|
model,
|
|
722
724
|
treeNode
|
|
@@ -750,11 +752,12 @@ export namespace ScmResourceFolderElement {
|
|
|
750
752
|
|
|
751
753
|
export class ScmInlineActions extends React.Component<ScmInlineActions.Props> {
|
|
752
754
|
override render(): React.ReactNode {
|
|
753
|
-
const { hover, menu, args,
|
|
755
|
+
const { hover, menu, menuPath, args, commandExecutor, model, treeNode, contextKeys, children } = this.props;
|
|
754
756
|
return <div className='theia-scm-inline-actions-container'>
|
|
755
757
|
<div className='theia-scm-inline-actions'>
|
|
756
758
|
{hover && menu.children
|
|
757
|
-
.map((node, index) => node instanceof ActionMenuNode &&
|
|
759
|
+
.map((node, index) => node instanceof ActionMenuNode &&
|
|
760
|
+
<ScmInlineAction key={index} {...{ node, menuPath, args, commandExecutor, model, treeNode, contextKeys }} />)}
|
|
758
761
|
</div>
|
|
759
762
|
{children}
|
|
760
763
|
</div>;
|
|
@@ -764,7 +767,8 @@ export namespace ScmInlineActions {
|
|
|
764
767
|
export interface Props {
|
|
765
768
|
hover: boolean;
|
|
766
769
|
menu: CompoundMenuNode;
|
|
767
|
-
|
|
770
|
+
menuPath: MenuPath;
|
|
771
|
+
commandExecutor: MenuCommandExecutor;
|
|
768
772
|
model: ScmTreeModel;
|
|
769
773
|
treeNode: TreeNode;
|
|
770
774
|
contextKeys: ScmContextKeyService;
|
|
@@ -775,14 +779,14 @@ export namespace ScmInlineActions {
|
|
|
775
779
|
|
|
776
780
|
export class ScmInlineAction extends React.Component<ScmInlineAction.Props> {
|
|
777
781
|
override render(): React.ReactNode {
|
|
778
|
-
const { node, model, treeNode, args,
|
|
782
|
+
const { node, model, treeNode, args, commandExecutor, menuPath, contextKeys } = this.props;
|
|
779
783
|
|
|
780
784
|
let isActive: boolean = false;
|
|
781
785
|
model.execInNodeContext(treeNode, () => {
|
|
782
786
|
isActive = contextKeys.match(node.when);
|
|
783
787
|
});
|
|
784
788
|
|
|
785
|
-
if (!
|
|
789
|
+
if (!commandExecutor.isVisible(menuPath, node.command, ...args) || !isActive) {
|
|
786
790
|
return false;
|
|
787
791
|
}
|
|
788
792
|
return <div className='theia-scm-inline-action'>
|
|
@@ -793,14 +797,15 @@ export class ScmInlineAction extends React.Component<ScmInlineAction.Props> {
|
|
|
793
797
|
protected execute = (event: React.MouseEvent) => {
|
|
794
798
|
event.stopPropagation();
|
|
795
799
|
|
|
796
|
-
const {
|
|
797
|
-
|
|
800
|
+
const { commandExecutor, menuPath, node, args } = this.props;
|
|
801
|
+
commandExecutor.executeCommand([menuPath[0]], node.command, ...args);
|
|
798
802
|
};
|
|
799
803
|
}
|
|
800
804
|
export namespace ScmInlineAction {
|
|
801
805
|
export interface Props {
|
|
802
806
|
node: ActionMenuNode;
|
|
803
|
-
|
|
807
|
+
commandExecutor: MenuCommandExecutor;
|
|
808
|
+
menuPath: MenuPath;
|
|
804
809
|
model: ScmTreeModel;
|
|
805
810
|
treeNode: TreeNode;
|
|
806
811
|
contextKeys: ScmContextKeyService;
|