refactor: Enable unused locals/parameters and implicit returns (#371)

xqzlgy2 · web-flow · commit 3e41544eeba5 · 2020-11-24T09:59:11.000+08:00
diff --git a/src/controllers/libraryController.ts b/src/controllers/libraryController.ts
@@ -5,13 +5,12 @@ import * as fse from "fs-extra";
 import * as _ from "lodash";
 import * as minimatch from "minimatch";
 import * as path from "path";
-import { commands, Disposable, ExtensionContext, Uri, window, workspace, WorkspaceFolder } from "vscode";
+import { Disposable, ExtensionContext, Uri, window, workspace, WorkspaceFolder } from "vscode";
 import { instrumentOperationAsVsCodeCommand } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "../commands";
 import { Jdtls } from "../java/jdtls";
 import { Settings } from "../settings";
 import { Utility } from "../utility";
-import { ContainerNode } from "../views/containerNode";
 import { DataNode } from "../views/dataNode";
 
 export class LibraryController implements Disposable {
diff --git a/src/explorerCommands/delete.ts b/src/explorerCommands/delete.ts
@@ -4,7 +4,7 @@
 import { Uri, window, workspace } from "vscode";
 import { DataNode } from "../views/dataNode";
 import { ExplorerNode } from "../views/explorerNode";
-import { isMutable } from "./utils";
+import { isMutable } from "./utility";
 
 const confirmMessage = "Move to Recycle Bin";
 
diff --git a/src/explorerCommands/new.ts b/src/explorerCommands/new.ts
@@ -6,7 +6,7 @@ import * as path from "path";
 import { QuickPickItem, Uri, window, workspace, WorkspaceEdit } from "vscode";
 import { NodeKind } from "../java/nodeData";
 import { DataNode } from "../views/dataNode";
-import { checkJavaQualifiedName } from "./utils";
+import { checkJavaQualifiedName } from "./utility";
 
 export async function newJavaClass(node: DataNode): Promise<void> {
     const packageFsPath: string = await getPackageFsPath(node);
diff --git a/src/explorerCommands/rename.ts b/src/explorerCommands/rename.ts
@@ -7,7 +7,7 @@ import { Uri, window, workspace, WorkspaceEdit } from "vscode";
 import { NodeKind } from "../java/nodeData";
 import { DataNode } from "../views/dataNode";
 import { ExplorerNode } from "../views/explorerNode";
-import { checkJavaQualifiedName, isMutable } from "./utils";
+import { checkJavaQualifiedName, isMutable } from "./utility";
 
 export async function renameFile(node: DataNode, selectedNode: ExplorerNode): Promise<void> {
     // if command not invoked by context menu, use selected node in explorer
diff --git a/src/explorerCommands/utility.ts b/src/explorerCommands/utility.ts
diff --git a/src/exportJarSteps/GenerateJarExecutor.ts b/src/exportJarSteps/GenerateJarExecutor.ts
@@ -62,7 +62,7 @@ export class GenerateJarExecutor implements IExportJarStepExecutor {
             location: ProgressLocation.Window,
             title: "Exporting Jar : Generating jar...",
             cancellable: true,
-        }, (progress, token) => {
+        }, (_progress, token) => {
             return new Promise<boolean>(async (resolve, reject) => {
                 token.onCancellationRequested(() => {
                     return reject();
@@ -84,7 +84,7 @@ export class GenerateJarExecutor implements IExportJarStepExecutor {
             location: ProgressLocation.Window,
             title: "Exporting Jar : Resolving classpaths...",
             cancellable: true,
-        }, (progress, token) => {
+        }, (_progress, token) => {
             return new Promise<IJarQuickPickItem[]>(async (resolve, reject) => {
                 token.onCancellationRequested(() => {
                     return reject();
diff --git a/src/exportJarSteps/ResolveMainClassExecutor.ts b/src/exportJarSteps/ResolveMainClassExecutor.ts
@@ -35,7 +35,7 @@ export class ResolveMainClassExecutor implements IExportJarStepExecutor {
             location: ProgressLocation.Window,
             title: "Exporting Jar : Resolving main classes...",
             cancellable: true,
-        }, (progress, token) => {
+        }, (_progress, token) => {
             return new Promise<IMainClassInfo[] | undefined>(async (resolve, reject) => {
                 token.onCancellationRequested(() => {
                     return reject();
diff --git a/src/views/containerNode.ts b/src/views/containerNode.ts
@@ -59,6 +59,7 @@ function getContainerType(containerPath: string | undefined): string {
     } else if (containerPath.startsWith(ContainerPath.ReferencedLibrary)) {
         return "referencedLibrary";
     }
+    return "";
 }
 
 const enum ContainerPath {
diff --git a/src/views/dataNode.ts b/src/views/dataNode.ts
@@ -27,6 +27,7 @@ export abstract class DataNode extends ExplorerNode {
             item.contextValue = this.computeContextValue();
             return item;
         }
+        return undefined;
     }
 
     public get nodeData(): INodeData {
diff --git a/src/views/dependencyDataProvider.ts b/src/views/dependencyDataProvider.ts
@@ -4,7 +4,7 @@
 import * as _ from "lodash";
 import {
     commands, Event, EventEmitter, ExtensionContext, extensions, ProviderResult,
-    Range, TreeDataProvider, TreeItem, Uri, window, workspace,
+    TreeDataProvider, TreeItem, Uri, window, workspace,
 } from "vscode";
 import { instrumentOperation, instrumentOperationAsVsCodeCommand } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "../commands";
diff --git a/src/views/documentSymbolNode.ts b/src/views/documentSymbolNode.ts
@@ -31,6 +31,7 @@ export class DocumentSymbolNode extends BaseSymbolNode {
             item.command = this.command;
             return item;
         }
+        return undefined;
     }
 
     protected get range(): Range {
diff --git a/src/views/fileNode.ts b/src/views/fileNode.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { Command, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState } from "vscode";
+import { Command, ThemeIcon } from "vscode";
 import { Commands } from "../commands";
 import { Explorer } from "../constants";
 import { INodeData } from "../java/nodeData";
diff --git a/src/views/hierarchicalPackageNode.ts b/src/views/hierarchicalPackageNode.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { ProviderResult, TreeItem, TreeItemCollapsibleState } from "vscode";
+import { TreeItem, TreeItemCollapsibleState } from "vscode";
 import { HierarchicalPackageNodeData } from "../java/hierarchicalPackageNodeData";
 import { INodeData, NodeKind } from "../java/nodeData";
 import { DataNode } from "./dataNode";
@@ -23,6 +23,7 @@ export class HierarchicalPackageNode extends PackageNode {
                 this.hasChildren() ? TreeItemCollapsibleState.Collapsed : TreeItemCollapsibleState.None);
             return { ...super.getTreeItem(), ...item };
         }
+        return undefined;
     }
 
     public async getChildren(): Promise<ExplorerNode[]> {
diff --git a/src/views/nodeCache/Trie.ts b/src/views/nodeCache/Trie.ts
@@ -8,7 +8,7 @@ export class Trie<T extends IUriData> {
     private _root: TrieNode<T>;
 
     constructor() {
-        this._root = new TrieNode(null, null);
+        this._root = new TrieNode(null);
     }
 
     public insert(input: T): void {
@@ -21,7 +21,7 @@ export class Trie<T extends IUriData> {
                 continue;
             }
             if (!currentNode.children[segment]) {
-                currentNode.children[segment] = new TrieNode(segment, null);
+                currentNode.children[segment] = new TrieNode(null);
             }
             currentNode = currentNode.children[segment];
         }
@@ -83,12 +83,10 @@ export interface IUriData {
 }
 
 export class TrieNode<T> {
-    private _key: string;
     private _value: T;
     private _children: INodeChildren<T>;
 
-    constructor(key: string, value: T) {
-        this._key = key;
+    constructor(value: T) {
         this._value = value;
         this._children = {};
     }
diff --git a/src/views/packageNode.ts b/src/views/packageNode.ts
@@ -53,5 +53,6 @@ export class PackageNode extends DataNode {
         } else if (parentData.entryKind === PackageRootKind.K_BINARY) {
             return `${Explorer.ContextValueType.Package}+binary`;
         }
+        return undefined;
     }
 }
diff --git a/src/views/projectNode.ts b/src/views/projectNode.ts
@@ -52,7 +52,7 @@ export class ProjectNode extends DataNode {
         let result: INodeData[] = [];
         return Jdtls.getPackageData({ kind: NodeKind.Project, projectUri: this.nodeData.uri }).then((res) => {
             if (!res) {
-                return;
+                return undefined;
             }
             const sourceContainer: IContainerNodeData[] = [];
             res.forEach((node) => {
@@ -67,7 +67,7 @@ export class ProjectNode extends DataNode {
                 return Promise.all(sourceContainer.map((c) => Jdtls.getPackageData({ kind: NodeKind.Container, projectUri: this.uri, path: c.path })))
                     .then((rootPackages) => {
                         if (!rootPackages) {
-                            return;
+                            return undefined;
                         }
                         result = result.concat(...rootPackages);
                         return result;
diff --git a/src/views/symbolNode.ts b/src/views/symbolNode.ts
@@ -36,6 +36,7 @@ export class SymbolNode extends BaseSymbolNode {
             item.command = this.command;
             return item;
         }
+        return undefined;
     }
 
     protected get range(): Range {
diff --git a/test/shared.ts b/test/shared.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as path from "path";
-import { commands, Event, extensions, Uri } from "vscode";
+import { commands, extensions, Uri } from "vscode";
 import { Commands, DataNode, LanguageServerMode } from "../extension.bundle";
 
 export namespace Uris {
diff --git a/test/suite/extension.test.ts b/test/suite/extension.test.ts
@@ -13,7 +13,7 @@ suite("Extension Tests", () => {
     });
 
     test("should activate", async function() {
-        const _api = await vscode.extensions.getExtension("vscjava.vscode-java-dependency")!.activate();
+        await vscode.extensions.getExtension("vscjava.vscode-java-dependency")!.activate();
         assert.ok(true);
     });
 });
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,12 +3,16 @@
       "module": "commonjs",
       "target": "es6",
       "outDir": "out",
-      "alwaysStrict": true,
       "lib": [
           "es6"
       ],
       "sourceMap": true,
-      "rootDir": "."
+      "rootDir": ".",
+      "noUnusedLocals": true,
+      "noImplicitThis": true,
+      "noImplicitReturns": true,
+      "noUnusedParameters": true,
+      "alwaysStrict": true
   },
   "exclude": [
       "node_modules",

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ function getContainerType(containerPath: string \| undefined): string {`
`59`	`59`	`} else if (containerPath.startsWith(ContainerPath.ReferencedLibrary)) {`
`60`	`60`	`return "referencedLibrary";`
`61`	`61`	`}`
	`62`	`+ return "";`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`const enum ContainerPath {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ export abstract class DataNode extends ExplorerNode {`
`27`	`27`	`item.contextValue = this.computeContextValue();`
`28`	`28`	`return item;`
`29`	`29`	`}`
	`30`	`+ return undefined;`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`public get nodeData(): INodeData {`