[cleanup] Remove unused shouldFormatDiff option.

All call sites (even in unit tests) pass `true` for this option, so we
can as well simply remove it all-together.

Bug: 393244410, 40784389, 40803732, 40694280
Change-Id: Ic33ac3831b27916704f9b3913f25d5f49c7123d4
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6218359
Auto-Submit: Benedikt Meurer <[email protected]>
Commit-Queue: Benedikt Meurer <[email protected]>
Reviewed-by: Alex Rudenko <[email protected]>
Commit-Queue: Alex Rudenko <[email protected]>

Author: bmeurer

front_end/models/workspace_diff/WorkspaceDiff.test.ts

@@ -38,7 +38,7 @@ describeWithEnvironment('UISourceCodeDiff', () => {
     uiSourceCode.setWorkingCopyGetter(() => 'const data={modified:true,original:false}');
 
     const uiSourceCodeDiff = new WorkspaceDiff.WorkspaceDiff.UISourceCodeDiff(uiSourceCode);
-    const {diff, formattedCurrentMapping} = (await uiSourceCodeDiff.requestDiff({shouldFormatDiff: true}))!;
+    const {diff, formattedCurrentMapping} = (await uiSourceCodeDiff.requestDiff())!;
     assert.deepEqual(diff, [
       {0: 0, 1: ['const data = {']},
       {0: -1, 1: ['    original: true']},

front_end/models/workspace_diff/WorkspaceDiff.ts

@@ -10,10 +10,6 @@ import * as Persistence from '../persistence/persistence.js';
 import * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
 
-interface DiffRequestOptions {
-  shouldFormatDiff: boolean;
-}
-
 interface DiffResponse {
   diff: Diff.Diff.DiffArray;
   formattedCurrentMapping?: FormatterModule.ScriptFormatter.FormatterSourceMapping;
@@ -40,9 +36,8 @@ export class WorkspaceDiffImpl extends Common.ObjectWrapper.ObjectWrapper<EventT
     workspace.uiSourceCodes().forEach(this.updateModifiedState.bind(this));
   }
 
-  requestDiff(uiSourceCode: Workspace.UISourceCode.UISourceCode, diffRequestOptions: DiffRequestOptions):
-      Promise<DiffResponse|null> {
-    return this.uiSourceCodeDiff(uiSourceCode).requestDiff(diffRequestOptions);
+  requestDiff(uiSourceCode: Workspace.UISourceCode.UISourceCode): Promise<DiffResponse|null> {
+    return this.uiSourceCodeDiff(uiSourceCode).requestDiff();
   }
 
   subscribeToDiffChange(uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: () => void, thisObj?: Object):
@@ -224,9 +219,9 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourc
     }
   }
 
-  requestDiff(diffRequestOptions: DiffRequestOptions): Promise<DiffResponse|null> {
+  requestDiff(): Promise<DiffResponse|null> {
     if (!this.requestDiffPromise) {
-      this.requestDiffPromise = this.innerRequestDiff(diffRequestOptions);
+      this.requestDiffPromise = this.innerRequestDiff();
     }
     return this.requestDiffPromise;
   }
@@ -246,7 +241,7 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourc
     return content.asDeferedContent().content;
   }
 
-  private async innerRequestDiff({shouldFormatDiff}: DiffRequestOptions): Promise<DiffResponse|null> {
+  private async innerRequestDiff(): Promise<DiffResponse|null> {
     if (this.dispose) {
       return null;
     }
@@ -276,19 +271,13 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourc
       return null;
     }
 
-    if (current === null || baseline === null) {
-      return null;
-    }
-    let formattedCurrentMapping;
-    if (shouldFormatDiff) {
-      baseline = (await FormatterModule.ScriptFormatter.format(
-                      this.uiSourceCode.contentType(), this.uiSourceCode.mimeType(), baseline))
-                     .formattedContent;
-      const formatCurrentResult = await FormatterModule.ScriptFormatter.format(
-          this.uiSourceCode.contentType(), this.uiSourceCode.mimeType(), current);
-      current = formatCurrentResult.formattedContent;
-      formattedCurrentMapping = formatCurrentResult.formattedMapping;
-    }
+    baseline = (await FormatterModule.ScriptFormatter.format(
+                    this.uiSourceCode.contentType(), this.uiSourceCode.mimeType(), baseline))
+                   .formattedContent;
+    const formatCurrentResult = await FormatterModule.ScriptFormatter.format(
+        this.uiSourceCode.contentType(), this.uiSourceCode.mimeType(), current);
+    current = formatCurrentResult.formattedContent;
+    const formattedCurrentMapping = formatCurrentResult.formattedMapping;
     const reNewline = /\r\n?|\n/;
     const diff = Diff.Diff.DiffWrapper.lineDiff(baseline.split(reNewline), current.split(reNewline));
     return {

front_end/panels/changes/ChangesView.ts

@@ -144,7 +144,7 @@ export class ChangesView extends UI.Widget.VBox {
     if (!uiSourceCode) {
       return;
     }
-    const diffResponse = await this.workspaceDiff.requestDiff(uiSourceCode, {shouldFormatDiff: true});
+    const diffResponse = await this.workspaceDiff.requestDiff(uiSourceCode);
     // Diff array with real diff will contain at least 2 lines.
     if (!diffResponse || diffResponse?.diff.length < 2) {
       return;
@@ -226,7 +226,7 @@ export class ChangesView extends UI.Widget.VBox {
       this.hideDiff(i18nString(UIStrings.noTextualDiff), i18nString(UIStrings.binaryDataDescription));
       return;
     }
-    const diffResponse = await this.workspaceDiff.requestDiff(uiSourceCode, {shouldFormatDiff: true});
+    const diffResponse = await this.workspaceDiff.requestDiff(uiSourceCode);
     if (this.selectedUISourceCode !== uiSourceCode) {
       return;
     }

front_end/panels/elements/StylesSidebarPane.ts

@@ -1550,8 +1550,7 @@ export class StylesSidebarPane extends Common.ObjectWrapper.eventMixin<EventType
     if (!changeTracker) {
       return;
     }
-    const diffResponse =
-        await WorkspaceDiff.WorkspaceDiff.workspaceDiff().requestDiff(uiSourceCode, {shouldFormatDiff: true});
+    const diffResponse = await WorkspaceDiff.WorkspaceDiff.workspaceDiff().requestDiff(uiSourceCode);
     const changedLines = new Set<number>();
     changeTracker.changedLines = changedLines;
     if (!diffResponse) {
@@ -1570,8 +1569,7 @@ export class StylesSidebarPane extends Common.ObjectWrapper.eventMixin<EventType
   async getFormattedChanges(): Promise<string> {
     let allChanges = '';
     for (const [url, {uiSourceCode}] of this.#urlToChangeTracker) {
-      const diffResponse =
-          await WorkspaceDiff.WorkspaceDiff.workspaceDiff().requestDiff(uiSourceCode, {shouldFormatDiff: true});
+      const diffResponse = await WorkspaceDiff.WorkspaceDiff.workspaceDiff().requestDiff(uiSourceCode);
       // Diff array with real diff will contain at least 2 lines.
       if (!diffResponse || diffResponse?.diff.length < 2) {
         continue;