From 46657ddea7be5f8a6f7e6cdec868d191f19726b4 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 4 Mar 2016 15:22:32 +0100
Subject: [PATCH] [json] fix sourcemaps

---
 extensions/json/.vscode/launch.json         | 4 ++--
 extensions/json/client/tsconfig.json        | 3 ++-
 extensions/json/package.json                | 2 +-
 extensions/json/server/src/typings/ref.d.ts | 3 +++
 extensions/json/server/tsconfig.json        | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 extensions/json/server/src/typings/ref.d.ts

diff --git a/extensions/json/.vscode/launch.json b/extensions/json/.vscode/launch.json
index 9f534b622ac..744746999b4 100644
--- a/extensions/json/.vscode/launch.json
+++ b/extensions/json/.vscode/launch.json
@@ -10,8 +10,8 @@
 				"--extensionDevelopmentPath=${workspaceRoot}"
 			],
 			"stopOnEntry": false,
-			"sourceMaps": false,
-			"outDir": "${workspaceRoot}/out",
+			"sourceMaps": true,
+			"outDir": "${workspaceRoot}/client/out",
 			"preLaunchTask": "npm"
 		}	
 	]
diff --git a/extensions/json/client/tsconfig.json b/extensions/json/client/tsconfig.json
index 04c13962a52..b37b37e55dc 100644
--- a/extensions/json/client/tsconfig.json
+++ b/extensions/json/client/tsconfig.json
@@ -3,7 +3,8 @@
 		"noLib": true,
 		"target": "es5",
 		"module": "commonjs",
-		"sourceMap": false,
+		"sourceMap": true,
+		"sourceRoot": "../src",
 		"outDir": "./out"
 	},
 	"exclude": [
diff --git a/extensions/json/package.json b/extensions/json/package.json
index 5c99535de75..563ea6c7a09 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -10,7 +10,7 @@
 	],
 	"main": "./client/out/jsonMain",
 	"scripts": {
-		"compile": "gulp compile-extension:json-client"
+		"compile": "gulp compile-extension:json-client && gulp compile-extension:json-server"
 	},
 	"contributes": {
 		"languages": [
diff --git a/extensions/json/server/src/typings/ref.d.ts b/extensions/json/server/src/typings/ref.d.ts
new file mode 100644
index 00000000000..070ae9999a7
--- /dev/null
+++ b/extensions/json/server/src/typings/ref.d.ts
@@ -0,0 +1,3 @@
+/// <reference path='../../../../../src/typings/mocha.d.ts'/>
+/// <reference path='../../../../../extensions/node.d.ts'/>
+/// <reference path='../../../../../extensions/lib.core.d.ts'/>
\ No newline at end of file
diff --git a/extensions/json/server/tsconfig.json b/extensions/json/server/tsconfig.json
index 4ffc510ad7a..b37b37e55dc 100644
--- a/extensions/json/server/tsconfig.json
+++ b/extensions/json/server/tsconfig.json
@@ -4,6 +4,7 @@
 		"target": "es5",
 		"module": "commonjs",
 		"sourceMap": true,
+		"sourceRoot": "../src",
 		"outDir": "./out"
 	},
 	"exclude": [