[RPP] Move pretty-mapping for profile data to ProfilePlugin

This moves the manual mapping for the profile data decoration out of
UISourceCode and into the ProfilePlugin. This also adds support for the
experimental memory decorations for pretty'd sources.

Bug: 462212096, 406012441
Change-Id: Id3ceb4e2d6f3b356c3c896d78c08afe39a45cbe8
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7173542
Auto-Submit: Connor Clark <[email protected]>
Commit-Queue: Connor Clark <[email protected]>
Reviewed-by: Paul Irish <[email protected]>

Author: Connor Clark

front_end/models/workspace/UISourceCode.test.ts

@@ -378,38 +378,6 @@ describe('UISourceCode', () => {
 
     assert.isTrue(sutObject.sut.editDisabled());
   });
-
-  describe('formatChanged', () => {
-    it('should remap performance decorations when the source is formatted', () => {
-      const {sut} = setupMockedUISourceCode();
-      const decorations = new Map<number, Map<number, number>>();
-      const columnData = new Map<number, number>();
-      columnData.set(10, 100);         // column 10, value 100
-      decorations.set(1, columnData);  // line 1
-
-      sut.setDecorationData(Workspace.UISourceCode.DecoratorType.PERFORMANCE, decorations);
-
-      const format = {
-        originalToFormatted: (lineNumber: number, columnNumber?: number) => {
-          if (lineNumber === 0 && columnNumber === 9) {
-            return [4, 1];  // new line 5, new column 2 (0-based)
-          }
-          return [lineNumber, columnNumber || 0];
-        },
-      };
-
-      sut.formatChanged(format);
-
-      const newDecorations = sut.getDecorationData(Workspace.UISourceCode.DecoratorType.PERFORMANCE);
-      assert.isDefined(newDecorations);
-
-      const newLineData = newDecorations.get(5);  // check line 5 (1-based)
-      assert.isDefined(newLineData);
-
-      const newData = newLineData.get(2);  // check column 2 (1-based)
-      assert.strictEqual(newData, 100);
-    });
-  });
 });
 
 describe('UILocation', () => {

front_end/models/workspace/UISourceCode.ts

@@ -12,8 +12,6 @@ import * as TextUtils from '../text_utils/text_utils.js';
 import {IgnoreListManager} from './IgnoreListManager.js';
 import {Events as WorkspaceImplEvents, type Project} from './WorkspaceImpl.js';
 
-export type LineColumnProfileMap = Map<number, Map<number, number>>;
-
 const UIStrings = {
   /**
    * @description Text for the index of something
@@ -37,9 +35,7 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   #contentType: Common.ResourceType.ResourceType;
   #requestContentPromise: Promise<TextUtils.ContentData.ContentDataOrError>|null = null;
   #decorations = new Map<string, any>();
-  #formattedDecorations = new Map<string, any>();
   #hasCommits = false;
-  #prettied = false;
   #messages: Set<Message>|null = null;
   #content: TextUtils.ContentData.ContentDataOrError|null = null;
   #forceLoadOnCheckContent = false;
@@ -501,9 +497,6 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   }
 
   getDecorationData(type: string): any {
-    if (this.#prettied && this.#formattedDecorations.get(type)) {
-      return this.#formattedDecorations.get(type);
-    }
     return this.#decorations.get(type);
   }
 
@@ -515,45 +508,6 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     return this.#disableEdit;
   }
 
-  formatChanged(format: {originalToFormatted(lineNumber: number, columnNumber?: number): number[]}|null): void {
-    if (this.#prettied === Boolean(format)) {
-      return;
-    }
-    this.#prettied = Boolean(format);
-    if (!format) {
-      this.dispatchEventToListeners(Events.DecorationChanged, DecoratorType.PERFORMANCE);
-      return;
-    }
-    const performanceDecorations = this.#decorations.get(DecoratorType.PERFORMANCE);
-    if (!performanceDecorations) {
-      return;
-    }
-    let formattedPerformanceDecorations: LineColumnProfileMap =
-        this.#formattedDecorations.get(DecoratorType.PERFORMANCE);
-    if (!formattedPerformanceDecorations) {
-      formattedPerformanceDecorations = new Map();
-      this.#formattedDecorations.set(DecoratorType.PERFORMANCE, formattedPerformanceDecorations);
-    } else {
-      formattedPerformanceDecorations.clear();
-    }
-
-    for (const [lineNumber, columnData] of performanceDecorations) {
-      for (const [columnNumber, data] of columnData) {
-        const [formattedLineNumber, formattedColumnNumber] =
-            format.originalToFormatted(lineNumber - 1, columnNumber - 1);
-        const oneBasedFormattedLineNumber = formattedLineNumber + 1;
-        const oneBasedFormattedColumnNumber = formattedColumnNumber + 1;
-        let lineData = formattedPerformanceDecorations.get(oneBasedFormattedLineNumber);
-        if (!lineData) {
-          lineData = new Map();
-          formattedPerformanceDecorations.set(oneBasedFormattedLineNumber, lineData);
-        }
-        lineData.set(oneBasedFormattedColumnNumber, (lineData.get(oneBasedFormattedColumnNumber) || 0) + data);
-      }
-    }
-    this.dispatchEventToListeners(Events.DecorationChanged, 'performance');
-  }
-
   isIgnoreListed(): boolean {
     return IgnoreListManager.instance().isUserOrSourceMapIgnoreListedUISourceCode(this);
   }

front_end/panels/sources/ProfilePlugin.ts

@@ -9,6 +9,7 @@ import * as Workspace from '../../models/workspace/workspace.js';
 import * as CodeMirror from '../../third_party/codemirror.next/codemirror.next.js';
 import type * as TextEditor from '../../ui/components/text_editor/text_editor.js';
 import type * as PerfUI from '../../ui/legacy/components/perf_ui/perf_ui.js';
+import type * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js';
 
 import {Plugin} from './Plugin.js';
 
@@ -109,13 +110,15 @@ function markersFromProfileData(
   return CodeMirror.RangeSet.of(markers, true);
 }
 
-const makeLineLevelProfilePlugin = (type: Workspace.UISourceCode.DecoratorType): typeof Plugin => class extends Plugin {
+const makeLineLevelProfilePlugin = (type: Workspace.UISourceCode.DecoratorType): typeof Plugin =>
+    class ProfilePlugin extends Plugin {
   updateEffect = CodeMirror.StateEffect.define<PerfUI.LineLevelProfile.LineColumnProfileMap>();
   field: CodeMirror.StateField<CodeMirror.RangeSet<CodeMirror.GutterMarker>>;
   gutter: CodeMirror.Extension;
   compartment: CodeMirror.Compartment = new CodeMirror.Compartment();
+  readonly #transformer: SourceFrame.SourceFrame.Transformer;
 
-  constructor(uiSourceCode: Workspace.UISourceCode.UISourceCode) {
+  constructor(uiSourceCode: Workspace.UISourceCode.UISourceCode, transformer: SourceFrame.SourceFrame.Transformer) {
     super(uiSourceCode);
 
     this.field = CodeMirror.StateField.define<CodeMirror.RangeSet<CodeMirror.GutterMarker>>({
@@ -133,14 +136,35 @@ const makeLineLevelProfilePlugin = (type: Workspace.UISourceCode.DecoratorType):
       markers: view => view.state.field(this.field),
       class: `cm-${type}Gutter`,
     });
+
+    this.#transformer = transformer;
   }
 
   static override accepts(uiSourceCode: Workspace.UISourceCode.UISourceCode): boolean {
     return uiSourceCode.contentType().hasScripts();
   }
 
   private getLineMap(): PerfUI.LineLevelProfile.LineColumnProfileMap|undefined {
-    return this.uiSourceCode.getDecorationData(type);
+    const uiSourceCodeProfileMap = this.uiSourceCode.getDecorationData(type);
+    if (!uiSourceCodeProfileMap) {
+      return undefined;
+    }
+
+    const editorProfileMap: PerfUI.LineLevelProfile.LineColumnProfileMap = new Map();
+    for (const [lineNumber, columnData] of uiSourceCodeProfileMap) {
+      for (const [columnNumber, data] of columnData) {
+        const editorLocation = this.#transformer.uiLocationToEditorLocation(lineNumber - 1, columnNumber - 1);
+        const oneBasedFormattedLineNumber = editorLocation.lineNumber + 1;
+        const oneBasedFormattedColumnNumber = editorLocation.columnNumber + 1;
+        let columnData = editorProfileMap.get(oneBasedFormattedLineNumber);
+        if (!columnData) {
+          columnData = new Map();
+          editorProfileMap.set(oneBasedFormattedLineNumber, columnData);
+        }
+        columnData.set(oneBasedFormattedColumnNumber, (columnData.get(oneBasedFormattedColumnNumber) || 0) + data);
+      }
+    }
+    return editorProfileMap;
   }
 
   override editorExtension(): CodeMirror.Extension {

front_end/panels/sources/UISourceCodeFrame.ts

@@ -238,7 +238,6 @@ export class UISourceCodeFrame extends Common.ObjectWrapper
   }
 
   override async setContent(content: string): Promise<void> {
-    this.#uiSourceCode.formatChanged(this.formattedMap);
     this.disposePlugins();
     this.loadPlugins();
     await super.setContent(content);