Merge remote-tracking branch 'remotes/upstream/master' into simplify-…

…codebase

# Conflicts:
#	yarn.lock

.vscode/launch.json

@@ -10,7 +10,9 @@
             "args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
             "stopOnEntry": false,
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out/src",
+            "outFiles": [
+                "${workspaceRoot}/out/**/*.js"
+            ],
             "preLaunchTask": "npm"
         },
         {
@@ -21,7 +23,9 @@
             "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
             "stopOnEntry": false,
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out/test",
+            "outFiles": [
+                "${workspaceRoot}/out/**/*.js"
+            ],
             "preLaunchTask": "npm"
         }
     ]

.vscode/tasks.json

@@ -8,23 +8,24 @@
 
 // A task runner that calls a custom npm script that compiles the extension.
 {
-    "version": "0.1.0",
-
-    // we want to run npm
-    "command": "npm",
-
-    // the command is a shell script
-    "isShellCommand": true,
-
-    // show the output window only if unrecognized errors occur.
-    "showOutput": "silent",
-
-    // we run the custom script "compile" as defined in package.json
-    "args": ["run", "compile", "--loglevel", "silent"],
-
-    // The tsc compiler is started in watching mode
-    "isWatching": true,
-
-    // use the standard tsc in watch mode problem matcher to find compile problems in the output.
-    "problemMatcher": "$tsc-watch"
+    "tasks": [{
+        "taskName": "npm",
+        // we want to run npm
+        "command": "npm",
+        // the command is a shell script
+        "isShellCommand": true,
+        // show the output window only if unrecognized errors occur.
+        "showOutput": "silent",
+        // we run the custom script "compile" as defined in package.json
+        "args": [
+            "run",
+            "compile",
+            "--loglevel",
+            "silent"
+        ],
+        // The tsc compiler is started in watching mode
+        "isBackground": true,
+        // use the standard tsc in watch mode problem matcher to find compile problems in the output.
+        "problemMatcher": "$tsc-watch"
+    }]
 }

package.json

@@ -28,16 +28,21 @@
     },
     "main": "./out/src/extension",
     "scripts": {
-        "vscode:prepublish": "node ./node_modules/vscode/bin/compile",
-        "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
+        "vscode:prepublish": "tsc -p ./",
+        "compile": "tsc -watch -p ./",
         "postinstall": "node ./node_modules/vscode/bin/install"
     },
     "devDependencies": {
-        "typescript": "^1.8.5",
-        "vscode": "^0.11.0"
+        "@types/async": "^2.0.40",
+        "@types/css": "^0.0.30",
+        "@types/lodash": "^4.14.63",
+        "@types/mocha": "^2.2.41",
+        "@types/node": "^7.0.18",
+        "typescript": "^2.3.2",
+        "vscode": "^1.1.0"
     },
     "dependencies": {
-        "async": "^2.0.1",
+        "async": "^2.4.0",
         "css": "^2.2.1"
     }
-}
+}

src/notifier.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 
 class Notifier {
-    private _timeoutId: number;
+    private _timeoutId: NodeJS.Timer;
 
     public statusBarItem: vscode.StatusBarItem;
 

tsconfig.json

@@ -3,13 +3,14 @@
         "module": "commonjs",
         "target": "es6",
         "outDir": "out",
-        "noLib": true,
         "sourceMap": true,
         "alwaysStrict": true,
         "rootDir": ".",
         "noImplicitAny": true,
         "noImplicitReturns": true,
-        "pretty": true
+        "lib": [
+            "es6"
+        ]
     },
     "exclude": [
         "node_modules",