Sourcemaps info moved to 'launch'

adapter/lineNumberTransformer.ts

@@ -13,7 +13,7 @@ export class LineNumberTransformer implements IDebugTransformer  {
         this._targetLinesStartAt1 = targetLinesStartAt1;
     }
 
-    public initialize(args: IInitializeRequestArgs): void {
+    public initialize(args: DebugProtocol.InitializeRequestArguments): void {
         this._clientLinesStartAt1 = args.linesStartAt1;
     }
 

adapter/sourceMaps/sourceMapTransformer.ts

@@ -12,10 +12,10 @@ export class SourceMapTransformer implements IDebugTransformer {
     private _generatedCodeDirectory: string;
     private _requestSeqToSetBreakpointsArgs: Map<number, DebugProtocol.SetBreakpointsArguments>;
 
-    public initialize(args: IInitializeRequestArgs): void {
+    public launch(args: ILaunchRequestArgs): void {
         if (args.sourceMaps) {
-            this._sourceMaps = new SourceMaps(args.generatedCodeDirectory);
-            this._generatedCodeDirectory = args.generatedCodeDirectory;
+            this._sourceMaps = new SourceMaps(args.outDir);
+            this._generatedCodeDirectory = args.outDir;
             this._requestSeqToSetBreakpointsArgs = new Map<number, DebugProtocol.SetBreakpointsArguments>();
         }
     }

package.json

@@ -37,7 +37,7 @@
                     "javascript"
                 ]
             },
-            "program": "./out/node/openDebugWebkit.js",
+            "program": "./out/webkit/openDebugWebkit.js",
             "runtime": "node",
             "initialConfigurations": [
                 {

test/adapter/lineNumberTransformer.test.ts

@@ -7,7 +7,7 @@ import { LineNumberTransformer } from '../../adapter/lineNumberTransformer';
 
 function createTransformer(clientLinesStartAt1: boolean, targetLinesStartAt1: boolean): LineNumberTransformer {
     const transformer = new LineNumberTransformer(targetLinesStartAt1);
-    transformer.initialize(<IInitializeRequestArgs><any>{ linesStartAt1: clientLinesStartAt1 });
+    transformer.initialize(<DebugProtocol.InitializeRequestArguments><any>{ linesStartAt1: clientLinesStartAt1 });
 
     return transformer;
 }

test/adapter/sourceMaps/sourceMapTransformer.test.ts

@@ -30,13 +30,13 @@ suite('SourceMapTransformer', () => {
         // Grab the test class with mock injected, instantiate with and without sourcemaps enabled
         let SourceMapTransformer = require(MODULE_UNDER_TEST).SourceMapTransformer;
         transformer = new SourceMapTransformer();
-        transformer.initialize(<IInitializeRequestArgs><any>{
+        transformer.launch(<ILaunchRequestArgs><any>{
             sourceMaps: true,
             generatedCodeDirectory: 'test'
         });
 
         transformerSMDisabled = new SourceMapTransformer();
-        transformerSMDisabled.initialize(<IInitializeRequestArgs><any>{
+        transformerSMDisabled.launch(<ILaunchRequestArgs><any>{
             sourceMaps: false,
             generatedCodeDirectory: 'test'
         });

testapp/.vscode/launch.json

@@ -1,6 +1,6 @@
 {
     "version": "0.1.0",
-    //"openDebug": "server=4711",
+    "debugServer": "4712",
     "configurations": [
         {
             "name": "test chrome",
@@ -14,12 +14,6 @@
             "name": "attach to chrome",
             "type": "webkit",
             "port": 9222
-        },
-        {
-            "name": "node",
-            "type": "node",
-            "program": "out/client/test3.js",
-            "sourceMaps": true
         }
     ]
 }

webkit/webKitAdapterInterfaces.d.ts

@@ -1,8 +1,3 @@
-interface IInitializeRequestArgs extends DebugProtocol.InitializeRequestArguments {
-    sourceMaps?: boolean;
-    generatedCodeDirectory?: string;
-}
-
 interface ILaunchRequestArgs extends DebugProtocol.LaunchRequestArguments {
     workingDirectory: string;
     runtimeArguments?: string[];
@@ -10,6 +5,8 @@ interface ILaunchRequestArgs extends DebugProtocol.LaunchRequestArguments {
     program?: string;
     url?: string;
     stopOnEntry?: boolean;
+    sourceMaps?: boolean;
+    outDir?: string;
 }
 
 interface IAttachRequestArgs extends DebugProtocol.AttachRequestArguments {
@@ -59,7 +56,7 @@ declare type PromiseOrNot<T> = T | Promise<T>;
 interface IDebugAdapter {
     registerEventHandler(eventHandler: (event: DebugProtocol.Event) => void): void;
 
-    initialize(args: IInitializeRequestArgs): PromiseOrNot<void>;
+    initialize(args: DebugProtocol.InitializeRequestArguments): PromiseOrNot<void>;
     launch(args: ILaunchRequestArgs): PromiseOrNot<void>;
     disconnect(): PromiseOrNot<void>;
     attach(args: IAttachRequestArgs): PromiseOrNot<void>;
@@ -81,7 +78,7 @@ interface IDebugAdapter {
 }
 
 interface IDebugTransformer {
-    initialize?(args: IInitializeRequestArgs, requestSeq?: number): PromiseOrNot<void>;
+    initialize?(args: DebugProtocol.InitializeRequestArguments, requestSeq?: number): PromiseOrNot<void>;
     launch?(args: ILaunchRequestArgs, requestSeq?: number): PromiseOrNot<void>;
     attach?(args: IAttachRequestArgs, requestSeq?: number): PromiseOrNot<void>;
     setBreakpoints?(args: DebugProtocol.SetBreakpointsArguments, requestSeq?: number): PromiseOrNot<void>;

webkit/webKitDebugAdapter.ts

@@ -61,7 +61,7 @@ export class WebKitDebugAdapter implements IDebugAdapter {
         this._eventHandler = eventHandler;
     }
 
-    public initialize(args: IInitializeRequestArgs): void {
+    public initialize(args: DebugProtocol.InitializeRequestArguments): void {
         this._clientLinesStartAt1 = args.linesStartAt1;
     }
 
@@ -382,7 +382,7 @@ export class WebKitDebugAdapter implements IDebugAdapter {
                             sourceReference: 0
                         } :
                         {
-                            // Name should be undefined, work around a VS Code bug
+                            // Name should be undefined, work around VS Code bug 20274
                             name: 'eval: ' + script.scriptId,
                             sourceReference: scriptIdToSourceReference(script.scriptId)
                         };