chrome-devtools-frontend 1.0.950971 → 1.0.952403

package/front_end/core/root/Runtime.ts

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-const originalConsole = console;
-const originalAssert = console.assert;
+import * as Platform from '../platform/platform.js';
 
 const queryParamsObject = new URLSearchParams(location.search);
 
@@ -100,13 +99,6 @@ export class Runtime {
     }
   }
 
-  static assert(value: boolean|undefined, message: string): void {
-    if (value) {
-      return;
-    }
-    originalAssert.call(originalConsole, value, message + ' ' + new Error().stack);
-  }
-
   static setPlatform(platform: string): void {
     runtimePlatform = platform;
   }
@@ -197,8 +189,8 @@ export class ExperimentsSupport {
   }
 
   register(experimentName: string, experimentTitle: string, unstable?: boolean, docLink?: string): void {
-    Runtime.assert(
-        !this.#experimentNames.has(experimentName), 'Duplicate registration of experiment ' + experimentName);
+    Platform.DCHECK(
+        () => !this.#experimentNames.has(experimentName), 'Duplicate registration of experiment ' + experimentName);
     this.#experimentNames.add(experimentName);
     this.#experiments.push(new Experiment(this, experimentName, experimentTitle, Boolean(unstable), docLink ?? ''));
   }
@@ -278,7 +270,7 @@ export class ExperimentsSupport {
   }
 
   private checkExperiment(experimentName: string): void {
-    Runtime.assert(this.#experimentNames.has(experimentName), 'Unknown experiment ' + experimentName);
+    Platform.DCHECK(() => this.#experimentNames.has(experimentName), 'Unknown experiment ' + experimentName);
   }
 }
 

package/front_end/core/sdk/CSSRule.ts

@@ -73,7 +73,7 @@ export class CSSRule {
   getStyleSheetHeader(styleSheetId: Protocol.CSS.StyleSheetId): CSSStyleSheetHeader {
     const styleSheetHeader = this.cssModelInternal.styleSheetHeaderForId(styleSheetId);
     console.assert(styleSheetHeader !== null);
-    return /** @type {!CSSStyleSheetHeader} */ styleSheetHeader as CSSStyleSheetHeader;
+    return styleSheetHeader as CSSStyleSheetHeader;
   }
 }
 

package/front_end/core/sdk/DOMModel.ts

@@ -408,11 +408,7 @@ export class DOMNode {
     return this.localName();
   }
 
-  setNodeName(
-      name: string,
-      // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      callback?: ((arg0: string|null, arg1: DOMNode|null) => any)): void {
+  setNodeName(name: string, callback?: ((arg0: string|null, arg1: DOMNode|null) => void)): void {
     this.#agent.invoke_setNodeName({nodeId: this.id, name}).then(response => {
       if (!response.getError()) {
         this.#domModelInternal.markUndoableState();
@@ -435,9 +431,7 @@ export class DOMNode {
     this.nodeValueInternal = nodeValue;
   }
 
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  setNodeValue(value: string, callback?: ((arg0: string|null) => any)): void {
+  setNodeValue(value: string, callback?: ((arg0: string|null) => void)): void {
     this.#agent.invoke_setNodeValue({nodeId: this.id, value}).then(response => {
       if (!response.getError()) {
         this.#domModelInternal.markUndoableState();
@@ -453,11 +447,7 @@ export class DOMNode {
     return attr ? attr.value : undefined;
   }
 
-  setAttribute(
-      name: string, text: string,
-      // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      callback?: ((arg0: string|null) => any)): void {
+  setAttribute(name: string, text: string, callback?: ((arg0: string|null) => void)): void {
     this.#agent.invoke_setAttributesAsText({nodeId: this.id, text, name}).then(response => {
       if (!response.getError()) {
         this.#domModelInternal.markUndoableState();
@@ -468,11 +458,7 @@ export class DOMNode {
     });
   }
 
-  setAttributeValue(
-      name: string, value: string,
-      // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      callback?: ((arg0: string|null) => any)): void {
+  setAttributeValue(name: string, value: string, callback?: ((arg0: string|null) => void)): void {
     this.#agent.invoke_setAttributeValue({nodeId: this.id, name, value}).then(response => {
       if (!response.getError()) {
         this.#domModelInternal.markUndoableState();
@@ -520,9 +506,7 @@ export class DOMNode {
     return outerHTML;
   }
 
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  setOuterHTML(html: string, callback?: ((arg0: string|null) => any)): void {
+  setOuterHTML(html: string, callback?: ((arg0: string|null) => void)): void {
     this.#agent.invoke_setOuterHTML({nodeId: this.id, outerHTML: html}).then(response => {
       if (!response.getError()) {
         this.#domModelInternal.markUndoableState();
@@ -533,10 +517,7 @@ export class DOMNode {
     });
   }
 
-  removeNode(callback?: (
-      // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (arg0: string|null, arg1?: Protocol.DOM.NodeId|undefined) => any)): Promise<void> {
+  removeNode(callback?: ((arg0: string|null, arg1?: Protocol.DOM.NodeId|undefined) => void)): Promise<void> {
     return this.#agent.invoke_removeNode({nodeId: this.id}).then(response => {
       if (!response.getError()) {
         this.#domModelInternal.markUndoableState();
@@ -738,11 +719,8 @@ export class DOMNode {
     this.#attributesInternal.delete(name);
   }
 
-  copyTo(
-      targetNode: DOMNode, anchorNode: DOMNode|null,
-      // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      callback?: ((arg0: string|null, arg1: DOMNode|null) => any)): void {
+  copyTo(targetNode: DOMNode, anchorNode: DOMNode|null, callback?: ((arg0: string|null, arg1: DOMNode|null) => void)):
+      void {
     this.#agent
         .invoke_copyTo(
             {nodeId: this.id, targetNodeId: targetNode.id, insertBeforeNodeId: anchorNode ? anchorNode.id : undefined})
@@ -756,11 +734,8 @@ export class DOMNode {
         });
   }
 
-  moveTo(
-      targetNode: DOMNode, anchorNode: DOMNode|null,
-      // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      callback?: ((arg0: string|null, arg1: DOMNode|null) => any)): void {
+  moveTo(targetNode: DOMNode, anchorNode: DOMNode|null, callback?: ((arg0: string|null, arg1: DOMNode|null) => void)):
+      void {
     this.#agent
         .invoke_moveTo(
             {nodeId: this.id, targetNodeId: targetNode.id, insertBeforeNodeId: anchorNode ? anchorNode.id : undefined})
@@ -1076,11 +1051,11 @@ export class DOMModel extends SDKModel<EventTypes> {
   }
 
   cssModel(): CSSModel {
-    return /** @type {!CSSModel} */ this.target().model(CSSModel) as CSSModel;
+    return this.target().model(CSSModel) as CSSModel;
   }
 
   overlayModel(): OverlayModel {
-    return /** @type {!OverlayModel} */ this.target().model(OverlayModel) as OverlayModel;
+    return this.target().model(OverlayModel) as OverlayModel;
   }
 
   static cancelSearch(): void {

package/front_end/core/sdk/OverlayModel.ts

@@ -59,27 +59,13 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
   #hideHighlightTimeout: number|null;
   #defaultHighlighter: Highlighter;
   #highlighter: Highlighter;
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #showPaintRectsSetting: Common.Settings.Setting<any>;
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #showLayoutShiftRegionsSetting: Common.Settings.Setting<any>;
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #showAdHighlightsSetting: Common.Settings.Setting<any>;
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #showDebugBordersSetting: Common.Settings.Setting<any>;
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #showFPSCounterSetting: Common.Settings.Setting<any>;
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #showScrollBottleneckRectsSetting: Common.Settings.Setting<any>;
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #showWebVitalsSetting: Common.Settings.Setting<any>;
+  #showPaintRectsSetting: Common.Settings.Setting<boolean>;
+  #showLayoutShiftRegionsSetting: Common.Settings.Setting<boolean>;
+  #showAdHighlightsSetting: Common.Settings.Setting<boolean>;
+  #showDebugBordersSetting: Common.Settings.Setting<boolean>;
+  #showFPSCounterSetting: Common.Settings.Setting<boolean>;
+  #showScrollBottleneckRectsSetting: Common.Settings.Setting<boolean>;
+  #showWebVitalsSetting: Common.Settings.Setting<boolean>;
   #registeredListeners: Common.EventTarget.EventDescriptor[];
   #showViewportSizeOnResize: boolean;
   #persistentHighlighter: OverlayPersistentHighlighter|null;
@@ -113,14 +99,15 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     this.#defaultHighlighter = new DefaultHighlighter(this);
     this.#highlighter = this.#defaultHighlighter;
 
-    this.#showPaintRectsSetting = Common.Settings.Settings.instance().moduleSetting('showPaintRects');
-    this.#showLayoutShiftRegionsSetting = Common.Settings.Settings.instance().moduleSetting('showLayoutShiftRegions');
-    this.#showAdHighlightsSetting = Common.Settings.Settings.instance().moduleSetting('showAdHighlights');
-    this.#showDebugBordersSetting = Common.Settings.Settings.instance().moduleSetting('showDebugBorders');
-    this.#showFPSCounterSetting = Common.Settings.Settings.instance().moduleSetting('showFPSCounter');
+    this.#showPaintRectsSetting = Common.Settings.Settings.instance().moduleSetting<boolean>('showPaintRects');
+    this.#showLayoutShiftRegionsSetting =
+        Common.Settings.Settings.instance().moduleSetting<boolean>('showLayoutShiftRegions');
+    this.#showAdHighlightsSetting = Common.Settings.Settings.instance().moduleSetting<boolean>('showAdHighlights');
+    this.#showDebugBordersSetting = Common.Settings.Settings.instance().moduleSetting<boolean>('showDebugBorders');
+    this.#showFPSCounterSetting = Common.Settings.Settings.instance().moduleSetting<boolean>('showFPSCounter');
     this.#showScrollBottleneckRectsSetting =
-        Common.Settings.Settings.instance().moduleSetting('showScrollBottleneckRects');
-    this.#showWebVitalsSetting = Common.Settings.Settings.instance().moduleSetting('showWebVitals');
+        Common.Settings.Settings.instance().moduleSetting<boolean>('showScrollBottleneckRects');
+    this.#showWebVitalsSetting = Common.Settings.Settings.instance().moduleSetting<boolean>('showWebVitals');
 
     this.#registeredListeners = [];
     this.#showViewportSizeOnResize = true;
@@ -178,18 +165,15 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     return this.#domModel;
   }
 
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  highlightRect({x, y, width, height, color, outlineColor}: HighlightRect): Promise<any> {
+  highlightRect({x, y, width, height, color, outlineColor}: HighlightRect):
+      Promise<Protocol.ProtocolResponseWithError> {
     const highlightColor = color || {r: 255, g: 0, b: 255, a: 0.3};
     const highlightOutlineColor = outlineColor || {r: 255, g: 0, b: 255, a: 0.5};
     return this.overlayAgent.invoke_highlightRect(
         {x, y, width, height, color: highlightColor, outlineColor: highlightOutlineColor});
   }
 
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  clearHighlight(): Promise<any> {
+  clearHighlight(): Promise<Protocol.ProtocolResponseWithError> {
     return this.overlayAgent.invoke_hideHighlight();
   }
 

package/front_end/core/sdk/OverlayPersistentHighlighter.ts

@@ -360,15 +360,9 @@ export class OverlayPersistentHighlighter {
   }
 }
 
-/**
- * @interface
- */
 export interface DOMModel {
   nodeForId(nodeId: Protocol.DOM.NodeId): void;
 }
-/**
- * @interface
- */
 export interface OverlayAgent {
   // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
   // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -415,16 +409,10 @@ export interface OverlayAgent {
   }): void;
 }
 
-/**
- * @interface
- */
 export interface Target {
   overlayAgent(): OverlayAgent;
 }
 
-/**
- * @interface
- */
 export interface OverlayModel {
   getDOMModel(): DOMModel;
 

package/front_end/core/sdk/PageResourceLoader.ts

@@ -219,7 +219,8 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
       return this.#loadOverride(url);
     }
     const parsedURL = new Common.ParsedURL.ParsedURL(url);
-    const eligibleForLoadFromTarget = getLoadThroughTargetSetting().get() && parsedURL && parsedURL.isHttpOrHttps();
+    const eligibleForLoadFromTarget =
+        getLoadThroughTargetSetting().get() && parsedURL && parsedURL.scheme !== 'file' && parsedURL.scheme !== 'data';
     Host.userMetrics.developerResourceScheme(this.getDeveloperResourceScheme(parsedURL));
     if (eligibleForLoadFromTarget) {
       try {

package/front_end/core/sdk/RuntimeModel.ts

@@ -644,7 +644,6 @@ export class ExecutionContext {
       return this.evaluateGlobal(options, userGesture, awaitPromise);
     }
 
-    /** @type {!EvaluationResult} */
     if (this.runtimeModel.hasSideEffectSupport() !== false) {
       await this.runtimeModel.checkSideEffectSupport();
       if (this.runtimeModel.hasSideEffectSupport()) {

package/front_end/core/sdk/SourceMap.ts

@@ -303,7 +303,7 @@ export class TextSourceMap implements SourceMap {
       this.eachSection(this.parseMap.bind(this));
       this.#json = null;
     }
-    return /** @type {!Array<!SourceMapEntry>} */ this.#mappingsInternal as SourceMapEntry[];
+    return this.#mappingsInternal;
   }
 
   private reversedMappings(sourceURL: string): number[] {

package/front_end/core/sdk/TracingManager.ts

@@ -94,9 +94,6 @@ export class TracingManager extends SDKModel<void> {
   }
 }
 
-/**
- * @interface
- */
 export interface TracingManagerClient {
   traceEventsCollected(events: EventPayload[]): void;
 

package/front_end/entrypoints/formatter_worker/AcornTokenizer.ts

@@ -34,28 +34,28 @@ export type TokenOrComment = Acorn.Token|Acorn.Comment;
  * out whether the next token should be the preceding comment or not.
  */
 export class AcornTokenizer {
-  private readonly content: string;
-  private readonly comments: Acorn.Comment[];
-  private tokenizer: {
+  readonly #content: string;
+  readonly #comments: Acorn.Comment[];
+  #tokenizer: {
     getToken(): Acorn.Token,
     [Symbol.iterator](): Iterator<Acorn.Token>,
   };
-  private textCursor: TextUtils.TextCursor.TextCursor;
-  private tokenLineStartInternal: number;
-  private tokenLineEndInternal: number;
-  private tokenColumnStartInternal: number;
-  private bufferedToken?: TokenOrComment;
+  #textCursor: TextUtils.TextCursor.TextCursor;
+  #tokenLineStartInternal: number;
+  #tokenLineEndInternal: number;
+  #tokenColumnStartInternal: number;
+  #bufferedToken?: TokenOrComment;
 
   constructor(content: string) {
-    this.content = content;
-    this.comments = [];
-    this.tokenizer =
-        Acorn.tokenizer(this.content, {onComment: this.comments, ecmaVersion: ECMA_VERSION, allowHashBang: true});
-    const contentLineEndings = Platform.StringUtilities.findLineEndingIndexes(this.content);
-    this.textCursor = new TextUtils.TextCursor.TextCursor(contentLineEndings);
-    this.tokenLineStartInternal = 0;
-    this.tokenLineEndInternal = 0;
-    this.tokenColumnStartInternal = 0;
+    this.#content = content;
+    this.#comments = [];
+    this.#tokenizer =
+        Acorn.tokenizer(this.#content, {onComment: this.#comments, ecmaVersion: ECMA_VERSION, allowHashBang: true});
+    const contentLineEndings = Platform.StringUtilities.findLineEndingIndexes(this.#content);
+    this.#textCursor = new TextUtils.TextCursor.TextCursor(contentLineEndings);
+    this.#tokenLineStartInternal = 0;
+    this.#tokenLineEndInternal = 0;
+    this.#tokenColumnStartInternal = 0;
     // If the first "token" should be a comment, we don't want to shift
     // the comment from the array (which happens in `nextTokenInternal`).
     // Therefore, we should bail out from retrieving the token if this
@@ -65,8 +65,8 @@ export class AcornTokenizer {
     // themselves. In that case, we first retrieve the actual token, before
     // we see the comment itself. In that case, we should proceed and
     // initialize `bufferedToken` as normal, to allow us to fix the reordering.
-    if (this.comments.length === 0) {
-      this.nextTokenInternal();
+    if (this.#comments.length === 0) {
+      this.#nextTokenInternal();
     }
   }
 
@@ -94,59 +94,59 @@ export class AcornTokenizer {
     return token.type === 'Block';
   }
 
-  private nextTokenInternal(): TokenOrComment|undefined {
-    if (this.comments.length) {
-      const nextComment = this.comments.shift();
+  #nextTokenInternal(): TokenOrComment|undefined {
+    if (this.#comments.length) {
+      const nextComment = this.#comments.shift();
       // If this was the last comment to process, we need to make
       // sure to update our `bufferedToken` to become the actual
       // token. This only happens when we are processing the very
       // first comment of a file (usually a hashbang comment)
       // in which case we don't have to fix the reordering of tokens.
-      if (!this.bufferedToken && this.comments.length === 0) {
-        this.bufferedToken = this.tokenizer.getToken();
+      if (!this.#bufferedToken && this.#comments.length === 0) {
+        this.#bufferedToken = this.#tokenizer.getToken();
       }
       return nextComment;
     }
-    const token = this.bufferedToken;
-    this.bufferedToken = this.tokenizer.getToken();
+    const token = this.#bufferedToken;
+    this.#bufferedToken = this.#tokenizer.getToken();
     return token;
   }
 
   nextToken(): TokenOrComment|null {
-    const token = this.nextTokenInternal();
+    const token = this.#nextTokenInternal();
     if (!token || token.type === Acorn.tokTypes.eof) {
       return null;
     }
 
-    this.textCursor.advance(token.start);
-    this.tokenLineStartInternal = this.textCursor.lineNumber();
-    this.tokenColumnStartInternal = this.textCursor.columnNumber();
+    this.#textCursor.advance(token.start);
+    this.#tokenLineStartInternal = this.#textCursor.lineNumber();
+    this.#tokenColumnStartInternal = this.#textCursor.columnNumber();
 
-    this.textCursor.advance(token.end);
-    this.tokenLineEndInternal = this.textCursor.lineNumber();
+    this.#textCursor.advance(token.end);
+    this.#tokenLineEndInternal = this.#textCursor.lineNumber();
     return token;
   }
 
   peekToken(): TokenOrComment|null {
-    if (this.comments.length) {
-      return this.comments[0];
+    if (this.#comments.length) {
+      return this.#comments[0];
     }
-    if (!this.bufferedToken) {
+    if (!this.#bufferedToken) {
       return null;
     }
-    return this.bufferedToken.type !== Acorn.tokTypes.eof ? this.bufferedToken : null;
+    return this.#bufferedToken.type !== Acorn.tokTypes.eof ? this.#bufferedToken : null;
   }
 
   tokenLineStart(): number {
-    return this.tokenLineStartInternal;
+    return this.#tokenLineStartInternal;
   }
 
   tokenLineEnd(): number {
-    return this.tokenLineEndInternal;
+    return this.#tokenLineEndInternal;
   }
 
   tokenColumnStart(): number {
-    return this.tokenColumnStartInternal;
+    return this.#tokenColumnStartInternal;
   }
 }
 

package/front_end/entrypoints/formatter_worker/CSSFormatter.ts

@@ -40,21 +40,21 @@ const cssTrimEnd = (tokenValue: string): string => {
 };
 
 export class CSSFormatter {
-  private readonly builder: FormattedContentBuilder;
-  private toOffset!: number;
-  private fromOffset!: number;
-  private lineEndings!: number[];
-  private lastLine: number;
-  private state: {
+  readonly #builder: FormattedContentBuilder;
+  #toOffset!: number;
+  #fromOffset!: number;
+  #lineEndings!: number[];
+  #lastLine: number;
+  #state: {
     eatWhitespace: (boolean|undefined),
     seenProperty: (boolean|undefined),
     inPropertyValue: (boolean|undefined),
     afterClosingBrace: (boolean|undefined),
   };
   constructor(builder: FormattedContentBuilder) {
-    this.builder = builder;
-    this.lastLine = -1;
-    this.state = {
+    this.#builder = builder;
+    this.#lastLine = -1;
+    this.#state = {
       eatWhitespace: undefined,
       seenProperty: undefined,
       inPropertyValue: undefined,
@@ -63,84 +63,84 @@ export class CSSFormatter {
   }
 
   format(text: string, lineEndings: number[], fromOffset: number, toOffset: number): void {
-    this.lineEndings = lineEndings;
-    this.fromOffset = fromOffset;
-    this.toOffset = toOffset;
-    this.state = {
+    this.#lineEndings = lineEndings;
+    this.#fromOffset = fromOffset;
+    this.#toOffset = toOffset;
+    this.#state = {
       eatWhitespace: undefined,
       seenProperty: undefined,
       inPropertyValue: undefined,
       afterClosingBrace: undefined,
     };
-    this.lastLine = -1;
+    this.#lastLine = -1;
     const tokenize = createTokenizer('text/css');
-    const oldEnforce = this.builder.setEnforceSpaceBetweenWords(false);
-    tokenize(text.substring(this.fromOffset, this.toOffset), this.tokenCallback.bind(this));
-    this.builder.setEnforceSpaceBetweenWords(oldEnforce);
+    const oldEnforce = this.#builder.setEnforceSpaceBetweenWords(false);
+    tokenize(text.substring(this.#fromOffset, this.#toOffset), this.#tokenCallback.bind(this));
+    this.#builder.setEnforceSpaceBetweenWords(oldEnforce);
   }
 
-  private tokenCallback(token: string, type: string|null, startPosition: number): void {
-    startPosition += this.fromOffset;
-    const startLine =
-        Platform.ArrayUtilities.lowerBound(this.lineEndings, startPosition, Platform.ArrayUtilities.DEFAULT_COMPARATOR);
-    if (startLine !== this.lastLine) {
-      this.state.eatWhitespace = true;
+  #tokenCallback(token: string, type: string|null, startPosition: number): void {
+    startPosition += this.#fromOffset;
+    const startLine = Platform.ArrayUtilities.lowerBound(
+        this.#lineEndings, startPosition, Platform.ArrayUtilities.DEFAULT_COMPARATOR);
+    if (startLine !== this.#lastLine) {
+      this.#state.eatWhitespace = true;
     }
-    if (type && (/^property/.test(type) || /^variable-2/.test(type)) && !this.state.inPropertyValue) {
-      this.state.seenProperty = true;
+    if (type && (/^property/.test(type) || /^variable-2/.test(type)) && !this.#state.inPropertyValue) {
+      this.#state.seenProperty = true;
     }
-    this.lastLine = startLine;
+    this.#lastLine = startLine;
     // https://drafts.csswg.org/css-syntax/#whitespace
     const isWhitespace = /^(?:\r?\n|[\t\f\r ])+$/.test(token);
     if (isWhitespace) {
-      if (!this.state.eatWhitespace) {
-        this.builder.addSoftSpace();
+      if (!this.#state.eatWhitespace) {
+        this.#builder.addSoftSpace();
       }
       return;
     }
-    this.state.eatWhitespace = false;
+    this.#state.eatWhitespace = false;
     if (token === '\n') {
       return;
     }
 
     if (token !== '}') {
-      if (this.state.afterClosingBrace) {
-        this.builder.addNewLine(true);
+      if (this.#state.afterClosingBrace) {
+        this.#builder.addNewLine(true);
       }
-      this.state.afterClosingBrace = false;
+      this.#state.afterClosingBrace = false;
     }
     if (token === '}') {
-      if (this.state.inPropertyValue) {
-        this.builder.addNewLine();
+      if (this.#state.inPropertyValue) {
+        this.#builder.addNewLine();
       }
-      this.builder.decreaseNestingLevel();
-      this.state.afterClosingBrace = true;
-      this.state.inPropertyValue = false;
-    } else if (token === ':' && !this.state.inPropertyValue && this.state.seenProperty) {
-      this.builder.addToken(token, startPosition);
-      this.builder.addSoftSpace();
-      this.state.eatWhitespace = true;
-      this.state.inPropertyValue = true;
-      this.state.seenProperty = false;
+      this.#builder.decreaseNestingLevel();
+      this.#state.afterClosingBrace = true;
+      this.#state.inPropertyValue = false;
+    } else if (token === ':' && !this.#state.inPropertyValue && this.#state.seenProperty) {
+      this.#builder.addToken(token, startPosition);
+      this.#builder.addSoftSpace();
+      this.#state.eatWhitespace = true;
+      this.#state.inPropertyValue = true;
+      this.#state.seenProperty = false;
       return;
     } else if (token === '{') {
-      this.builder.addSoftSpace();
-      this.builder.addToken(token, startPosition);
-      this.builder.addNewLine();
-      this.builder.increaseNestingLevel();
+      this.#builder.addSoftSpace();
+      this.#builder.addToken(token, startPosition);
+      this.#builder.addNewLine();
+      this.#builder.increaseNestingLevel();
       return;
     }
 
-    this.builder.addToken(cssTrimEnd(token), startPosition);
+    this.#builder.addToken(cssTrimEnd(token), startPosition);
 
-    if (type === 'comment' && !this.state.inPropertyValue && !this.state.seenProperty) {
-      this.builder.addNewLine();
+    if (type === 'comment' && !this.#state.inPropertyValue && !this.#state.seenProperty) {
+      this.#builder.addNewLine();
     }
-    if (token === ';' && this.state.inPropertyValue) {
-      this.state.inPropertyValue = false;
-      this.builder.addNewLine();
+    if (token === ';' && this.#state.inPropertyValue) {
+      this.#state.inPropertyValue = false;
+      this.#builder.addNewLine();
     } else if (token === '}') {
-      this.builder.addNewLine();
+      this.#builder.addNewLine();
     }
   }
 }