Skip to content

Commit 379bb06

Browse files
committed
Cleared object browser dnd
Signed-off-by: Seb Julliand <[email protected]>
1 parent 0ac37e6 commit 379bb06

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

src/ui/views/objectBrowser.ts

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Search } from "../../api/Search";
99
import { Tools } from "../../api/Tools";
1010
import { getMemberUri } from "../../filesystems/qsys/QSysFs";
1111
import { instance } from "../../instantiate";
12-
import { CommandResult, DefaultOpenMode, FilteredItem, FocusOptions, IBMiMember, IBMiObject, MemberItem, OBJECT_BROWSER_DRAG_MIMETYPE, ObjectBrowserDrag, ObjectFilters, ObjectItem, WithLibrary } from "../../typings";
12+
import { CommandResult, DefaultOpenMode, FilteredItem, FocusOptions, IBMiMember, IBMiObject, MemberItem, OBJECT_BROWSER_MIMETYPE, ObjectFilters, ObjectItem, WithLibrary } from "../../typings";
1313
import { editFilter } from "../../webviews/filters";
1414
import { VscodeTools } from "../Tools";
1515
import { BrowserItem, BrowserItemParameters } from "../types";
@@ -178,6 +178,13 @@ class ObjectBrowserFilterItem extends ObjectBrowserItem implements WithLibrary {
178178
this.contextValue = `filter${this.library ? "_library" : ''}${this.isProtected() ? `_readonly` : ``}`;
179179
this.description = `${filter.library}/${filter.object}/${filter.member}.${filter.memberType || `*`} (${filter.types.join(`, `)})`;
180180
this.tooltip = ``;
181+
182+
if (this.library) {
183+
this.resourceUri = vscode.Uri.from({
184+
scheme: `object`,
185+
path: `/QSYS/${this.library}.LIB`,
186+
});
187+
}
181188
}
182189

183190
isProtected(): boolean {
@@ -419,27 +426,12 @@ class ObjectBrowserMemberItem extends ObjectBrowserItem implements MemberItem {
419426
}
420427

421428
class ObjectBrowserMemberItemDragAndDrop implements vscode.TreeDragAndDropController<ObjectBrowserMemberItem> {
422-
readonly dragMimeTypes = [OBJECT_BROWSER_DRAG_MIMETYPE];
429+
readonly dragMimeTypes = [];
423430
readonly dropMimeTypes = [];
424431

425432
handleDrag(source: readonly ObjectBrowserItem[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken) {
426433
//A URI list is automatically produced
427-
const items = source.map(this.toObjectBrowserDrag).filter(Boolean);
428-
if (items.length) {
429-
dataTransfer.set(OBJECT_BROWSER_DRAG_MIMETYPE, new DataTransferItem(JSON.stringify(items)));
430-
}
431-
}
432-
433-
toObjectBrowserDrag(node: ObjectBrowserItem): ObjectBrowserDrag | undefined {
434-
if (node instanceof ObjectBrowserFilterItem && parseFilter(node.filter.library).noFilter) {
435-
return { library: "QSYS", object: node.filter.library, type: "*LIB" };
436-
}
437-
else if (node instanceof ObjectBrowserObjectItem || node instanceof ObjectBrowserSourcePhysicalFileItem) {
438-
return { library: node.object.library, object: node.object.name, type: node.object.type };
439-
}
440-
else if (node instanceof ObjectBrowserMemberItem) {
441-
return { library: node.member.library, object: node.member.file, member: node.member.name, type: "*MBR" };
442-
}
434+
dataTransfer.set(OBJECT_BROWSER_MIMETYPE, new DataTransferItem(source));
443435
}
444436
}
445437

0 commit comments

Comments
 (0)