Update interface names and clean-up some

Author: Kapil Borle

src/checkboxQuickPick.ts

@@ -2,36 +2,36 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import vscode = require('vscode');
+import vscode = require("vscode");
 import QuickPickItem = vscode.QuickPickItem;
-const figures = require('figures');
+const figures: any = require("figures");
 
-export interface Option {
+export interface ICheckboxOption {
     name: string;
     isSelected: boolean;
 }
 
 export class CheckboxQuickPick {
-    private options: Option[];
+    private options: ICheckboxOption[];
     private readonly confirm: string;
     private readonly checkboxOn: string;
     private readonly checkboxOff: string;
     private readonly confirmPlaceHolder: string;
 
-    constructor(options: Option[]) {
+    constructor(options: ICheckboxOption[]) {
         this.options = options;
         this.confirm = figures.tick;
         this.checkboxOn = "[ x ]";
         this.checkboxOff = "[   ]";
         this.confirmPlaceHolder = "Select " + this.confirm + " to confirm";
     }
 
-    public show(callback: (options: Option[]) => void) {
-        let tempOptions = this.options.slice();
+    public show(callback: (options: ICheckboxOption[]) => void): void {
+        let tempOptions: ICheckboxOption[] = this.options.slice();
         this.showInner(tempOptions, callback);
     }
 
-    private showInner(tempOptions: Option[], callback: (options: Option[]) => void) {
+    private showInner(tempOptions: ICheckboxOption[], callback: (options: ICheckboxOption[]) => void): void {
         vscode.window.showQuickPick(
             this.getQuickPickItems(tempOptions),
             { ignoreFocusOut: true, placeHolder: this.confirmPlaceHolder }).then((selection) => {
@@ -45,18 +45,17 @@ export class CheckboxQuickPick {
                     return;
                 }
 
-                let index = this.getRuleIndex(tempOptions, selection.description);
-                // this.toggleOption(tempOptions[index]);
-                tempOptions[index].isSelected = this.toggleState(tempOptions[index].isSelected);
+                let index: number = this.getRuleIndex(tempOptions, selection.description);
+                this.toggleOption(tempOptions[index]);
                 this.showInner(tempOptions, callback);
             });
     }
 
-    private getRuleIndex(options: Option[], optionLabel: string) {
+    private getRuleIndex(options: ICheckboxOption[], optionLabel: string): number {
         return options.findIndex(opt => opt.name == optionLabel);
     }
 
-    private getQuickPickItems(tempOptions: Option[]): QuickPickItem[] {
+    private getQuickPickItems(tempOptions: ICheckboxOption[]): QuickPickItem[] {
         let quickPickItems: QuickPickItem[] = [];
         tempOptions.forEach(option =>
             quickPickItems.push({
@@ -70,14 +69,14 @@ export class CheckboxQuickPick {
         return checkBox == this.checkboxOn;
     }
 
-    private toggleOption(option: Option) {
-        option.isSelected = this.toggleState(option.isSelected);
-    }
-
     private toggleState(state: boolean): boolean {
         return !state;
     }
 
+    private toggleOption(option: ICheckboxOption): void {
+        option.isSelected = this.toggleState(option.isSelected);
+    }
+
     private toggleCheckBox(checkBox: string): string {
         return this.convertToCheckBox(this.toggleState(this.convertToState(checkBox)));
     }

src/features/SelectPSSARules.ts

@@ -2,22 +2,20 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import vscode = require('vscode');
-import { IFeature } from '../feature';
-import QuickPickItem = vscode.QuickPickItem;
-import { LanguageClient, RequestType, NotificationType } from 'vscode-languageclient';
-import { Option, CheckboxQuickPick } from '../checkboxQuickPick';
-const figures = require('figures');
+import vscode = require("vscode");
+import { IFeature } from "../feature";
+import { LanguageClient, RequestType } from "vscode-languageclient";
+import { ICheckboxOption, CheckboxQuickPick } from "../checkboxQuickPick";
 
 export namespace GetPSSARulesRequest {
-    export const type: RequestType<any, any, void> = { get method() { return 'powerShell/getPSSARules'; } };
+    export const type: RequestType<any, any, void> = { get method(): string { return "powerShell/getPSSARules"; } };
 }
 
 export namespace SetPSSARulesRequest {
-    export const type: RequestType<any, any, void> = { get method() { return 'powerShell/setPSSARules'; } }
+    export const type: RequestType<any, any, void> = { get method(): string { return "powerShell/setPSSARules"; } };
 }
 
-interface RuleInfo {
+interface IRuleInfo {
     name: string;
     isEnabled: boolean;
 }
@@ -28,33 +26,32 @@ export class SelectPSSARulesFeature implements IFeature {
     private languageClient: LanguageClient;
 
     constructor() {
-        this.command = vscode.commands.registerCommand('PowerShell.SelectPSSARules', () => {
+        this.command = vscode.commands.registerCommand("PowerShell.SelectPSSARules", () => {
             if (this.languageClient === undefined) {
                 // TODO: Log error message
                 return;
             }
 
-            let options: Option[] = [];
             this.languageClient.sendRequest(GetPSSARulesRequest.type, null).then((returnedRules) => {
-                let options: Option[] = returnedRules.map(function (rule): Option {
+                let options: ICheckboxOption[] = returnedRules.map(function (rule: IRuleInfo): ICheckboxOption {
                     return { name: rule.name, isSelected: rule.isEnabled };
                 });
                 (new CheckboxQuickPick(options)).show((updatedOptions) => {
                     this.languageClient.sendRequest(
                         SetPSSARulesRequest.type,
-                        updatedOptions.map(function (option): RuleInfo {
+                        updatedOptions.map(function (option: ICheckboxOption): IRuleInfo {
                             return { name: option.name, isEnabled: option.isSelected };
                         }));
                 });
             });
         });
     }
 
-    public setLanguageClient(languageclient: LanguageClient) {
+    public setLanguageClient(languageclient: LanguageClient): void {
         this.languageClient = languageclient;
     }
 
-    public dispose() {
+    public dispose(): void {
         this.command.dispose();
     }
 }