updated extension to use latest ts and vscode

Author: DonJayamanne

.vscodeignore

@@ -3,13 +3,16 @@ typings/**
 out/test/**
 test/**
 src/**
+scripts/**
 **/*.map
 .gitignore
+.gitmodules
 images/**/*.gif
 images/**/*.png
 tsconfig.json
+typings.json
 pythonFiles/**/*.pyc
+requirements.txt
 vsc-extension-quickstart.md
 .travis.yml
-requirements.txt
-webpack.config.js
+webpack.config.js

package.json

@@ -23,7 +23,7 @@
     "theme": "dark"
   },
   "engines": {
-    "vscode": "^1.5.0"
+    "vscode": "^1.6.0"
   },
   "categories": [
     "Languages",
@@ -749,16 +749,12 @@
     }
   },
   "scripts": {
-    "vscode:prepublish": "node ./node_modules/vscode/bin/compile && webpack",
-    "compile": "webpack && node ./node_modules/vscode/bin/compile  -watch -p ./ && installServerIntoExtension ./out ./src/server/package.json ./src/server/tsconfig.json",
+    "vscode:prepublish": "tsc -p ./ && webpack",
+    "compile": "webpack && tsc -watch -p ./",
     "postinstall": "node ./node_modules/vscode/bin/install",
     "test": "node ./node_modules/vscode/bin/test"
   },
   "dependencies": {
-    "@types/jquery": "^1.10.31",
-    "@types/socket.io": "^1.4.27",
-    "@types/socket.io-client": "^1.4.27",
-    "@types/uuid": "^3.3.27",
     "anser": "^1.1.0",
     "copy-paste": "^1.3.0",
     "diff-match-patch": "^1.0.0",
@@ -785,14 +781,21 @@
     "xml2js": "^0.4.17"
   },
   "devDependencies": {
+    "@types/node": "^6.0.40",
+    "@types/mocha": "^2.2.32",
+    "@types/jquery": "^1.10.31",
+    "@types/socket.io": "^1.4.27",
+    "@types/socket.io-client": "^1.4.27",
+    "@types/uuid": "^3.3.27",
     "babel-core": "^6.14.0",
     "babel-loader": "^6.2.5",
     "babel-preset-es2015": "^6.14.0",
     "ignore-loader": "^0.1.1",
     "retyped-diff-match-patch-tsd-ambient": "^1.0.0-0",
     "ts-loader": "^0.8.2",
-    "typescript": "^1.8.5",
-    "vscode": "^0.11.0",
-    "webpack": "^1.13.2"
+    "webpack": "^1.13.2",
+    "typescript": "^2.0.3",
+    "vscode": "^1.0.0",
+    "mocha": "^2.3.3"
   }
 }

pythonVSCode

@@ -1,3 +1,6 @@
+/// <reference path="../../../node_modules/@types/node/index.d.ts" />
+/// <reference path="../../../node_modules/vscode/vscode.d.ts" />
+
 'use strict';
 // TODO: Cleanup this place
 // Add options for execPythonFile
@@ -6,8 +9,8 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as child_process from 'child_process';
 import * as settings from './configSettings';
-import {CancellationToken} from 'vscode';
-import {isNotInstalledError} from './helpers';
+import { CancellationToken } from 'vscode';
+import { isNotInstalledError } from './helpers';
 
 export const IS_WINDOWS = /^win/.test(process.platform);
 const PATH_VARIABLE_NAME = IS_WINDOWS ? 'Path' : 'PATH';
@@ -161,14 +164,14 @@ function spawnFileInternal(file: string, args: string[], options: child_process.
         });
         proc.stdout.setEncoding('utf8');
         proc.stderr.setEncoding('utf8');
-        proc.stdout.on('data', function (data) {
+        proc.stdout.on('data', function (data: string) {
             if (token && token.isCancellationRequested) {
                 return;
             }
             stdOut(data);
         });
 
-        proc.stderr.on('data', function (data) {
+        proc.stderr.on('data', function (data: string) {
             if (token && token.isCancellationRequested) {
                 return;
             }

src/client/.vscode/launch.json

@@ -1,14 +1,14 @@
-import {BaseDebugServer} from "../DebugServers/BaseDebugServer";
-import {NonDebugServer} from "../DebugServers/NonDebugServer";
-import {IPythonProcess, IPythonThread, IDebugServer} from "../Common/Contracts";
-import {DebugSession, OutputEvent} from "vscode-debugadapter";
-import {DebugProtocol} from "vscode-debugprotocol";
+import { BaseDebugServer } from "../DebugServers/BaseDebugServer";
+import { NonDebugServer } from "../DebugServers/NonDebugServer";
+import { IPythonProcess, IPythonThread, IDebugServer } from "../Common/Contracts";
+import { DebugSession, OutputEvent } from "vscode-debugadapter";
+import { DebugProtocol } from "vscode-debugprotocol";
 import * as path from "path";
 import * as child_process from "child_process";
-import {LaunchRequestArguments} from "../Common/Contracts";
-import {DebugClient, DebugType} from "./DebugClient";
+import { LaunchRequestArguments } from "../Common/Contracts";
+import { DebugClient, DebugType } from "./DebugClient";
 import * as fs from "fs";
-import {open} from "../../common/open";
+import { open } from "../../common/open";
 let fsExtra = require("fs-extra");
 let tmp = require("tmp");
 let prependFile = require("prepend-file");
@@ -122,10 +122,10 @@ export class NonDebugClient extends DebugClient {
             });
             this.pyProc.stderr.setEncoding("utf8");
             this.pyProc.stdout.setEncoding("utf8");
-            this.pyProc.stderr.on("data", error => {
+            this.pyProc.stderr.on("data", (error: string) => {
                 this.debugSession.sendEvent(new OutputEvent(error, "stderr"));
             });
-            this.pyProc.stdout.on("data", d => {
+            this.pyProc.stdout.on("data", (d: string) => {
                 this.debugSession.sendEvent(new OutputEvent(d, "stdout"));
             });
             this.pyProc.on('exit', () => {

src/client/.vscode/settings.json

@@ -53,7 +53,7 @@ export class LocalDebugServer extends BaseDebugServer {
             this.debugSocketServer.on("error", ex => {
                 let exMessage = JSON.stringify(ex);
                 let msg = "";
-                if (ex.code === "EADDRINUSE") {
+                if ((ex as any).code === "EADDRINUSE") {
                     msg = `The port used for debugging is in use, please try again or try restarting Visual Studio Code, Error = ${exMessage}`;
                 }
                 else {