typescript upgrade

package.json

@@ -521,18 +521,20 @@
 		]
 	},
 	"scripts": {
-		"vscode:prepublish": "node ./node_modules/vscode/bin/compile",
-		"compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
-		"test": "node ./node_modules/vscode/bin/test",
+		"vscode:prepublish": "tsc -p ./",
+		"compile": "tsc -watch -p ./",
 		"postinstall": "node ./node_modules/vscode/bin/install"
 	},
 	"dependencies": {
-		"vscode-debugadapter": "^1.10.0",
-		"vscode-debugprotocol": "^1.10.0",
-		"ssh2": "^0.5.0"
+		"vscode-debugadapter": "^1.14.0",
+		"vscode-debugprotocol": "^1.14.0",
+		"ssh2": "^0.5.4"
 	},
 	"devDependencies": {
-		"typescript": "^1.8.10",
-		"vscode": "0.11.x"
+		"typescript": "^2.0.10",
+		"vscode": "^1.0.3",
+		"mocha": "^3.2.0",
+		"@types/node": "^6.0.40",
+		"@types/mocha": "^2.2.32"
 	}
 }

src/backend/mi2/mi2.ts

@@ -1,4 +1,4 @@
-import { Breakpoint, IBackend, Stack, SSHArguments, Variable } from "../backend.ts"
+import { Breakpoint, IBackend, Stack, SSHArguments, Variable } from "../backend"
 import * as ChildProcess from "child_process"
 import { EventEmitter } from "events"
 import { parseMI, MINode } from '../mi_parse';

src/mibase.ts

@@ -343,7 +343,7 @@ export class MI2DebugSession extends DebugSession {
 					let addOne = () => {
 						this.miDebugger.evalExpression(JSON.stringify(varReq.name + "+" + arrIndex + ")")).then(variable => {
 							try {
-								let expanded = expandValue(createVariable, variable.result("value"), id, variable);
+								let expanded = expandValue(createVariable, variable.result("value"), varReq.name, variable);
 								if (!expanded) {
 									this.sendErrorResponse(response, 15, `Could not expand variable`);
 								}

tsconfig.json

@@ -1,12 +1,16 @@
 {
 	"compilerOptions": {
 		"module": "commonjs",
-		"target": "ES5",
+		"target": "es6",
 		"outDir": "out",
-		"noLib": true,
-		"sourceMap": true
+		"lib": [
+			"es6"
+		],
+		"sourceMap": true,
+		"rootDir": "."
 	},
 	"exclude": [
-		"node_modules"
+		"node_modules",
+		".vscode-test"
 	]
 }

typings/node.d.ts

@@ -1 +0,0 @@
-/// <reference path="../node_modules/vscode/typings/node.d.ts" />

typings/vscode-typings.d.ts

@@ -1 +0,0 @@
-/// <reference path="../node_modules/vscode/typings/index.d.ts" />