Updates dependencies

Fixes issue with new typescript
Pins node version to match vscode's version (7.9)

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// for the documentation about the extensions.json format
+	"recommendations": [
+        "msjsdiag.debugger-for-chrome",
+        "ms-vscode.typescript-javascript-grammar",
+        "eg2.tslint"
+	]
+}

.vscode/launch.json

@@ -23,17 +23,6 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/out/src/**/*.js"],
             "preLaunchTask": "build"
-        },
-        {
-            "name": "Launch Tests",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
-            "stopOnEntry": false,
-            "sourceMaps": true,
-            "outFiles": ["${workspaceRoot}/out/test/**/*.js"],
-            "preLaunchTask": "build"
         }
     ]
 }

.vscode/tasks.json

@@ -24,10 +24,7 @@
                 "$tsc",
                 "$tslint5"
             ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
+            "group": "build"
         },
         {
             "label": "lint",
@@ -56,7 +53,10 @@
             "problemMatcher": [
                 "$tsc-watch"
             ],
-            "group": "build"
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
         }
     ]
 }

.vscodeignore

@@ -9,7 +9,7 @@ images/**
 test/**
 src/**
 out/ui/**
-**/*.map
+*.map
 .github/**
 .gitignore
 .rpt2_cache/**

package.json

@@ -45,6 +45,9 @@
         "url": "https://github.com/eamodio/vscode-gitlens.git"
     },
     "main": "./out/extension",
+    "activationEvents": [
+        "*"
+    ],
     "contributes": {
         "configuration": {
             "type": "object",
@@ -3211,9 +3214,6 @@
             ]
         }
     },
-    "activationEvents": [
-        "*"
-    ],
     "scripts": {
         "build": "npm run lint && tsc -m commonjs -p ./ && npm run build-ui -- --env.quick",
         "build-ui": "webpack --context ./src/ui --config ./src/ui/webpack.config.js",
@@ -3242,17 +3242,17 @@
     },
     "devDependencies": {
         "@types/copy-paste": "1.1.30",
-        "@types/node": "10.1.4",
+        "@types/node": "7.0.65",
         "@types/tmp": "0.0.33",
         "husky": "0.14.3",
-        "ts-loader": "4.3.0",
+        "ts-loader": "4.3.1",
         "tslint": "5.10.0",
-        "typescript": "2.8.4",
+        "typescript": "2.9.1",
         "uglify-es": "3.3.9",
         "uglifyjs-webpack-plugin": "1.2.5",
         "vscode": "1.1.18",
         "webpack": "4.10.2",
-        "webpack-cli": "2.1.4",
+        "webpack-cli": "3.0.1",
         "webpack-node-externals": "1.7.2"
     }
 }

src/configuration.ts

@@ -1,12 +1,12 @@
 'use strict';
 export * from './ui/config';
-export { ExtensionKey };
 
 import { Functions } from './system';
 import { ConfigurationChangeEvent, ConfigurationTarget, Event, EventEmitter, ExtensionContext, Uri, workspace } from 'vscode';
 import { IConfig, KeyMap } from './ui/config';
-import { CommandContext, ExtensionKey, setCommandContext } from './constants';
+import { CommandContext, setCommandContext } from './constants';
 import { Container } from './container';
+import { extensionId } from './extension';
 import { clearGravatarCache } from './gitService';
 
 const emptyConfig: any = new Proxy<any>({} as IConfig, {
@@ -42,7 +42,7 @@ export class Configuration {
     }
 
     private onConfigurationChanged(e: ConfigurationChangeEvent) {
-        if (!e.affectsConfiguration(ExtensionKey, null!)) return;
+        if (!e.affectsConfiguration(extensionId, null!)) return;
 
         Container.resetConfig();
 
@@ -79,12 +79,12 @@ export class Configuration {
 
     get<T>(section?: string, resource?: Uri | null, defaultValue?: T) {
         return defaultValue === undefined
-            ? workspace.getConfiguration(section === undefined ? undefined : ExtensionKey, resource!).get<T>(section === undefined ? ExtensionKey : section)!
-            : workspace.getConfiguration(section === undefined ? undefined : ExtensionKey, resource!).get<T>(section === undefined ? ExtensionKey : section, defaultValue)!;
+            ? workspace.getConfiguration(section === undefined ? undefined : extensionId, resource!).get<T>(section === undefined ? extensionId : section)!
+            : workspace.getConfiguration(section === undefined ? undefined : extensionId, resource!).get<T>(section === undefined ? extensionId : section, defaultValue)!;
     }
 
     changed(e: ConfigurationChangeEvent, section: string, resource?: Uri | null) {
-        return e.affectsConfiguration(`${ExtensionKey}.${section}`, resource!);
+        return e.affectsConfiguration(`${extensionId}.${section}`, resource!);
     }
 
     initializing(e: ConfigurationChangeEvent) {
@@ -92,7 +92,7 @@ export class Configuration {
     }
 
     inspect(section?: string, resource?: Uri | null) {
-        return workspace.getConfiguration(section === undefined ? undefined : ExtensionKey, resource!).inspect(section === undefined ? ExtensionKey : section);
+        return workspace.getConfiguration(section === undefined ? undefined : extensionId, resource!).inspect(section === undefined ? extensionId : section);
     }
 
     async migrate<TFrom, TTo>(from: string, to: string, options: { fallbackValue?: TTo, migrationFn?: (value: TFrom) => TTo } = {}): Promise<boolean> {
@@ -195,7 +195,7 @@ export class Configuration {
 
     update(section: string, value: any, target: ConfigurationTarget, resource?: Uri | null) {
         return workspace
-            .getConfiguration(ExtensionKey, target === ConfigurationTarget.Global ? undefined : resource!)
+            .getConfiguration(extensionId, target === ConfigurationTarget.Global ? undefined : resource!)
             .update(section, value, target);
     }
 

src/constants.ts

@@ -1,14 +1,6 @@
 'use strict';
 import { commands, TextDocument, TextEditor, window } from 'vscode';
 
-export const ExtensionId = 'gitlens';
-export const ExtensionKey = ExtensionId;
-export const ExtensionOutputChannelName = 'GitLens';
-export const ExtensionTerminalName = 'GitLens';
-export const QualifiedExtensionId = `eamodio.${ExtensionId}`;
-
-export const ApplicationInsightsKey = 'a9c302f8-6483-4d01-b92c-c159c799c679';
-
 export const RangeEndOfLineIndex = 100000000;
 
 export enum BuiltInCommands {

src/extension.ts

@@ -1,8 +1,15 @@
 'use strict';
+
+export const applicationInsightsKey = 'a9c302f8-6483-4d01-b92c-c159c799c679';
+export const extensionId = 'gitlens';
+export const extensionOutputChannelName = 'GitLens';
+export const extensionTerminalName = 'GitLens';
+export const qualifiedExtensionId = `eamodio.${extensionId}`;
+
 import { Versions } from './system';
 import { commands, ExtensionContext, extensions, window, workspace } from 'vscode';
 import { CodeLensLanguageScope, CodeLensScopes, configuration, Configuration, HighlightLocations, IConfig, IMenuConfig, KeyMap, OutputLevel } from './configuration';
-import { CommandContext, ExtensionKey, GlobalState, QualifiedExtensionId, setCommandContext } from './constants';
+import { CommandContext, GlobalState, setCommandContext } from './constants';
 import { Commands, configureCommands } from './commands';
 import { Container } from './container';
 import { GitService } from './gitService';
@@ -19,7 +26,7 @@ export async function activate(context: ExtensionContext) {
 
     Logger.configure(context);
 
-    const gitlens = extensions.getExtension(QualifiedExtensionId)!;
+    const gitlens = extensions.getExtension(qualifiedExtensionId)!;
     const gitlensVersion = gitlens.packageJSON.version;
 
     const enabled = workspace.getConfiguration('git', null!).get<boolean>('enabled', true);
@@ -57,7 +64,7 @@ export async function activate(context: ExtensionContext) {
     catch (ex) {
         Logger.error(ex, `GitLens(v${gitlensVersion}).activate`);
         if (ex.message.includes('Unable to find git')) {
-            await window.showErrorMessage(`GitLens was unable to find Git. Please make sure Git is installed. Also ensure that Git is either in the PATH, or that '${ExtensionKey}.${configuration.name('advanced')('git').value}' is pointed to its installed location.`);
+            await window.showErrorMessage(`GitLens was unable to find Git. Please make sure Git is installed. Also ensure that Git is either in the PATH, or that '${extensionId}.${configuration.name('advanced')('git').value}' is pointed to its installed location.`);
         }
         setCommandContext(CommandContext.Enabled, false);
         return;

src/keyboard.ts

@@ -1,6 +1,7 @@
 'use strict';
 import { commands, Disposable } from 'vscode';
-import { CommandContext, ExtensionKey, setCommandContext } from './constants';
+import { CommandContext, setCommandContext } from './constants';
+import { extensionId } from './extension';
 import { Logger } from './logger';
 
 export declare interface KeyCommand {
@@ -95,7 +96,7 @@ export class Keyboard extends Disposable {
     constructor() {
         super(() => this.dispose());
 
-        const subscriptions = keys.map(key => commands.registerCommand(`${ExtensionKey}.key.${key}`, () => this.execute(key), this));
+        const subscriptions = keys.map(key => commands.registerCommand(`${extensionId}.key.${key}`, () => this.execute(key), this));
         this._disposable = Disposable.from(...subscriptions);
     }
 

src/logger.ts

@@ -1,16 +1,15 @@
 'use strict';
 import { ConfigurationChangeEvent, ExtensionContext, OutputChannel, window } from 'vscode';
 import { configuration, OutputLevel } from './configuration';
-import { ExtensionOutputChannelName } from './constants';
+import { extensionOutputChannelName } from './extension';
 // import { Telemetry } from './telemetry';
 
-const ConsolePrefix = `[${ExtensionOutputChannelName}]`;
+const ConsolePrefix = `[${extensionOutputChannelName}]`;
 
 const isDebuggingRegex = /^--inspect(-brk)?=?/;
 
 export class Logger {
 
-    static debug = false;
     static level: OutputLevel = OutputLevel.Silent;
     static output: OutputChannel | undefined;
 
@@ -22,12 +21,7 @@ export class Logger {
     private static onConfigurationChanged(e: ConfigurationChangeEvent) {
         const initializing = configuration.initializing(e);
 
-        let section = configuration.name('debug').value;
-        if (initializing || configuration.changed(e, section)) {
-            this.debug = configuration.get<boolean>(section);
-        }
-
-        section = configuration.name('outputLevel').value;
+        const section = configuration.name('outputLevel').value;
         if (initializing || configuration.changed(e, section)) {
             this.level = configuration.get<OutputLevel>(section);
 
@@ -38,40 +32,40 @@ export class Logger {
                 }
             }
             else {
-                this.output = this.output || window.createOutputChannel(ExtensionOutputChannelName);
+                this.output = this.output || window.createOutputChannel(extensionOutputChannelName);
             }
         }
     }
 
     static log(message?: any, ...params: any[]): void {
-        if (this.debug) {
+        if (Logger.isDebugging) {
             console.log(this.timestamp, ConsolePrefix, message, ...params);
         }
 
         if (this.output !== undefined && (this.level === OutputLevel.Verbose || this.level === OutputLevel.Debug)) {
-            this.output.appendLine((this.debug ? [this.timestamp, message, ...params] : [message, ...params]).join(' '));
+            this.output.appendLine((Logger.isDebugging ? [this.timestamp, message, ...params] : [message, ...params]).join(' '));
         }
     }
 
     static error(ex: Error, classOrMethod?: string, ...params: any[]): void {
-        if (this.debug) {
+        if (Logger.isDebugging) {
             console.error(this.timestamp, ConsolePrefix, classOrMethod, ...params, ex);
         }
 
         if (this.output !== undefined && this.level !== OutputLevel.Silent) {
-            this.output.appendLine((this.debug ? [this.timestamp, classOrMethod, ...params, ex] : [classOrMethod, ...params, ex]).join(' '));
+            this.output.appendLine((Logger.isDebugging ? [this.timestamp, classOrMethod, ...params, ex] : [classOrMethod, ...params, ex]).join(' '));
         }
 
         // Telemetry.trackException(ex);
     }
 
     static warn(message?: any, ...params: any[]): void {
-        if (this.debug) {
+        if (Logger.isDebugging) {
             console.warn(this.timestamp, ConsolePrefix, message, ...params);
         }
 
         if (this.output !== undefined && this.level !== OutputLevel.Silent) {
-            this.output.appendLine((this.debug ? [this.timestamp, message, ...params] : [message, ...params]).join(' '));
+            this.output.appendLine((Logger.isDebugging ? [this.timestamp, message, ...params] : [message, ...params]).join(' '));
         }
     }
 
@@ -86,7 +80,7 @@ export class Logger {
         if (this.level !== OutputLevel.Debug) return;
 
         if (this.gitOutput === undefined) {
-            this.gitOutput = window.createOutputChannel(`${ExtensionOutputChannelName} (Git)`);
+            this.gitOutput = window.createOutputChannel(`${extensionOutputChannelName} (Git)`);
         }
         this.gitOutput.appendLine(`${this.timestamp} ${command} (${cwd})${ex === undefined ? '' : `\n\n${ex.toString()}`}`);
     }

src/system/function.ts

@@ -42,13 +42,13 @@ export namespace Functions {
         return _once(fn);
     }
 
-    export function propOf<T, K extends keyof T>(o: T, key: K) {
-        const propOfCore = <T, K extends keyof T>(o: T, key: K) => {
+    export function propOf<T, K extends Extract<keyof T, string>>(o: T, key: K) {
+        const propOfCore = <T, K extends Extract<keyof T, string>>(o: T, key: K) => {
             const value: string = (propOfCore as IPropOfValue).value === undefined
                 ? key
                 : `${(propOfCore as IPropOfValue).value}.${key}`;
             (propOfCore as IPropOfValue).value = value;
-            const fn = <Y extends keyof T[K]>(k: Y) => propOfCore(o[key], k);
+            const fn = <Y extends Extract<keyof T[K], string>>(k: Y) => propOfCore(o[key], k);
             return Object.assign(fn, { value: value });
         };
         return propOfCore(o, key);

src/ui/package-lock.json

@@ -5,9 +5,9 @@
     "requires": true,
     "dependencies": {
         "@types/node": {
-            "version": "10.1.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-10.1.4.tgz",
-            "integrity": "sha512-GpQxofkdlHYxjHad98UUdNoMO7JrmzQZoAaghtNg14Gwg7YkohcrCoJEcEMSgllx4VIZ+mYw7ZHjfaeIagP/rg==",
+            "version": "7.0.65",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.65.tgz",
+            "integrity": "sha512-iUdyWWikcQnGvIZnYh5ZxnxeREykndA9+iGdo068NGNutibWknDjmmNMq/8cnS1eaTCcgqJsPsFppw3XJWNlUg==",
             "dev": true
         },
         "@types/tapable": {
@@ -273,9 +273,9 @@
             "dev": true
         },
         "acorn": {
-            "version": "5.5.3",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
-            "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
+            "version": "5.6.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.1.tgz",
+            "integrity": "sha512-XH4o5BK5jmw9PzSGK7mNf+/xV+mPxQxGZoeC36OVsJZYV77JAG9NnI7T90hoUpI/C1TOfXWTvugRdZ9ZR3iE2Q==",
             "dev": true
         },
         "acorn-dynamic-import": {
@@ -1511,9 +1511,9 @@
             }
         },
         "caniuse-db": {
-            "version": "1.0.30000846",
-            "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000846.tgz",
-            "integrity": "sha1-2chvkUc4202gmO7e2ZdBPERWG9I=",
+            "version": "1.0.30000847",
+            "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000847.tgz",
+            "integrity": "sha1-/0BypUaICf7ArprDtANe+JHlsUQ=",
             "dev": true
         },
         "capture-stack-trace": {
@@ -2928,9 +2928,9 @@
             }
         },
         "es-abstract": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz",
-            "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
+            "version": "1.12.0",
+            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+            "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
             "dev": true,
             "requires": {
                 "es-to-primitive": "^1.1.1",
@@ -4515,12 +4515,12 @@
             }
         },
         "has": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-            "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has/-/has-1.0.2.tgz",
+            "integrity": "sha512-D5/WxwX+SrGfs/fiQn34RAoIZkCLJBDEfBWS1kmTI6G/1mtjhxTBiIiJi8EsKhwaQqKqj7lpKOi3i69tg3P+OQ==",
             "dev": true,
             "requires": {
-                "function-bind": "^1.0.2"
+                "function-bind": "^1.1.1"
             }
         },
         "has-ansi": {
@@ -8913,9 +8913,9 @@
             }
         },
         "sass-loader": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.1.tgz",
-            "integrity": "sha512-MeVVJFejJELlAbA7jrRchi88PGP6U9yIfqyiG+bBC4a9s2PX+ulJB9h8bbEohtPBfZmlLhNZ0opQM9hovRXvlw==",
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.2.tgz",
+            "integrity": "sha512-HfoUBjcBf56u7+Qb6/15OmfL4nymtACwAYXRuhgaSUJI3QF0ndID76SiTlwxDYgNYLtvP5s3xVSYMZISezsuKQ==",
             "dev": true,
             "requires": {
                 "clone-deep": "^2.0.1",
@@ -9545,9 +9545,9 @@
             }
         },
         "stream-http": {
-            "version": "2.8.2",
-            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz",
-            "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
+            "version": "2.8.3",
+            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+            "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
             "dev": true,
             "requires": {
                 "builtin-status-codes": "^3.0.0",
@@ -10052,9 +10052,9 @@
             }
         },
         "ts-loader": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-4.3.0.tgz",
-            "integrity": "sha512-+zduqQJaeouVrGY3y6+nUG7+OE1+Q7slGCHsiQM/aITCEZ0og3GxrJVsnjM5QcWvOcu9C4VR5dP+egIyT+sNNg==",
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-4.3.1.tgz",
+            "integrity": "sha512-ra304bebnyxd9nIJoKjQoeQLOENqrDG7vfppS+DkCnqOEv29GuiiWMvgebuCqFko0AkMFpoubRLeFM7YmlkL3w==",
             "dev": true,
             "requires": {
                 "chalk": "^2.3.0",
@@ -10494,9 +10494,9 @@
             "dev": true
         },
         "typescript": {
-            "version": "2.8.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.4.tgz",
-            "integrity": "sha512-IIU5cN1mR5J3z9jjdESJbnxikTrEz3lzAw/D0Tf45jHpBp55nY31UkUvmVHoffCfKHTqJs3fCLPDxknQTTFegQ==",
+            "version": "2.9.1",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
+            "integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
             "dev": true
         },
         "uglify-js": {

src/ui/package.json

@@ -25,7 +25,7 @@
         "watch": "webpack --watch"
     },
     "devDependencies": {
-        "@types/node": "10.1.4",
+        "@types/node": "7.0.65",
         "@types/webpack": "4.4.0",
         "css-loader": "0.28.11",
         "html-webpack-inline-source-plugin": "0.0.10",
@@ -33,11 +33,11 @@
         "imagemin-webpack-plugin": "2.1.5",
         "mini-css-extract-plugin": "0.4.0",
         "node-sass": "4.9.0",
-        "sass-loader": "7.0.1",
+        "sass-loader": "7.0.2",
         "style-loader": "0.21.0",
         "tslint": "5.10.0",
-        "ts-loader": "4.3.0",
-        "typescript": "2.8.4",
+        "ts-loader": "4.3.1",
+        "typescript": "2.9.1",
         "uglifyjs-webpack-plugin": "1.2.5",
         "webpack": "4.10.2"
     }

src/views/explorerCommands.ts

@@ -1,7 +1,8 @@
 import { Arrays } from '../system';
 import { commands, Disposable, InputBoxOptions, Terminal, TextDocumentShowOptions, Uri, window } from 'vscode';
-import { CommandContext, ExtensionTerminalName, setCommandContext } from '../constants';
+import { CommandContext, setCommandContext } from '../constants';
 import { Container } from '../container';
+import { extensionTerminalName } from '../extension';
 import { BranchNode, ExplorerNode, TagNode } from '../views/gitExplorer';
 import { CommitFileNode, CommitNode, ExplorerRefNode, RemoteNode, StashFileNode, StashNode, StatusFileCommitsNode, StatusUpstreamNode } from './explorerNodes';
 import { Commands, DiffWithCommandArgs, DiffWithCommandArgsRevision, DiffWithPreviousCommandArgs, DiffWithWorkingCommandArgs, openEditor, OpenFileInRemoteCommandArgs, OpenFileRevisionCommandArgs } from '../commands';
@@ -345,9 +346,9 @@ export class ExplorerCommands extends Disposable {
 
     private ensureTerminal(cwd: string): Terminal {
         if (this._terminal === undefined) {
-            this._terminal = window.createTerminal(ExtensionTerminalName);
+            this._terminal = window.createTerminal(extensionTerminalName);
             this._disposable = window.onDidCloseTerminal((e: Terminal) => {
-                if (e.name === ExtensionTerminalName) {
+                if (e.name === extensionTerminalName) {
                     this._terminal = undefined;
                     this._disposable!.dispose();
                     this._disposable = undefined;

tslint.json

@@ -31,22 +31,19 @@
             1
         ],
         "no-default-export": true,
+        "no-duplicate-variable": true,
         "no-eval": true,
-        // "no-for-in-array": true,
         "no-inferrable-types": [
             true,
             "ignore-params",
             "ignore-properties"
         ],
         "no-internal-module": true,
-        // "no-invalid-template-strings": true,
         "no-irregular-whitespace": true,
         "no-reference": true,
         "no-string-throw": true,
         "no-trailing-whitespace": true,
         "no-unnecessary-callback-wrapper": true,
-        // "no-unnecessary-qualifier": true,
-        // "no-unsafe-any": true,
         "no-unsafe-finally": true,
         "no-unused-expression": false,
         "no-var-keyword": true,
@@ -95,8 +92,6 @@
                 "asyncArrow": "always"
             }
         ],
-        // "strict-boolean-expressions": true,
-        // "strict-type-predicates": true,
         "trailing-comma": [
             true,
             {
@@ -135,5 +130,6 @@
             "check-separator",
             "check-type"
         ]
-    }
+    },
+    "defaultSeverity": "warning"
 }