Adds originalUrl to GetPreferredUILocationResult (#2159)

adds GetPreferredUILocationResult.originalUrl to lookup urls from stack traces.

Author: hediet

src/adapter/debugAdapter.ts

@@ -37,7 +37,7 @@ import { BasicCpuProfiler } from './profiling/basicCpuProfiler';
 import { ScriptSkipper } from './scriptSkipper/implementation';
 import { IScriptSkipper } from './scriptSkipper/scriptSkipper';
 import { SmartStepper } from './smartStepping';
-import { ISourceWithMap, SourceFromMap } from './source';
+import { ISourceWithMap, Source, SourceFromMap } from './source';
 import { SourceContainer } from './sourceContainer';
 import { Thread } from './threads';
 import { VariableStore } from './variableStore';
@@ -136,9 +136,25 @@ export class DebugAdapter implements IDisposable {
   private async _getPreferredUILocation(
     params: Dap.GetPreferredUILocationParams,
   ): Promise<Dap.GetPreferredUILocationResult> {
-    const source = this.sourceContainer.source(params.source);
+    let source: Source | undefined = undefined;
+    if (params.originalUrl) {
+      source = this.sourceContainer.getSourceByOriginalUrl(params.originalUrl);
+    }
+    if (!source && params.source) {
+      source = this.sourceContainer.source(params.source);
+    }
+
     if (!source) {
-      return params;
+      if (params.source) {
+        // Return unmodified input source
+        return {
+          column: params.column,
+          line: params.line,
+          source: params.source,
+        };
+      } else {
+        throw new ProtocolError(errors.missingSourceInformation());
+      }
     }
 
     const location = await this.sourceContainer.preferredUiLocation({

src/build/dapCustom.ts

@@ -805,7 +805,11 @@ const dapCustom: JSONSchema4 = {
         properties: {
           source: {
             $ref: '#/definitions/Source',
-            description: 'The source to look up.',
+            description: 'The source to look up. Either source or originalUrl must be set.',
+          },
+          originalUrl: {
+            type: 'string',
+            description: 'The original url to look up. Either source or originalUrl must be set.',
           },
           line: {
             type: 'integer',
@@ -816,7 +820,7 @@ const dapCustom: JSONSchema4 = {
             description: 'The base-0 column number to look up.',
           },
         },
-        required: ['source', 'line', 'column'],
+        required: ['line', 'column'],
       },
       {
         properties: {

src/cdp/api.d.ts

@@ -1934,7 +1934,7 @@ export namespace Cdp {
       | 'InteractiveContentLegendChild';
 
     /**
-     * This isue warns about errors in the select element content model.
+     * This issue warns about errors in the select element content model.
      */
     export interface SelectElementAccessibilityIssueDetails {
       nodeId: DOM.BackendNodeId;
@@ -31218,7 +31218,6 @@ export namespace Cdp {
      * Enum of possible storage types.
      */
     export type StorageType =
-      | 'appcache'
       | 'cookies'
       | 'file_systems'
       | 'indexeddb'

src/dap/api.d.ts

@@ -2460,9 +2460,14 @@ export namespace Dap {
 
   export interface GetPreferredUILocationParams {
     /**
-     * The source to look up.
+     * The source to look up. Either source or originalUrl must be set.
      */
-    source: Source;
+    source?: Source;
+
+    /**
+     * The original url to look up. Either source or originalUrl must be set.
+     */
+    originalUrl?: string;
 
     /**
      * The base-0 line number to look up.

src/dap/errors.ts

@@ -237,6 +237,9 @@ export const noUwpPipeFound = () =>
 export const locationNotFound = () =>
   createUserError(l10n.t('Could not find a location for the variable'));
 
+export const missingSourceInformation = () =>
+  createSilentError(l10n.t('Missing source information. Did you set "originalUrl" or "source"?'));
+
 /**
  * Returns if the value looks like a DAP error.
  */