Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-19 18:14:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

do not pass options fillInActions for Model

Browse Source 
fixes #29162
This commit is contained in:
isidor
2017-06-21 12:29:57 +02:00
parent 8d1935dddd
commit 7a2ee29fc2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/files/browser/views/explorerViewer.ts
+4 -4
View File
@@ -158,7 +158,7 @@ export class FileActionProvider extends ContributableActionProvider {
return super.getActions(tree, stat);
}
public hasSecondaryActions(tree: ITree, stat: FileStat): boolean {
public hasSecondaryActions(tree: ITree, stat: FileStat | Model): boolean {
if (stat instanceof NewStatPlaceholder) {
return false;
}
@@ -166,7 +166,7 @@ export class FileActionProvider extends ContributableActionProvider {
return super.hasSecondaryActions(tree, stat);
}
public getSecondaryActions(tree: ITree, stat: FileStat): TPromise<IAction[]> {
public getSecondaryActions(tree: ITree, stat: FileStat | Model): TPromise<IAction[]> {
if (stat instanceof NewStatPlaceholder) {
return TPromise.as([]);
}
@@ -474,7 +474,7 @@ export class FileController extends DefaultController {
return true;
}
public onContextMenu(tree: ITree, stat: FileStat, event: ContextMenuEvent): boolean {
public onContextMenu(tree: ITree, stat: FileStat | Model, event: ContextMenuEvent): boolean {
if (event.target && event.target.tagName && event.target.tagName.toLowerCase() === 'input') {
return false;
}
@@ -493,7 +493,7 @@ export class FileController extends DefaultController {
getAnchor: () => anchor,
getActions: () => {
return this.state.actionProvider.getSecondaryActions(tree, stat).then(actions => {
fillInActions(this.contributedContextMenu, { arg: stat.resource }, actions);
fillInActions(this.contributedContextMenu, stat instanceof FileStat ? { arg: stat.resource } : null, actions);
return actions;
});
},