Modify tsconfig & error fix (#914)

xqzlgy2 · web-flow · commit 029b22f5c71a · 2020-12-08T10:11:58.000+08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -753,6 +753,7 @@
     "test": "npm run compile && node ./out/test/index.js"
   },
   "devDependencies": {
+    "@types/glob": "^7.1.3",
     "@types/lodash": "^4.14.137",
     "@types/mocha": "^5.2.7",
     "@types/node": "^8.10.51",
diff --git a/src/build.ts b/src/build.ts
@@ -86,7 +86,7 @@ function checkErrorsReportedByJavaExtension(): boolean {
 }
 
 async function showFixSuggestions(operationId: string) {
-    let buildFiles = [];
+    let buildFiles: string[] = [];
     try {
         buildFiles = await lsPlugin.resolveBuildFiles();
     } catch (error) {
diff --git a/src/commands.ts b/src/commands.ts
@@ -44,11 +44,11 @@ export const JAVA_RESOLVE_CLASSFILTERS = "vscode.java.resolveClassFilters";
 
 export const JAVA_RESOLVE_SOURCE_URI = "vscode.java.resolveSourceUri";
 
-export function executeJavaLanguageServerCommand(...rest) {
+export function executeJavaLanguageServerCommand(...rest: any[]) {
     return executeJavaExtensionCommand(JAVA_EXECUTE_WORKSPACE_COMMAND, ...rest);
 }
 
-export async function executeJavaExtensionCommand(commandName: string, ...rest) {
+export async function executeJavaExtensionCommand(commandName: string, ...rest: any[]) {
     // TODO: need to handle error and trace telemetry
     const javaExtension = utility.getJavaExtension();
     if (!javaExtension) {
diff --git a/src/configurationProvider.ts b/src/configurationProvider.ts
@@ -4,7 +4,6 @@ import * as fs from "fs";
 import * as _ from "lodash";
 import * as os from "os";
 import * as path from "path";
-import { debug } from "util";
 import * as vscode from "vscode";
 
 import { instrumentOperation, sendInfo } from "vscode-extension-telemetry-wrapper";
@@ -19,7 +18,7 @@ import { mainClassPicker } from "./mainClassPicker";
 import { resolveJavaProcess } from "./processPicker";
 import * as utility from "./utility";
 
-const platformNameMappings = {
+const platformNameMappings: {[key: string]: string} = {
     win32: "windows",
     linux: "linux",
     darwin: "osx",
@@ -38,20 +37,22 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
                     this.isUserSettingsDirty = true;
                 }
             }
+            return undefined;
         });
     }
 
     // Returns an initial debug configurations based on contextual information.
-    public provideDebugConfigurations(folder: vscode.WorkspaceFolder | undefined, token?: vscode.CancellationToken):
+    public provideDebugConfigurations(folder: vscode.WorkspaceFolder | undefined, _token?: vscode.CancellationToken):
         vscode.ProviderResult<vscode.DebugConfiguration[]> {
-        const provideDebugConfigurationsHandler = instrumentOperation("provideDebugConfigurations", (operationId: string) => {
+        const provideDebugConfigurationsHandler = instrumentOperation("provideDebugConfigurations", (_operationId: string) => {
             return <Thenable<vscode.DebugConfiguration[]>>this.provideDebugConfigurationsAsync(folder);
         });
         return provideDebugConfigurationsHandler();
     }
 
     // Try to add all missing attributes to the debug configuration being launched.
-    public resolveDebugConfiguration(folder: vscode.WorkspaceFolder | undefined, config: vscode.DebugConfiguration, token?: vscode.CancellationToken):
+    public resolveDebugConfiguration(_folder: vscode.WorkspaceFolder | undefined,
+                                     config: vscode.DebugConfiguration, _token?: vscode.CancellationToken):
         vscode.ProviderResult<vscode.DebugConfiguration> {
         // If no debug configuration is provided, then generate one in memory.
         if (this.isEmptyConfig(config)) {
@@ -67,8 +68,8 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
     public resolveDebugConfigurationWithSubstitutedVariables(
         folder: vscode.WorkspaceFolder | undefined,
         config: vscode.DebugConfiguration,
-        token?: vscode.CancellationToken): vscode.ProviderResult<vscode.DebugConfiguration> {
-        const resolveDebugConfigurationHandler = instrumentOperation("resolveDebugConfiguration", (operationId: string) => {
+        _token?: vscode.CancellationToken): vscode.ProviderResult<vscode.DebugConfiguration> {
+        const resolveDebugConfigurationHandler = instrumentOperation("resolveDebugConfiguration", (_operationId: string) => {
             try {
                 // See https://github.com/microsoft/vscode-java-debug/issues/778
                 // Merge the platform specific properties to the global config to simplify the subsequent resolving logic.
@@ -85,9 +86,9 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
         return resolveDebugConfigurationHandler();
     }
 
-    private provideDebugConfigurationsAsync(folder: vscode.WorkspaceFolder | undefined, token?: vscode.CancellationToken) {
+    private provideDebugConfigurationsAsync(folder: vscode.WorkspaceFolder | undefined, _token?: vscode.CancellationToken) {
         return vscode.window.withProgress({ location: vscode.ProgressLocation.Window }, (p) => {
-            return new Promise(async (resolve, reject) => {
+            return new Promise(async (resolve, _reject) => {
                 p.report({ message: "Auto generating configuration..." });
                 const defaultLaunchConfig = {
                     type: "java",
@@ -104,7 +105,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
                     }
 
                     const mainClasses = await lsPlugin.resolveMainClass(folder ? folder.uri : undefined);
-                    let cache;
+                    let cache: {[key: string]: any};
                     cache = {};
                     const launchConfigs = mainClasses.map((item) => {
                         return {
@@ -126,7 +127,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
         });
     }
 
-    private mergePlatformProperties(folder: vscode.WorkspaceFolder, config: vscode.DebugConfiguration) {
+    private mergePlatformProperties(_folder: vscode.WorkspaceFolder, config: vscode.DebugConfiguration) {
         if (config && platformName && config[platformName]) {
             try {
                 for (const key of Object.keys(config[platformName])) {
@@ -139,7 +140,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
         }
     }
 
-    private constructLaunchConfigName(mainClass: string, projectName: string, cache: {}) {
+    private constructLaunchConfigName(mainClass: string, projectName: string, cache: {[key: string]: any}) {
         const prefix = "Debug (Launch)-";
         let name = prefix + mainClass.substr(mainClass.lastIndexOf(".") + 1);
         if (projectName !== undefined) {
@@ -199,7 +200,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
                 const mainClassOption = await this.resolveLaunchConfig(folder ? folder.uri : undefined, config);
                 if (!mainClassOption || !mainClassOption.mainClass) { // Exit silently if the user cancels the prompt fix by ESC.
                     // Exit the debug session.
-                    return;
+                    return undefined;
                 }
 
                 config.mainClass = mainClassOption.mainClass;
@@ -406,7 +407,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
                 return selectedFix;
             }
             // return undefined if the user clicks "Learn More".
-            return;
+            return undefined;
         }
 
         throw new utility.UserError({
diff --git a/src/extension.ts b/src/extension.ts
@@ -14,7 +14,7 @@ import { initializeCodeLensProvider, startDebugging } from "./debugCodeLensProvi
 import { handleHotCodeReplaceCustomEvent, initializeHotCodeReplace, NO_BUTTON, YES_BUTTON } from "./hotCodeReplace";
 import { JavaDebugAdapterDescriptorFactory } from "./javaDebugAdapterDescriptorFactory";
 import { logJavaException, logJavaInfo } from "./javaLogger";
-import { IMainClassOption, IMainMethod, resolveMainClass, resolveMainMethod } from "./languageServerPlugin";
+import { IMainClassOption, IMainMethod, resolveMainMethod } from "./languageServerPlugin";
 import { logger, Type } from "./logger";
 import { mainClassPicker  } from "./mainClassPicker";
 import { pickJavaProcess } from "./processPicker";
@@ -29,7 +29,7 @@ export async function activate(context: vscode.ExtensionContext) {
     await instrumentOperation("activation", initializeExtension)(context);
 }
 
-function initializeExtension(operationId: string, context: vscode.ExtensionContext) {
+function initializeExtension(_operationId: string, context: vscode.ExtensionContext) {
     // Deprecated
     logger.initialize(context, true);
 
@@ -123,7 +123,7 @@ function registerDebugEventListener(context: vscode.ExtensionContext) {
     }));
 }
 
-function handleUserNotification(customEvent) {
+function handleUserNotification(customEvent: vscode.DebugSessionCustomEvent) {
     if (customEvent.body.notificationType === "ERROR") {
         utility.showErrorMessageWithTroubleshooting({
             message: customEvent.body.message,
diff --git a/src/hotCodeReplace.ts b/src/hotCodeReplace.ts
@@ -38,7 +38,7 @@ export function initializeHotCodeReplace(context: vscode.ExtensionContext) {
     }));
 }
 
-export function handleHotCodeReplaceCustomEvent(hcrEvent) {
+export function handleHotCodeReplaceCustomEvent(hcrEvent: vscode.DebugSessionCustomEvent) {
     if (hcrEvent.body.changeType === HcrChangeType.BUILD_COMPLETE) {
         if (getHotReloadFlag() === "auto") {
             return vscode.window.withProgress({ location: vscode.ProgressLocation.Window }, (progress) => {
@@ -62,6 +62,7 @@ export function handleHotCodeReplaceCustomEvent(hcrEvent) {
             });
         }
     }
+    return undefined;
 }
 
 function getHotReloadFlag(): string {
diff --git a/src/hoverProvider.ts b/src/hoverProvider.ts
@@ -43,10 +43,10 @@ class DebugHoverProvider implements Disposable {
 }
 
 class InternalDebugHoverProvider implements HoverProvider {
-    public provideHover(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Hover> {
+    public provideHover(document: TextDocument, position: Position, _token: CancellationToken): ProviderResult<Hover> {
         const range = document.getWordRangeAtPosition(position, /\w+/);
         if (!range || document.getText(range) !== "main") {
-            return;
+            return undefined;
         }
 
         const line = document.lineAt(position);
@@ -69,6 +69,8 @@ class InternalDebugHoverProvider implements HoverProvider {
             contributed.isTrusted = true;
             return new Hover(contributed);
         }
+
+        return undefined;
     }
 
     private isMainMethod(line: string): boolean {
diff --git a/src/javaDebugAdapterDescriptorFactory.ts b/src/javaDebugAdapterDescriptorFactory.ts
@@ -8,8 +8,8 @@ import { Type } from "./logger";
 import { convertErrorToMessage, showErrorMessageWithTroubleshooting } from "./utility";
 
 export class JavaDebugAdapterDescriptorFactory implements DebugAdapterDescriptorFactory {
-    public async createDebugAdapterDescriptor(session: DebugSession, executable: DebugAdapterExecutable): Promise<DebugAdapterDescriptor> {
-        let error;
+    public async createDebugAdapterDescriptor(_session: DebugSession, _executable: DebugAdapterExecutable): Promise<DebugAdapterDescriptor> {
+        let error: Error;
         try {
             const debugServerPort = <number> (await startDebugSession());
             if (debugServerPort) {
@@ -28,5 +28,6 @@ export class JavaDebugAdapterDescriptorFactory implements DebugAdapterDescriptor
             message: "Failed to start debug server.",
         };
         showErrorMessageWithTroubleshooting(message);
+        return undefined;
     }
 }
diff --git a/src/javaLogger.ts b/src/javaLogger.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { sendError, sendInfo, sendOperationError } from "vscode-extension-telemetry-wrapper";
+import { sendInfo, sendOperationError } from "vscode-extension-telemetry-wrapper";
 
 export function logJavaException(errorProperties: any): void {
     /**
diff --git a/src/languageServerPlugin.ts b/src/languageServerPlugin.ts
@@ -45,7 +45,7 @@ export function startDebugSession() {
     return commands.executeJavaLanguageServerCommand(commands.JAVA_START_DEBUGSESSION);
 }
 
-export function resolveClasspath(mainClass, projectName) {
+export function resolveClasspath(mainClass: string, projectName: string) {
     return commands.executeJavaLanguageServerCommand(commands.JAVA_RESOLVE_CLASSPATH, mainClass, projectName);
 }
 
@@ -101,7 +101,7 @@ export async function isOnClasspath(uri: string): Promise<boolean> {
     }
 }
 
-export function resolveJavaExecutable(mainClass, projectName) {
+export function resolveJavaExecutable(mainClass: string, projectName: string) {
     return commands.executeJavaLanguageServerCommand(commands.JAVA_RESOLVE_JAVAEXECUTABLE, mainClass, projectName);
 }
 
diff --git a/src/launchCommand.ts b/src/launchCommand.ts
@@ -60,8 +60,8 @@ export async function addMoreHelpfulVMArgs(config: vscode.DebugConfiguration) {
 }
 
 function checkJavaVersion(javaExec: string): Promise<number> {
-    return new Promise((resolve, reject) => {
-        cp.execFile(javaExec, ["-version"], {}, (error, stdout, stderr) => {
+    return new Promise((resolve, _reject) => {
+        cp.execFile(javaExec, ["-version"], {}, (_error, _stdout, stderr) => {
             const javaVersion = parseMajorVersion(stderr);
             resolve(javaVersion);
         });
diff --git a/src/mainClassPicker.ts b/src/mainClassPicker.ts
@@ -35,7 +35,7 @@ class MainClassPicker {
         }
 
         if (!options || !options.length) {
-            return;
+            return undefined;
         } else if (autoPick && options.length === 1) {
             return options[0];
         }
@@ -53,6 +53,7 @@ class MainClassPicker {
         if (selected) {
             return selected.data;
         }
+        return undefined;
     }
 
     // tslint:disable-next-line
@@ -77,7 +78,7 @@ class MainClassPicker {
         }
 
         if (!options || !options.length) {
-            return;
+            return undefined;
         } else if (autoPick && options.length === 1) {
             return options[0];
         }
@@ -146,6 +147,7 @@ class MainClassPicker {
             this.updateMRUTimestamp(selected.data);
             return selected.data;
         }
+        return undefined;
     }
 
     private getMRUTimestamp(mainClassOption: IMainClassOption): number {
diff --git a/src/processPicker.ts b/src/processPicker.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as path from "path";
-import { DebugConfiguration, window } from "vscode";
+import { window } from "vscode";
 import { getProcesses, getProcessTree } from "./processTree";
 
 const JAVA_PATTERN = /(?:java|javaw|j9|j9w)$/i;
@@ -42,12 +42,14 @@ function convertToJavaProcess(pid: number, command: string, args: string): IJava
             };
         }
     }
+
+    return undefined;
 }
 
 export async function pickJavaProcess(): Promise<IJavaProcess> {
     const javaProcesses: IJavaProcess[] = [];
     try {
-        await getProcesses((pid: number, ppid: number, command: string, args: string, date: number) => {
+        await getProcesses((pid: number, _ppid: number, command: string, args: string, _date: number) => {
             const javaProcess = convertToJavaProcess(pid, command, args);
             if (javaProcess) {
                 javaProcesses.push(javaProcess);
@@ -79,6 +81,8 @@ export async function pickJavaProcess(): Promise<IJavaProcess> {
     if (pick) {
         return pick.process;
     }
+
+    return undefined;
 }
 
 export async function resolveJavaProcess(pid: number): Promise<IJavaProcess | undefined> {
diff --git a/src/terminalLinkProvider.ts b/src/terminalLinkProvider.ts
@@ -14,7 +14,7 @@ export class JavaTerminalLinkProvder implements TerminalLinkProvider<IJavaTermin
      * @param token A cancellation token.
      * @return A list of terminal links for the given line.
      */
-    public provideTerminalLinks(context: TerminalLinkContext, token: CancellationToken): ProviderResult<IJavaTerminalLink[]> {
+    public provideTerminalLinks(context: TerminalLinkContext, _token: CancellationToken): ProviderResult<IJavaTerminalLink[]> {
         if (context.terminal.name !== "Java Debug Console" && context.terminal.name !== "Java Process Console") {
             return [];
         }
@@ -32,6 +32,8 @@ export class JavaTerminalLinkProvder implements TerminalLinkProvider<IJavaTermin
                 lineNumber: sourceLineNumber,
             }];
         }
+
+        return [];
     }
 
     /**
diff --git a/src/utility.ts b/src/utility.ts
@@ -23,7 +23,7 @@ export class UserError extends Error {
 }
 
 export class JavaExtensionNotEnabledError extends Error {
-    constructor(message) {
+    constructor(message: string) {
         super(message);
         setUserError(this);
     }
@@ -95,7 +95,7 @@ export async function showErrorMessageWithTroubleshooting(message: ITroubleshoot
 function handleTroubleshooting(choice: string, message: string, anchor: string): string | undefined {
     if (choice === LEARN_MORE) {
         openTroubleshootingPage(message, anchor);
-        return;
+        return undefined;
     }
 
     return choice;
diff --git a/test/extension.test.ts b/test/extension.test.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ function checkErrorsReportedByJavaExtension(): boolean {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`async function showFixSuggestions(operationId: string) {`
`89`		`- let buildFiles = [];`
	`89`	`+ let buildFiles: string[] = [];`
`90`	`90`	`try {`
`91`	`91`	`buildFiles = await lsPlugin.resolveBuildFiles();`
`92`	`92`	`} catch (error) {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export function initializeHotCodeReplace(context: vscode.ExtensionContext) {`
`38`	`38`	`}));`
`39`	`39`	`}`
`40`	`40`
`41`		`-export function handleHotCodeReplaceCustomEvent(hcrEvent) {`
	`41`	`+export function handleHotCodeReplaceCustomEvent(hcrEvent: vscode.DebugSessionCustomEvent) {`
`42`	`42`	`if (hcrEvent.body.changeType === HcrChangeType.BUILD_COMPLETE) {`
`43`	`43`	`if (getHotReloadFlag() === "auto") {`
`44`	`44`	`return vscode.window.withProgress({ location: vscode.ProgressLocation.Window }, (progress) => {`
`@@ -62,6 +62,7 @@ export function handleHotCodeReplaceCustomEvent(hcrEvent) {`
`62`	`62`	`});`
`63`	`63`	`}`
`64`	`64`	`}`
	`65`	`+ return undefined;`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`function getHotReloadFlag(): string {`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ class DebugHoverProvider implements Disposable {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`class InternalDebugHoverProvider implements HoverProvider {`
`46`		`- public provideHover(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Hover> {`
	`46`	`+ public provideHover(document: TextDocument, position: Position, _token: CancellationToken): ProviderResult<Hover> {`
`47`	`47`	`const range = document.getWordRangeAtPosition(position, /\w+/);`
`48`	`48`	`if (!range \|\| document.getText(range) !== "main") {`
`49`		`- return;`
	`49`	`+ return undefined;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`const line = document.lineAt(position);`
`@@ -69,6 +69,8 @@ class InternalDebugHoverProvider implements HoverProvider {`
`69`	`69`	`contributed.isTrusted = true;`
`70`	`70`	`return new Hover(contributed);`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+ return undefined;`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`private isMainMethod(line: string): boolean {`