From 4b3e1098f2d1c6a382690d022c3d4f789a6ce3ba Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Tue, 11 Oct 2016 03:34:15 +0200
Subject: [PATCH] Update VSCode and TypeScript

---
 package.json     |  7 ++++---
 src/extension.ts |  4 ++--
 tsconfig.json    | 10 +++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 2241664..f186032 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "preview": true,
   "version": "0.0.9",
   "engines": {
-    "vscode": "^1.4.0"
+    "vscode": "^1.6.0"
   },
   "keywords": [
     "php",
@@ -45,13 +45,14 @@
   },
   "devDependencies": {
     "tslint": "^3.15.1",
-    "typescript": "^1.8.10",
+    "typescript": "^2.0.3",
     "typings": "^1.3.3",
     "vsce": "^1.8.1",
     "vscode": "^0.11.17"
   },
   "dependencies": {
     "semver": "^5.3.0",
-    "vscode-languageclient": "^2.4.2-next.24"
+    "vscode": "^0.11.18",
+    "vscode-languageclient": "^2.5.0"
   }
 }
diff --git a/src/extension.ts b/src/extension.ts
index 824d78e..977217d 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -41,8 +41,8 @@ export function activate(context: vscode.ExtensionContext) {
         const serverOptions = () => new Promise<ChildProcess | StreamInfo>((resolve, reject) => {
             function spawnServer(...args: string[]): ChildProcess {
                 // The server is implemented in PHP
-                const serverPath = context.asAbsolutePath(path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php'));
-                const childProcess = spawn('php', [serverPath, ...args]);
+                args.unshift(context.asAbsolutePath(path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')));
+                const childProcess = spawn('php', args);
                 childProcess.stderr.on('data', (chunk: Buffer) => {
                     console.error(chunk + '');
                 });
diff --git a/tsconfig.json b/tsconfig.json
index bf51f69..8d101ea 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,15 +1,19 @@
 {
 	"compilerOptions": {
-		"target": "ES5",
+		"target": "ES6",
 		"module": "commonjs",
 		"moduleResolution": "node",
 		"outDir": "out",
 		"noLib": true,
     "noImplicitAny": true,
 		"sourceMap": true,
-    "rootDir": "src"
+    "rootDir": "src",
+    "strictNullChecks": true,
+    "noImplicitThis": true,
+    "noImplicitReturns": true
 	},
 	"exclude": [
-		"node_modules"
+		"node_modules",
+    "out"
 	]
 }