chrome-devtools-frontend 1.0.1376716 → 1.0.1386602

package/front_end/core/sdk/NetworkManager.test.ts

@@ -58,6 +58,56 @@ describeWithMockConnection('MultitargetNetworkManager', () => {
     }
     assert.isTrue(expectedCall.calledOnceWith({origin: 'https://example.com'}));
   });
+
+  it('blocking settings are consistent after change', async () => {
+    const multitargetNetworkManager = SDK.NetworkManager.MultitargetNetworkManager.instance({forceNew: true});
+    let eventCounter = 0;
+    multitargetNetworkManager.addEventListener(
+        SDK.NetworkManager.MultitargetNetworkManager.Events.BLOCKED_PATTERNS_CHANGED, () => eventCounter++);
+    const blockingEnabledSetting = Common.Settings.Settings.instance().moduleSetting('request-blocking-enabled');
+    const blockedPatternsSetting: Common.Settings.Setting<SDK.NetworkManager.BlockedPattern[]> =
+        Common.Settings.Settings.instance().createSetting('network-blocked-patterns', []);
+
+    // Change blocking setting via Common.Settings.Settings.
+    assert.isFalse(multitargetNetworkManager.isBlocking());
+    assert.isFalse(multitargetNetworkManager.blockingEnabled());
+    blockingEnabledSetting.set(true);
+    assert.strictEqual(eventCounter, 1);
+    assert.isFalse(multitargetNetworkManager.isBlocking());
+    assert.isTrue(multitargetNetworkManager.blockingEnabled());
+    blockedPatternsSetting.set([{url: 'example.com', enabled: true}]);
+    assert.strictEqual(eventCounter, 2);
+    assert.isTrue(multitargetNetworkManager.isBlocking());
+    assert.isTrue(multitargetNetworkManager.blockingEnabled());
+    blockedPatternsSetting.set([]);
+    assert.strictEqual(eventCounter, 3);
+    assert.isFalse(multitargetNetworkManager.isBlocking());
+    assert.isTrue(multitargetNetworkManager.blockingEnabled());
+    blockingEnabledSetting.set(false);
+    assert.strictEqual(eventCounter, 4);
+    assert.isFalse(multitargetNetworkManager.isBlocking());
+    assert.isFalse(multitargetNetworkManager.blockingEnabled());
+
+    // Change blocking setting via MultitargetNetworkManager.
+    assert.isFalse(multitargetNetworkManager.isBlocking());
+    assert.isFalse(multitargetNetworkManager.blockingEnabled());
+    multitargetNetworkManager.setBlockingEnabled(true);
+    assert.strictEqual(eventCounter, 5);
+    assert.isFalse(multitargetNetworkManager.isBlocking());
+    assert.isTrue(multitargetNetworkManager.blockingEnabled());
+    multitargetNetworkManager.setBlockedPatterns([{url: 'example.com', enabled: true}]);
+    assert.strictEqual(eventCounter, 6);
+    assert.isTrue(multitargetNetworkManager.isBlocking());
+    assert.isTrue(multitargetNetworkManager.blockingEnabled());
+    multitargetNetworkManager.setBlockedPatterns([]);
+    assert.strictEqual(eventCounter, 7);
+    assert.isFalse(multitargetNetworkManager.isBlocking());
+    assert.isTrue(multitargetNetworkManager.blockingEnabled());
+    multitargetNetworkManager.setBlockingEnabled(false);
+    assert.strictEqual(eventCounter, 8);
+    assert.isFalse(multitargetNetworkManager.isBlocking());
+    assert.isFalse(multitargetNetworkManager.blockingEnabled());
+  });
 });
 
 describe('NetworkDispatcher', () => {

package/front_end/core/sdk/NetworkManager.ts

@@ -1295,8 +1295,14 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
     this.#updatingInterceptionPatternsPromise = null;
 
     // TODO(allada) Remove these and merge it with request interception.
+    const blockedPatternChanged: () => void = () => {
+      this.updateBlockedPatterns();
+      this.dispatchEventToListeners(MultitargetNetworkManager.Events.BLOCKED_PATTERNS_CHANGED);
+    };
     this.#blockingEnabledSetting = Common.Settings.Settings.instance().moduleSetting('request-blocking-enabled');
+    this.#blockingEnabledSetting.addChangeListener(blockedPatternChanged);
     this.#blockedPatternsSetting = Common.Settings.Settings.instance().createSetting('network-blocked-patterns', []);
+    this.#blockedPatternsSetting.addChangeListener(blockedPatternChanged);
     this.#effectiveBlockedURLs = [];
     this.updateBlockedPatterns();
 
@@ -1537,8 +1543,6 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
 
   setBlockedPatterns(patterns: BlockedPattern[]): void {
     this.#blockedPatternsSetting.set(patterns);
-    this.updateBlockedPatterns();
-    this.dispatchEventToListeners(MultitargetNetworkManager.Events.BLOCKED_PATTERNS_CHANGED);
   }
 
   setBlockingEnabled(enabled: boolean): void {
@@ -1546,8 +1550,6 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
       return;
     }
     this.#blockingEnabledSetting.set(enabled);
-    this.updateBlockedPatterns();
-    this.dispatchEventToListeners(MultitargetNetworkManager.Events.BLOCKED_PATTERNS_CHANGED);
   }
 
   private updateBlockedPatterns(): void {

package/front_end/core/sdk/SourceMap.test.ts

@@ -1239,12 +1239,12 @@ describeWithEnvironment('SourceMap', () => {
       // 'foo' calls 'bar', 'bar' calls 'baz'. 'bar' and 'baz' are inlined into 'foo'.
       const names: string[] = [];
       const originalScopes = [new OriginalScopeBuilder(names)
-                                  .start(0, 0, 'global')
-                                  .start(10, 0, 'function', 'foo')
+                                  .start(0, 0, {kind: 'global'})
+                                  .start(10, 0, {kind: 'function', name: 'foo'})
                                   .end(20, 0)
-                                  .start(30, 0, 'function', 'bar')
+                                  .start(30, 0, {kind: 'function', name: 'bar'})
                                   .end(40, 0)
-                                  .start(50, 0, 'function', 'baz')
+                                  .start(50, 0, {kind: 'function', name: 'baz'})
                                   .end(60, 0)
                                   .end(70, 0)
                                   .build()];
@@ -1252,7 +1252,7 @@ describeWithEnvironment('SourceMap', () => {
       const generatedRanges =
           new GeneratedRangeBuilder(names)
               .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 0}})
-              .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 1}, isFunctionScope: true})
+              .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 1}, isStackFrame: true})
               .start(0, 5, {definition: {sourceIdx: 0, scopeIdx: 3}, callsite: {sourceIdx: 0, line: 15, column: 0}})
               .start(0, 5, {definition: {sourceIdx: 0, scopeIdx: 5}, callsite: {sourceIdx: 0, line: 35, column: 0}})
               .end(0, 10)

package/front_end/core/sdk/SourceMapScopeChainEntry.test.ts

@@ -21,6 +21,7 @@ describeWithMockConnection('SourceMapScopeRemoteObject', () => {
     const originalScope: SDK.SourceMapScopes.OriginalScope = {
       start: {line: 0, column: 0},
       end: {line: 20, column: 0},
+      isStackFrame: false,
       kind: 'global',
       variables: ['variable1', 'variable2'],
       children: [],
@@ -43,6 +44,7 @@ describeWithMockConnection('SourceMapScopeRemoteObject', () => {
     const originalScope: SDK.SourceMapScopes.OriginalScope = {
       start: {line: 0, column: 0},
       end: {line: 20, column: 0},
+      isStackFrame: false,
       kind: 'global',
       variables: ['variable1'],
       children: [],
@@ -50,7 +52,8 @@ describeWithMockConnection('SourceMapScopeRemoteObject', () => {
     const range: SDK.SourceMapScopes.GeneratedRange = {
       start: {line: 0, column: 0},
       end: {line: 0, column: 200},
-      isFunctionScope: false,
+      isStackFrame: false,
+      isHidden: false,
       values: ['a'],
       children: [],
     };
@@ -76,6 +79,7 @@ describeWithMockConnection('SourceMapScopeRemoteObject', () => {
     const originalScope: SDK.SourceMapScopes.OriginalScope = {
       start: {line: 0, column: 0},
       end: {line: 20, column: 0},
+      isStackFrame: false,
       kind: 'global',
       variables: ['variable1'],
       children: [],
@@ -83,7 +87,8 @@ describeWithMockConnection('SourceMapScopeRemoteObject', () => {
     const range: SDK.SourceMapScopes.GeneratedRange = {
       start: {line: 0, column: 0},
       end: {line: 0, column: 200},
-      isFunctionScope: false,
+      isStackFrame: false,
+      isHidden: false,
       values: [[
         {from: {line: 0, column: 0}, to: {line: 0, column: 50}, value: 'a'},     // From 0..50 available as 'a'.
         {from: {line: 0, column: 50}, to: {line: 0, column: 150}},               // From 50..150 unavailable.

package/front_end/core/sdk/SourceMapScopeChainEntry.ts

@@ -78,7 +78,7 @@ export class SourceMapScopeChainEntry implements ScopeChainEntry {
       case 'block':
         return Protocol.Debugger.ScopeType.Block;
     }
-    return this.#scope.kind;
+    return this.#scope.kind ?? '';
   }
 
   typeName(): string {
@@ -90,7 +90,7 @@ export class SourceMapScopeChainEntry implements ScopeChainEntry {
       case 'block':
         return i18nString(UIStrings.block);
     }
-    return this.#scope.kind;
+    return this.#scope.kind ?? '';
   }
 
   name(): string|undefined {

package/front_end/core/sdk/SourceMapScopes.test.ts

@@ -20,20 +20,36 @@ describe('decodeOriginalScopes', () => {
 
   it('throws for missing "end" item', () => {
     const names: string[] = [];
-    const brokenScopes = new OriginalScopeBuilder(names).start(0, 0, 'global').build();
+    const brokenScopes = new OriginalScopeBuilder(names).start(0, 0, {kind: 'global'}).build();
     assert.throws(() => decodeOriginalScopes([brokenScopes], names), /Malformed/);
   });
 
   it('throws if positions of subsequent start/end items are not monotonically increasing', () => {
     const names: string[] = [];
-    const scopes =
-        new OriginalScopeBuilder(names).start(0, 40, 'global').start(0, 25, 'function').end(0, 30).end(0, 50).build();
+    const scopes = new OriginalScopeBuilder(names)
+                       .start(0, 40, {kind: 'global'})
+                       .start(0, 25, {kind: 'function'})
+                       .end(0, 30)
+                       .end(0, 50)
+                       .build();
     assert.throws(() => decodeOriginalScopes([scopes], names), /Malformed/);
   });
 
+  it('decodes scopes without "kind"', () => {
+    const names: string[] = [];
+    const scope = new OriginalScopeBuilder(names).start(0, 0).end(5, 0).build();
+
+    const originalScopes = decodeOriginalScopes([scope], names);
+
+    assert.lengthOf(originalScopes, 1);
+    const {root} = originalScopes[0];
+
+    assert.isUndefined(root.kind);
+  });
+
   it('decodes a global scope', () => {
     const names: string[] = [];
-    const scope = new OriginalScopeBuilder(names).start(0, 0, 'global').end(5, 0).build();
+    const scope = new OriginalScopeBuilder(names).start(0, 0, {kind: 'global'}).end(5, 0).build();
 
     const originalScopes = decodeOriginalScopes([scope], names);
 
@@ -48,8 +64,12 @@ describe('decodeOriginalScopes', () => {
 
   it('ignores all but the first global scope (multiple top-level siblings)', () => {
     const names: string[] = [];
-    const scope =
-        new OriginalScopeBuilder(names).start(0, 0, 'global').end(5, 0).start(10, 0, 'global').end(20, 0).build();
+    const scope = new OriginalScopeBuilder(names)
+                      .start(0, 0, {kind: 'global'})
+                      .end(5, 0)
+                      .start(10, 0, {kind: 'global'})
+                      .end(20, 0)
+                      .build();
 
     const originalScopes = decodeOriginalScopes([scope], names);
 
@@ -65,9 +85,9 @@ describe('decodeOriginalScopes', () => {
   it('decodes nested scopes', () => {
     const names: string[] = [];
     const scope = new OriginalScopeBuilder(names)
-                      .start(0, 0, 'global')
-                      .start(2, 5, 'function')
-                      .start(4, 10, 'block')
+                      .start(0, 0, {kind: 'global'})
+                      .start(2, 5, {kind: 'function'})
+                      .start(4, 10, {kind: 'block'})
                       .end(6, 5)
                       .end(8, 0)
                       .end(40, 0)
@@ -93,10 +113,10 @@ describe('decodeOriginalScopes', () => {
   it('decodes sibling scopes', () => {
     const names: string[] = [];
     const scope = new OriginalScopeBuilder(names)
-                      .start(0, 0, 'global')
-                      .start(2, 5, 'function')
+                      .start(0, 0, {kind: 'global'})
+                      .start(2, 5, {kind: 'function'})
                       .end(4, 0)
-                      .start(6, 6, 'function')
+                      .start(6, 6, {kind: 'function'})
                       .end(8, 0)
                       .end(10, 0)
                       .build();
@@ -119,9 +139,9 @@ describe('decodeOriginalScopes', () => {
   it('decodes scope names', () => {
     const names: string[] = [];
     const scope = new OriginalScopeBuilder(names)
-                      .start(0, 0, 'global')
-                      .start(2, 5, 'class', 'FooClass')
-                      .start(4, 10, 'function', 'fooMethod')
+                      .start(0, 0, {kind: 'global'})
+                      .start(2, 5, {kind: 'class', name: 'FooClass'})
+                      .start(4, 10, {kind: 'function', name: 'fooMethod'})
                       .end(6, 5)
                       .end(8, 0)
                       .end(40, 0)
@@ -141,9 +161,9 @@ describe('decodeOriginalScopes', () => {
   it('decodes variable names', () => {
     const names: string[] = [];
     const scope = new OriginalScopeBuilder(names)
-                      .start(0, 0, 'global')
-                      .start(2, 5, 'function', 'fooFunction', ['functionVarFoo'])
-                      .start(4, 10, 'block', undefined, ['blockVarFoo', 'blockVarBar'])
+                      .start(0, 0, {kind: 'global'})
+                      .start(2, 5, {kind: 'function', name: 'fooFunction', variables: ['functionVarFoo']})
+                      .start(4, 10, {kind: 'block', variables: ['blockVarFoo', 'blockVarBar']})
                       .end(6, 5)
                       .end(8, 0)
                       .end(40, 0)
@@ -252,8 +272,8 @@ describe('decodeGeneratedRanges', () => {
 
   it('throws if the definition references has an invalid source index', () => {
     const names: string[] = [];
-    const originEncodedScpoes = new OriginalScopeBuilder(names).start(2, 0, 'function').end(5, 0).build();
-    const originalScopes = decodeOriginalScopes([originEncodedScpoes], names);
+    const originEncodedScopes = new OriginalScopeBuilder(names).start(2, 0, {kind: 'function'}).end(5, 0).build();
+    const originalScopes = decodeOriginalScopes([originEncodedScopes], names);
     const range =
         new GeneratedRangeBuilder([]).start(0, 0, {definition: {sourceIdx: 1, scopeIdx: 0}}).end(0, 20).build();
 
@@ -262,8 +282,8 @@ describe('decodeGeneratedRanges', () => {
 
   it('throws if the definition references has an invalid scope index', () => {
     const names: string[] = [];
-    const originEncodedScpoes = new OriginalScopeBuilder(names).start(2, 0, 'function').end(5, 0).build();
-    const originalScopes = decodeOriginalScopes([originEncodedScpoes], names);
+    const originEncodedScopes = new OriginalScopeBuilder(names).start(2, 0, {kind: 'function'}).end(5, 0).build();
+    const originalScopes = decodeOriginalScopes([originEncodedScopes], names);
     const range =
         new GeneratedRangeBuilder([]).start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 4}}).end(0, 20).build();
 
@@ -272,9 +292,13 @@ describe('decodeGeneratedRanges', () => {
 
   it('decodes original scope (definition) references', () => {
     const names: string[] = [];
-    const originEncodedScpoes =
-        new OriginalScopeBuilder(names).start(0, 0, 'global').start(5, 0, 'function').end(10, 0).end(20, 0).build();
-    const originalScopes = decodeOriginalScopes([originEncodedScpoes], names);
+    const originEncodedScopes = new OriginalScopeBuilder(names)
+                                    .start(0, 0, {kind: 'global'})
+                                    .start(5, 0, {kind: 'function'})
+                                    .end(10, 0)
+                                    .end(20, 0)
+                                    .build();
+    const originalScopes = decodeOriginalScopes([originEncodedScopes], names);
     const range = new GeneratedRangeBuilder([])
                       .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 0}})
                       .start(0, 5, {definition: {sourceIdx: 0, scopeIdx: 1}})
@@ -292,10 +316,18 @@ describe('decodeGeneratedRanges', () => {
 
   it('decodes original scope (definition) references across multiple original sources', () => {
     const names: string[] = [];
-    const originEncodedScopes1 =
-        new OriginalScopeBuilder(names).start(0, 0, 'global').start(5, 0, 'function').end(10, 0).end(20, 0).build();
-    const originEncodedScopes2 =
-        new OriginalScopeBuilder(names).start(0, 0, 'global').start(5, 0, 'function').end(10, 0).end(20, 0).build();
+    const originEncodedScopes1 = new OriginalScopeBuilder(names)
+                                     .start(0, 0, {kind: 'global'})
+                                     .start(5, 0, {kind: 'function'})
+                                     .end(10, 0)
+                                     .end(20, 0)
+                                     .build();
+    const originEncodedScopes2 = new OriginalScopeBuilder(names)
+                                     .start(0, 0, {kind: 'global'})
+                                     .start(5, 0, {kind: 'function'})
+                                     .end(10, 0)
+                                     .end(20, 0)
+                                     .build();
     const originalScopes = decodeOriginalScopes([originEncodedScopes1, originEncodedScopes2], names);
     const range = new GeneratedRangeBuilder([])
                       .start(0, 0)
@@ -314,8 +346,8 @@ describe('decodeGeneratedRanges', () => {
 
   it('throws if an inlined range\'s callsite references an invalid source index', () => {
     const names: string[] = [];
-    const originEncodedScpoes = new OriginalScopeBuilder(names).start(2, 0, 'function').end(5, 0).build();
-    const originalScopes = decodeOriginalScopes([originEncodedScpoes], names);
+    const originEncodedScopes = new OriginalScopeBuilder(names).start(2, 0, {kind: 'function'}).end(5, 0).build();
+    const originalScopes = decodeOriginalScopes([originEncodedScopes], names);
     const range =
         new GeneratedRangeBuilder([]).start(0, 0, {callsite: {sourceIdx: 1, line: 0, column: 0}}).end(0, 20).build();
 
@@ -324,9 +356,13 @@ describe('decodeGeneratedRanges', () => {
 
   it('decodes multiple callsite references in the same source file and the same line', () => {
     const names: string[] = [];
-    const originEncodedScpoes =
-        new OriginalScopeBuilder(names).start(0, 0, 'global').start(1, 0, 'function').end(4, 0).end(10, 0).build();
-    const originalScopes = decodeOriginalScopes([originEncodedScpoes], names);
+    const originEncodedScopes = new OriginalScopeBuilder(names)
+                                    .start(0, 0, {kind: 'global'})
+                                    .start(1, 0, {kind: 'function'})
+                                    .end(4, 0)
+                                    .end(10, 0)
+                                    .build();
+    const originalScopes = decodeOriginalScopes([originEncodedScopes], names);
     const range =
         new GeneratedRangeBuilder([])
             .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 0}})
@@ -350,9 +386,13 @@ describe('decodeGeneratedRanges', () => {
   it('decodes multiple callsite refrences over multiple source files', () => {
     // A single function in the first file, is called in the first and second file. The bundler inlines both call-sites.
     const names: string[] = [];
-    const originalEncodedScopes1 =
-        new OriginalScopeBuilder(names).start(0, 0, 'global').start(1, 0, 'function').end(4, 0).end(10, 0).build();
-    const originalEncodedScopes2 = new OriginalScopeBuilder(names).start(0, 0, 'global').end(10, 0).build();
+    const originalEncodedScopes1 = new OriginalScopeBuilder(names)
+                                       .start(0, 0, {kind: 'global'})
+                                       .start(1, 0, {kind: 'function'})
+                                       .end(4, 0)
+                                       .end(10, 0)
+                                       .build();
+    const originalEncodedScopes2 = new OriginalScopeBuilder(names).start(0, 0, {kind: 'global'}).end(10, 0).build();
     const originalScopes = decodeOriginalScopes([originalEncodedScopes1, originalEncodedScopes2], names);
     const range =
         new GeneratedRangeBuilder([])
@@ -381,8 +421,10 @@ describe('decodeGeneratedRanges', () => {
 
   it('decodes bindings that are available/unavailable for the full range', () => {
     const names: string[] = [];
-    const originalEncodedScopes =
-        new OriginalScopeBuilder(names).start(0, 0, 'global', undefined, ['foo', 'bar', 'baz']).end(10, 0).build();
+    const originalEncodedScopes = new OriginalScopeBuilder(names)
+                                      .start(0, 0, {kind: 'global', variables: ['foo', 'bar', 'baz']})
+                                      .end(10, 0)
+                                      .build();
     const originalScopes = decodeOriginalScopes([originalEncodedScopes], names);
     const range = new GeneratedRangeBuilder(names)
                       .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 0}, bindings: ['x', undefined, 'y']})
@@ -398,7 +440,7 @@ describe('decodeGeneratedRanges', () => {
   it('decodes bindings that are available with different expressions throughout a range', () => {
     const names: string[] = [];
     const originalEncodedScopes =
-        new OriginalScopeBuilder(names).start(0, 0, 'global', undefined, ['foo']).end(10, 0).build();
+        new OriginalScopeBuilder(names).start(0, 0, {kind: 'global', variables: ['foo']}).end(10, 0).build();
     const originalScopes = decodeOriginalScopes([originalEncodedScopes], names);
     const range = new GeneratedRangeBuilder(names)
                       .start(0, 0, {
@@ -422,19 +464,44 @@ describe('decodeGeneratedRanges', () => {
     ]);
   });
 
-  it('decodes the "isFunctionScope" flag', () => {
+  it('decodes the "isStackFrame" flag in original scopes', () => {
+    const names: string[] = [];
+    const originalEncodedScopes = new OriginalScopeBuilder(names).start(0, 0, {isStackFrame: true}).end(5, 0).build();
+
+    const [{root}] = decodeOriginalScopes([originalEncodedScopes], names);
+
+    assert.isTrue(root.isStackFrame);
+  });
+
+  it('decodes the "isStackFrame" flag in generated ranges', () => {
+    const range = new GeneratedRangeBuilder([])
+                      .start(0, 0)
+                      .start(5, 0, {isStackFrame: true})
+                      .end(10, 0)
+                      .start(20, 4, {isStackFrame: false})
+                      .end(30, 0)
+                      .end(40, 0)
+                      .build();
+
+    const [generatedRange] = decodeGeneratedRanges(range, [], []);
+    assert.lengthOf(generatedRange.children, 2);
+    assert.isTrue(generatedRange.children[0].isStackFrame);
+    assert.isFalse(generatedRange.children[1].isStackFrame);
+  });
+
+  it('decodes the "isHidden" flag', () => {
     const range = new GeneratedRangeBuilder([])
                       .start(0, 0)
-                      .start(5, 0, {isFunctionScope: true})
+                      .start(5, 0, {isHidden: true})
                       .end(10, 0)
-                      .start(20, 4, {isFunctionScope: false})
+                      .start(20, 4)
                       .end(30, 0)
                       .end(40, 0)
                       .build();
 
     const [generatedRange] = decodeGeneratedRanges(range, [], []);
     assert.lengthOf(generatedRange.children, 2);
-    assert.isTrue(generatedRange.children[0].isFunctionScope);
-    assert.isFalse(generatedRange.children[1].isFunctionScope);
+    assert.isTrue(generatedRange.children[0].isHidden);
+    assert.isFalse(generatedRange.children[1].isHidden);
   });
 });

package/front_end/core/sdk/SourceMapScopes.ts

@@ -26,8 +26,9 @@ export interface OriginalScope {
    * Other languages might require language-specific scope kinds, in which case we'll print the
    * kind as-is.
    */
-  kind: string;
+  kind?: string;
   name?: string;
+  isStackFrame: boolean;
   variables: string[];
   children: OriginalScope[];
   parent?: OriginalScope;
@@ -44,7 +45,12 @@ export interface GeneratedRange {
   /**
    * Whether this generated range is an actual JavaScript function in the generated code.
    */
-  isFunctionScope: boolean;
+  isStackFrame: boolean;
+  /**
+   * Whether calls to this generated range should be hidden from stack traces even if
+   * this range has an `originalScope`.
+   */
+  isHidden: boolean;
 
   /**
    * If this `GeneratedRange` is the result of inlining `originalScope`, then `callsite`
@@ -101,14 +107,22 @@ function decodeOriginalScope(encodedOriginalScope: string, names: string[]): Ori
     line += item.line;
     const {column} = item;
     if (isStart(item)) {
-      kindIdx += item.kind;
-      const kind = resolveName(kindIdx, names);
-      if (kind === undefined) {
-        throw new Error(`Scope does not have a valid kind '${kind}'`);
+      let kind: string|undefined;
+      if (item.kind !== undefined) {
+        kindIdx += item.kind;
+        kind = resolveName(kindIdx, names);
       }
       const name = resolveName(item.name, names);
       const variables = item.variables.map(idx => names[idx]);
-      const scope: OriginalScope = {start: {line, column}, end: {line, column}, kind, name, variables, children: []};
+      const scope: OriginalScope = {
+        start: {line, column},
+        end: {line, column},
+        kind,
+        name,
+        isStackFrame: Boolean(item.flags & EncodedOriginalScopeFlag.IS_STACK_FRAME),
+        variables,
+        children: [],
+      };
       scopeStack.push(scope);
       scopeForItemIndex.set(index, scope);
     } else {
@@ -132,19 +146,25 @@ function decodeOriginalScope(encodedOriginalScope: string, names: string[]): Ori
 interface EncodedOriginalScopeStart {
   line: number;
   column: number;
-  kind: number;
   flags: number;
   name?: number;
+  kind?: number;
   variables: number[];
 }
 
+export const enum EncodedOriginalScopeFlag {
+  HAS_NAME = 0x1,
+  HAS_KIND = 0x2,
+  IS_STACK_FRAME = 0x4,
+}
+
 interface EncodedOriginalScopeEnd {
   line: number;
   column: number;
 }
 
 function isStart(item: EncodedOriginalScopeStart|EncodedOriginalScopeEnd): item is EncodedOriginalScopeStart {
-  return 'kind' in item;
+  return 'flags' in item;
 }
 
 function*
@@ -173,14 +193,16 @@ function*
     const startItem: EncodedOriginalScopeStart = {
       line,
       column,
-      kind: iter.nextVLQ(),
       flags: iter.nextVLQ(),
       variables: [],
     };
 
-    if (startItem.flags & 0x1) {
+    if (startItem.flags & EncodedOriginalScopeFlag.HAS_NAME) {
       startItem.name = iter.nextVLQ();
     }
+    if (startItem.flags & EncodedOriginalScopeFlag.HAS_KIND) {
+      startItem.kind = iter.nextVLQ();
+    }
 
     while (iter.hasNext() && iter.peek() !== ',') {
       startItem.variables.push(iter.nextVLQ());
@@ -196,7 +218,8 @@ export function decodeGeneratedRanges(
   const rangeStack: GeneratedRange[] = [{
     start: {line: 0, column: 0},
     end: {line: 0, column: 0},
-    isFunctionScope: false,
+    isStackFrame: false,
+    isHidden: false,
     children: [],
     values: [],
   }];
@@ -207,7 +230,8 @@ export function decodeGeneratedRanges(
       const range: GeneratedRange = {
         start: {line: item.line, column: item.column},
         end: {line: item.line, column: item.column},
-        isFunctionScope: Boolean(item.flags & EncodedGeneratedRangeFlag.IS_FUNCTION_SCOPE),
+        isStackFrame: Boolean(item.flags & EncodedGeneratedRangeFlag.IS_STACK_FRAME),
+        isHidden: Boolean(item.flags & EncodedGeneratedRangeFlag.IS_HIDDEN),
         values: [],
         children: [],
       };
@@ -308,7 +332,8 @@ interface EncodedGeneratedRangeEnd {
 export const enum EncodedGeneratedRangeFlag {
   HAS_DEFINITION = 0x1,
   HAS_CALLSITE = 0x2,
-  IS_FUNCTION_SCOPE = 0x4,
+  IS_STACK_FRAME = 0x4,
+  IS_HIDDEN = 0x8,
 }
 
 function isRangeStart(item: EncodedGeneratedRangeStart|EncodedGeneratedRangeEnd): item is EncodedGeneratedRangeStart {