Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb (#4663)

This commit is contained in:
Anthony Dresser
2019-03-22 13:07:54 -07:00
committed by GitHub
parent f5c9174c2f
commit 4a87a24235
296 changed files with 2531 additions and 2472 deletions

View File

@@ -166,11 +166,11 @@ export abstract class Composite extends Component implements IComposite {
/**
* For any of the actions returned by this composite, provide an IActionItem in
* cases where the implementor of the composite wants to override the presentation
* of an action. Returns null to indicate that the action is not rendered through
* of an action. Returns undefined to indicate that the action is not rendered through
* an action item.
*/
getActionItem(action: IAction): IActionItem | null {
return null;
getActionItem(action: IAction): IActionItem | undefined {
return undefined;
}
/**