fix: apply electron updates for debugging vscode webviews

For microsoft/vscode#128637

Author: connor4312

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This changelog records changes to stable releases since 1.50.2. "TBA" changes here may be available in the [nightly release](https://github.com/microsoft/vscode-js-debug/#nightly-extension) before they're in stable. Note that the minor version (`v1.X.0`) corresponds to the VS Code version js-debug is shipped in, but the patch version (`v1.50.X`) is not meaningful.
 
+## Nightly
+
+- fix: apply electron updates for debugging vscode webviews ([ref](https://github.com/microsoft/vscode/issues/128637))
+
 ## v1.59 (July 2021)
 
 ### v1.59.0 - 2021-07-27

src/adapter/threads.ts

@@ -1120,7 +1120,7 @@ export class Thread implements IVariableStoreDelegate {
 
       // see https://github.com/microsoft/vscode/issues/103027
       const runtimeScriptOffset = event.url.endsWith('#vscode-extension')
-        ? { lineOffset: 2, columnOffset: 0 }
+        ? { lineOffset: 1, columnOffset: 0 }
         : undefined;
 
       let resolvedSourceMapUrl: string | undefined;

src/targets/browser/vscodeRendererAttacher.ts

@@ -11,7 +11,7 @@ import { DebugType } from '../../common/contributionUtils';
 import { DisposableList } from '../../common/disposable';
 import { ILogger, LogTag } from '../../common/logging';
 import { ISourcePathResolver } from '../../common/sourcePathResolver';
-import { createTargetFilterForConfig, TargetFilter } from '../../common/urlUtils';
+import { TargetFilter } from '../../common/urlUtils';
 import {
   AnyLaunchConfiguration,
   applyDefaults,
@@ -21,8 +21,6 @@ import { ITelemetryReporter } from '../../telemetry/telemetryReporter';
 import { ISourcePathResolverFactory } from '../sourcePathResolverFactory';
 import { ILaunchContext } from '../targets';
 import { BrowserAttacher } from './browserAttacher';
-import { BrowserTargetManager } from './browserTargetManager';
-import { BrowserTargetType } from './browserTargets';
 import { VSCodeRendererTargetManager } from './vscodeRendererTargetManager';
 
 export interface IRendererAttachParams extends IChromeAttachConfiguration {
@@ -106,26 +104,8 @@ export class VSCodeRendererAttacher extends BrowserAttacher<IRendererAttachParam
     return new Connection(new RawPipeTransport(this.logger, pipe), this.logger, telemetryReporter);
   }
 
-  protected async getTargetFilter(
-    _manager: BrowserTargetManager,
-    params: IRendererAttachParams,
-  ): Promise<TargetFilter> {
-    const baseFilter = createTargetFilterForConfig(params);
-    return target => {
-      if (
-        params.debugWebWorkerExtHost &&
-        target.type === BrowserTargetType.Worker &&
-        target.title === 'WorkerExtensionHost'
-      ) {
-        return true;
-      }
-
-      if (params.debugWebviews && target.type === BrowserTargetType.IFrame && baseFilter(target)) {
-        return true;
-      }
-
-      return false;
-    };
+  protected async getTargetFilter(manager: VSCodeRendererTargetManager): Promise<TargetFilter> {
+    return manager.filter;
   }
 
   /**

src/targets/browser/vscodeRendererTargetManager.ts

@@ -7,6 +7,7 @@ import Cdp from '../../cdp/api';
 import CdpConnection from '../../cdp/connection';
 import { ILogger } from '../../common/logging';
 import { ISourcePathResolver } from '../../common/sourcePathResolver';
+import { createTargetFilterForConfig, TargetFilter } from '../../common/urlUtils';
 import { ITelemetryReporter } from '../../telemetry/telemetryReporter';
 import { ITargetOrigin } from '../targetOrigin';
 import { BrowserTargetManager } from './browserTargetManager';
@@ -46,6 +47,33 @@ export class VSCodeRendererTargetManager extends BrowserTargetManager {
     );
   }
 
+  private readonly baseFilter = createTargetFilterForConfig(this.launchParams);
+
+  /**
+   * Target filter for interested attachments.
+   */
+  public readonly filter: TargetFilter = target => {
+    const { debugWebWorkerExtHost, debugWebviews } = this.launchParams as IRendererAttachParams;
+    if (debugWebWorkerExtHost) {
+      if (target.type === BrowserTargetType.Worker && target.title === 'DebugWorkerExtensionHost') {
+        return true;
+      }
+
+      if (
+        target.type === BrowserTargetType.Page &&
+        target.title.includes('[Extension Development Host]')
+      ) {
+        return true;
+      }
+    }
+
+    if (debugWebviews && target.type === BrowserTargetType.IFrame && this.baseFilter(target)) {
+      return true;
+    }
+
+    return false;
+  };
+
   /**
    * @inheritdoc
    */
@@ -89,7 +117,7 @@ export class VSCodeRendererTargetManager extends BrowserTargetManager {
     const target = super.attachedToTarget(
       targetInfo,
       sessionId,
-      waitingForDebugger,
+      waitingForDebugger || this.filter(targetInfo),
       parentTarget,
       false,
     );