Remove symbolNode.ts (#657)

Signed-off-by: sheche <[email protected]>

Author: jdneo

src/views/DragAndDropController.ts

@@ -5,7 +5,6 @@ import * as path from "path";
 import * as fse from "fs-extra";
 import { DataTransfer, DataTransferItem, TreeDragAndDropController, Uri, window, workspace, WorkspaceEdit } from "vscode";
 import { Explorer } from "../constants";
-import { BaseSymbolNode } from "./baseSymbolNode";
 import { ContainerNode, ContainerType } from "./containerNode";
 import { DataNode } from "./dataNode";
 import { ExplorerNode } from "./explorerNode";
@@ -19,6 +18,7 @@ import { ProjectNode } from "./projectNode";
 import { WorkspaceNode } from "./workspaceNode";
 import { addLibraryGlobs } from "../controllers/libraryController";
 import { sendError, sendInfo } from "vscode-extension-telemetry-wrapper";
+import { DocumentSymbolNode } from "./documentSymbolNode";
 
 export class DragAndDropController implements TreeDragAndDropController<ExplorerNode> {
 
@@ -91,10 +91,10 @@ export class DragAndDropController implements TreeDragAndDropController<Explorer
     private addDragToEditorDataTransfer(node: ExplorerNode, treeDataTransfer: DataTransfer) {
         if ((node instanceof PrimaryTypeNode || node instanceof FileNode) && node.uri) {
             treeDataTransfer.set(Explorer.Mime.TextUriList, new DataTransferItem(node.uri));
-        } else if ((node instanceof BaseSymbolNode)) {
+        } else if ((node instanceof DocumentSymbolNode)) {
             const parent = (node.getParent() as PrimaryTypeNode);
             if (parent.uri) {
-                const range = (node as BaseSymbolNode).range;
+                const range = (node as DocumentSymbolNode).range;
                 const fragment = `#L${range.start.line + 1},${range.start.character + 1}`;
                 const uri = parent.uri + fragment;
                 treeDataTransfer.set(Explorer.Mime.TextUriList, new DataTransferItem(uri));
@@ -246,7 +246,7 @@ export class DragAndDropController implements TreeDragAndDropController<Explorer
         }
         if (node instanceof WorkspaceNode || node instanceof ProjectNode
                 || node instanceof PackageRootNode || node instanceof ContainerNode
-                || node instanceof BaseSymbolNode) {
+                || node instanceof DocumentSymbolNode) {
             return false;
         }
 
@@ -289,7 +289,7 @@ export class DragAndDropController implements TreeDragAndDropController<Explorer
         }
 
         if (node instanceof WorkspaceNode || node instanceof ProjectNode
-                || node instanceof BaseSymbolNode) {
+                || node instanceof DocumentSymbolNode) {
             return false;
         }
 

src/views/baseSymbolNode.ts

@@ -1,22 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { DocumentSymbol, Range, TreeItem, TreeItemCollapsibleState } from "vscode";
+import { Command, DocumentSymbol, Range, SymbolKind, ThemeIcon, TreeItem, TreeItemCollapsibleState } from "vscode";
+import { Commands } from "../commands";
 import { Explorer } from "../constants";
-import { BaseSymbolNode } from "./baseSymbolNode";
 import { ExplorerNode } from "./explorerNode";
 import { PrimaryTypeNode } from "./PrimaryTypeNode";
 
-export class DocumentSymbolNode extends BaseSymbolNode {
+export class DocumentSymbolNode extends ExplorerNode {
 
-    constructor(symbolInfo: DocumentSymbol, parent: PrimaryTypeNode) {
-        super(symbolInfo, parent);
+    private readonly _iconMap: Map<SymbolKind, string> = new Map([
+        [SymbolKind.Package, "package"],
+        [SymbolKind.Class, "class"],
+        [SymbolKind.Interface, "interface"],
+        [SymbolKind.Enum, "enum"],
+        [SymbolKind.EnumMember, "enum-member"],
+        [SymbolKind.Constant, "constant"],
+        [SymbolKind.Method, "method"],
+        [SymbolKind.Function, "method"],
+        [SymbolKind.Constructor, "method"],
+        [SymbolKind.Field, "field"],
+        [SymbolKind.Property, "property"],
+        [SymbolKind.Variable, "variable"],
+    ]);
+
+    constructor(private readonly symbolInfo: DocumentSymbol, parent: PrimaryTypeNode) {
+        super(parent);
     }
 
     public getChildren(): ExplorerNode[] | Promise<ExplorerNode[]> {
         const res: ExplorerNode[] = [];
-        if (this.symbolInfo && (<DocumentSymbol>this.symbolInfo).children && (<DocumentSymbol>this.symbolInfo).children.length) {
-            (<DocumentSymbol>this.symbolInfo).children.forEach((child) => {
+        if (this.symbolInfo?.children?.length) {
+            this.symbolInfo.children.forEach((child) => {
                 res.push(new DocumentSymbolNode(child, this.getParent() as PrimaryTypeNode));
             });
         }
@@ -25,19 +40,35 @@ export class DocumentSymbolNode extends BaseSymbolNode {
 
     public getTreeItem(): TreeItem | Promise<TreeItem> {
         const item = new TreeItem(this.symbolInfo.name,
-            ((<DocumentSymbol>this.symbolInfo).children && (<DocumentSymbol>this.symbolInfo).children.length)
-                ? TreeItemCollapsibleState.Collapsed : TreeItemCollapsibleState.None);
+            this.symbolInfo?.children?.length ? TreeItemCollapsibleState.Collapsed
+                : TreeItemCollapsibleState.None);
         item.iconPath = this.iconPath;
         item.command = this.command;
         return item;
     }
 
     public get range(): Range {
         // Using `selectionRange` instead of `range` to make sure the cursor will be pointing to the codes, not the comments
-        return (<DocumentSymbol>this.symbolInfo).selectionRange;
+        return this.symbolInfo.selectionRange;
     }
 
     public computeContextValue(): string | undefined {
         return `java:${Explorer.ContextValueType.Symbol}`;
     }
+
+    protected get iconPath(): ThemeIcon {
+        if (this._iconMap.has(this.symbolInfo.kind)) {
+            const symbolKind = this._iconMap.get(this.symbolInfo.kind);
+            return new ThemeIcon(`symbol-${symbolKind}`);
+        }
+        return new ThemeIcon("symbol-misc");
+    }
+
+    protected get command(): Command {
+        return {
+            title: "Go to outline",
+            command: Commands.VIEW_PACKAGE_OUTLINE,
+            arguments: [(this.getParent() as PrimaryTypeNode).uri, this.range],
+        };
+    }
 }