Show loaded scripts: Fix #182

microsoft · Mar 10, 2017 · 417eaac · 417eaac
1 parent a96399b
commit 417eaac
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
     "noice-json-rpc": "^1.0.0",
     "request-light": "^0.1.0",
     "source-map": "^0.5.6",
-    "vscode-debugadapter": "^1.18.0-pre.1",
-    "vscode-debugprotocol": "^1.17.0-pre.2",
+    "vscode-debugadapter": "^1.18.0-pre.3",
+    "vscode-debugprotocol": "^1.18.0-pre.1",
     "ws": "^1.1.1"
   },
   "devDependencies": {

diff --git a/src/chrome/chromeDebugAdapter.ts b/src/chrome/chromeDebugAdapter.ts
@@ -8,7 +8,7 @@ import {StoppedEvent, InitializedEvent, TerminatedEvent, Handles, ContinuedEvent
 import {ICommonRequestArgs, ILaunchRequestArgs, ISetBreakpointsArgs, ISetBreakpointsResponseBody, IStackTraceResponseBody,
     IAttachRequestArgs, IScopesResponseBody, IVariablesResponseBody,
     ISourceResponseBody, IThreadsResponseBody, IEvaluateResponseBody, ISetVariableResponseBody, IDebugAdapter,
-    ICompletionsResponseBody, IToggleSkipFileStatusArgs, IInternalStackTraceResponseBody} from '../debugAdapterInterfaces';
+    ICompletionsResponseBody, IToggleSkipFileStatusArgs, IInternalStackTraceResponseBody, ILoadedScript, IAllLoadedScriptsResponseBody} from '../debugAdapterInterfaces';
 import {IChromeDebugAdapterOpts, ChromeDebugSession} from './chromeDebugSession';
 import {ChromeConnection} from './chromeConnection';
 import * as ChromeUtils from './chromeUtils';
@@ -691,6 +691,26 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter {
         }).catch(() => this.warnNoSkipFiles());
     }
 
+    public async getLoadScripts(): Promise<IAllLoadedScriptsResponseBody> {
+        const loadedScripts = Array.from(this._scriptsByUrl.keys())
+            .map(scriptPath => {
+                const basename = path.basename(scriptPath);
+                const script = this._scriptsByUrl.get(scriptPath);
+                return <ILoadedScript>{
+                    label: basename,
+                    description: scriptPath === basename ? '' : scriptPath,
+                    source: {
+                        name: basename,
+                        path: scriptPath,
+                        sourceReference: this.getSourceReferenceForScriptId(script.scriptId)
+                    }
+                };
+            })
+            .sort((a, b) => a.label.localeCompare(b.label));
+
+        return { loadedScripts };
+    }
+
     private resolvePendingBreakpoint(pendingBP: IPendingBreakpoint): Promise<void> {
         return this.setBreakpoints(pendingBP.args, pendingBP.requestSeq, pendingBP.ids).then(response => {
             response.breakpoints.forEach((bp, i) => {
@@ -1418,20 +1438,36 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter {
     }
 
     public source(args: DebugProtocol.SourceArguments): Promise<ISourceResponseBody> {
-        const handle = this._sourceHandles.get(args.sourceReference);
-        if (!handle) {
-            return Promise.reject(errors.sourceRequestIllegalHandle());
+        let scriptId: Crdp.Runtime.ScriptId;
+        if (args.sourceReference) {
+            const handle = this._sourceHandles.get(args.sourceReference);
+            if (!handle) {
+                return Promise.reject(errors.sourceRequestIllegalHandle());
+            }
+
+            // Have inlined content?
+            if (handle.contents) {
+                return Promise.resolve({
+                    content: handle.contents
+                });
+            }
+
+            scriptId = handle.scriptId;
+        } else if (args.source && args.source.path) {
+            const script = this._scriptsByUrl.get(args.source.path);
+            if (!script) {
+                return Promise.reject(errors.sourceRequestCouldNotRetrieveContent());
+            }
+
+            scriptId = script.scriptId;
         }
 
-        // Have inlined content?
-        if (handle.contents) {
-            return Promise.resolve({
-                content: handle.contents
-            });
+        if (!scriptId) {
+            return Promise.reject(errors.sourceRequestCouldNotRetrieveContent());
         }
 
         // If not, should have scriptId
-        return this.chrome.Debugger.getScriptSource({ scriptId: handle.scriptId }).then(response => {
+        return this.chrome.Debugger.getScriptSource({ scriptId }).then(response => {
             return {
                 content: response.scriptSource,
                 mimeType: 'text/javascript'

diff --git a/src/debugAdapterInterfaces.d.ts b/src/debugAdapterInterfaces.d.ts
@@ -109,6 +109,16 @@ export interface ICompletionsResponseBody {
     targets: DebugProtocol.CompletionItem[];
 }
 
+export interface ILoadedScript {
+    label: string;
+    description: string;
+    source: DebugProtocol.Source;
+}
+
+export interface IAllLoadedScriptsResponseBody {
+    loadedScripts: ILoadedScript[];
+}
+
 declare type PromiseOrNot<T> = T | Promise<T>;
 
 /**

diff --git a/src/errors.ts b/src/errors.ts
@@ -67,6 +67,13 @@ export function sourceRequestIllegalHandle(): DebugProtocol.Message {
     };
 }
 
+export function sourceRequestCouldNotRetrieveContent(): DebugProtocol.Message {
+    return {
+        id: 2026,
+        format: localize('source.not.found', "Could not retrieve content.")
+    };
+}
+
 export function pathFormat(): DebugProtocol.Message {
     return {
         id: 2018,