set sourceMaps to true by default; fixes #121

microsoft · Jan 23, 2017 · 9693e24 · 9693e24
1 parent 78d2077
commit 9693e24
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,6 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceRoot}"
 			],
-			"sourceMaps": true,
 			"outFiles": [ "${workspaceRoot}/out/**/*.js" ]
 		},
 		{
@@ -19,7 +18,6 @@
 			"cwd": "${workspaceRoot}",
 			"program": "${workspaceRoot}/src/node/nodeDebug.ts",
 			"args": [ "--server=4711" ],
-			"sourceMaps": true,
 			"outFiles": [ "${workspaceRoot}/out/**/*.js" ],
 			"internalConsoleOptions": "openOnSessionStart"
 		},
@@ -34,7 +32,6 @@
 			],
 			"restart": true,
 			"port": 5858,
-			"sourceMaps": true,
 			"outFiles": [ "${workspaceRoot}/out/**/*.js" ],
 			"console": "integratedTerminal"
 		},
@@ -50,7 +47,6 @@
 				"--colors",
 				"./out/tests"
 			],
-			"sourceMaps": true,
 			"outFiles": [ "${workspaceRoot}/out/**/*.js" ],
 			"internalConsoleOptions": "openOnSessionStart"
 		}

diff --git a/src/node/extension.ts b/src/node/extension.ts
@@ -231,7 +231,6 @@ export function activate(context: vscode.ExtensionContext) {
 		if (vscode.workspace.textDocuments.some(document => document.languageId === 'typescript' || document.languageId === 'coffeescript')) {
 			initialConfigurations.forEach(config => {
 				config['outFiles'] = [];
-				config['sourceMaps'] = true;
 			});
 		}
 		// Massage the configuration string, add an aditional tab and comment out processId.

diff --git a/src/node/nodeDebug.ts b/src/node/nodeDebug.ts
@@ -233,9 +233,9 @@ interface CommonArguments {
 	timeout?: number;
 	/** Automatically stop target after launch. If not specified, target does not stop. */
 	stopOnEntry?: boolean;
-	/** Configure source maps. By default source maps are disabled. */
+	/** Configure source maps. By default source maps are enabled (since v1.9.11). */
 	sourceMaps?: boolean;
-	/** Where to look for the generated code. Only used if sourceMaps is true. */
+	/** obsolete: Where to look for the generated code. Only used if sourceMaps is true. */
 	outDir?: string;
 	/** output files glob patterns */
 	outFiles?: string[];
@@ -1038,6 +1038,9 @@ export class NodeDebugSession extends DebugSession {
 		}
 
 		if (!this._sourceMaps) {
+			if (args.sourceMaps === undefined) {
+				args.sourceMaps = true;
+			}
 			if (typeof args.sourceMaps === 'boolean' && args.sourceMaps) {
 				const generatedCodeDirectory = args.outDir;
 				if (generatedCodeDirectory) {

diff --git a/src/tests/adapter.test.ts b/src/tests/adapter.test.ts
@@ -178,7 +178,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				runtimeArgs: [ '--nolazy' ]
 			}, {
 				path: TS_SOURCE,
@@ -194,7 +193,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				runtimeArgs: [ '--nolazy' ]
 			}, {
 				path: TS_SOURCE,
@@ -210,7 +208,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				outDir: OUT_DIR,
 				runtimeArgs: [ '--nolazy' ]
 			}, {
@@ -227,7 +224,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				outFiles: [ OUT_FILES ],
 				runtimeArgs: [ '--nolazy' ]
 			}, {
@@ -244,7 +240,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				outDir: OUT_DIR,
 				runtimeArgs: [ '--nolazy' ]
 			}, {
@@ -261,7 +256,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				outFiles: [ OUT_FILES ],
 				runtimeArgs: [ '--nolazy' ]
 			}, {
@@ -280,7 +274,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				outDir: OUT_DIR,
 				runtimeArgs: [ '--nolazy' ]
 			}, {
@@ -298,7 +291,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				outDir: OUT_DIR,
 				runtimeArgs: [ '--nolazy' ]
 			}, {
@@ -318,7 +310,6 @@ suite('Node Debug Adapter', () => {
 
 			return dc.hitBreakpoint({
 				program: PROGRAM,
-				sourceMaps: true,
 				outDir: OUT_DIR,
 				runtimeArgs: [ '--nolazy' ]
 			}, {