From 2f2d0294f46bcf12c7452d8864b7c5a1cb8bbdbf Mon Sep 17 00:00:00 2001
From: WebFreak001 <janju007@web.de>
Date: Wed, 7 Dec 2016 00:10:55 +0100
Subject: [PATCH] typescript upgrade

---
 package.json                | 18 ++++++++++--------
 src/backend/mi2/mi2.ts      |  2 +-
 src/mibase.ts               |  2 +-
 tsconfig.json               | 12 ++++++++----
 typings/node.d.ts           |  1 -
 typings/vscode-typings.d.ts |  1 -
 6 files changed, 20 insertions(+), 16 deletions(-)
 delete mode 100644 typings/node.d.ts
 delete mode 100644 typings/vscode-typings.d.ts

diff --git a/package.json b/package.json
index 5186be2..b2a6ebf 100644
--- a/package.json
+++ b/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"
 	}
 }
\ No newline at end of file
diff --git a/src/backend/mi2/mi2.ts b/src/backend/mi2/mi2.ts
index 41d651b..5d8686d 100644
--- a/src/backend/mi2/mi2.ts
+++ b/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';
diff --git a/src/mibase.ts b/src/mibase.ts
index f0af6d8..14a8605 100644
--- a/src/mibase.ts
+++ b/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`);
 								}
diff --git a/tsconfig.json b/tsconfig.json
index 69905df..fbda0cd 100644
--- a/tsconfig.json
+++ b/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"
 	]
 }
\ No newline at end of file
diff --git a/typings/node.d.ts b/typings/node.d.ts
deleted file mode 100644
index 5ed7730..0000000
--- a/typings/node.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference path="../node_modules/vscode/typings/node.d.ts" />
\ No newline at end of file
diff --git a/typings/vscode-typings.d.ts b/typings/vscode-typings.d.ts
deleted file mode 100644
index 61430b1..0000000
--- a/typings/vscode-typings.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference path="../node_modules/vscode/typings/index.d.ts" />