Skip to content

Commit

Permalink
Merge pull request #95131 from sbatten/fix/94724
Browse files Browse the repository at this point in the history
fixes #94724
  • Loading branch information
Tyriar committed Apr 15, 2020
2 parents 8b2e41e + a1e1c66 commit 7e9edfa
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/vs/workbench/browser/parts/compositeBarActions.ts
Expand Up @@ -18,7 +18,7 @@ import { DelayedDragHandler } from 'vs/base/browser/dnd';
import { IActivity } from 'vs/workbench/common/activity';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { Emitter } from 'vs/base/common/event';
import { LocalSelectionTransfer, DraggedCompositeIdentifier, DraggedViewIdentifier, CompositeDragAndDropObserver, ICompositeDragAndDrop, Before2D } from 'vs/workbench/browser/dnd';
import { CompositeDragAndDropObserver, ICompositeDragAndDrop, Before2D } from 'vs/workbench/browser/dnd';
import { Color } from 'vs/base/common/color';

export interface ICompositeActivity {
Expand Down Expand Up @@ -452,7 +452,6 @@ export class CompositeActionViewItem extends ActivityActionViewItem {
private static manageExtensionAction: ManageExtensionAction;

private compositeActivity: IActivity | undefined;
private compositeTransfer: LocalSelectionTransfer<DraggedCompositeIdentifier | DraggedViewIdentifier>;

constructor(
private compositeActivityAction: ActivityAction,
Expand All @@ -470,8 +469,6 @@ export class CompositeActionViewItem extends ActivityActionViewItem {
) {
super(compositeActivityAction, { draggable: true, colors, icon }, themeService);

this.compositeTransfer = LocalSelectionTransfer.getInstance<DraggedCompositeIdentifier | DraggedViewIdentifier>();

if (!CompositeActionViewItem.manageExtensionAction) {
CompositeActionViewItem.manageExtensionAction = instantiationService.createInstance(ManageExtensionAction);
}
Expand Down Expand Up @@ -670,9 +667,6 @@ export class CompositeActionViewItem extends ActivityActionViewItem {

dispose(): void {
super.dispose();

this.compositeTransfer.clearData(DraggedCompositeIdentifier.prototype);

this.label.remove();
}
}
Expand Down

0 comments on commit 7e9edfa

Please sign in to comment.