chrome-devtools-frontend 1.0.941095 → 1.0.943017

package/front_end/ui/legacy/components/source_frame/ResourceSourceFrame.ts

@@ -35,6 +35,7 @@ import * as i18n from '../../../../core/i18n/i18n.js';
 import type * as TextUtils from '../../../../models/text_utils/text_utils.js';
 import * as UI from '../../legacy.js';
 
+import type {SourceFrameOptions} from './SourceFrame.js';
 import {SourceFrameImpl} from './SourceFrame.js';
 
 const UIStrings = {
@@ -50,40 +51,44 @@ export class ResourceSourceFrame extends SourceFrameImpl {
   private readonly resourceInternal: TextUtils.ContentProvider.ContentProvider;
 
   constructor(
-      resource: TextUtils.ContentProvider.ContentProvider, autoPrettyPrint?: boolean,
-      codeMirrorOptions?: UI.TextEditor.Options) {
-    super(() => resource.requestContent(), codeMirrorOptions);
+      resource: TextUtils.ContentProvider.ContentProvider, private readonly givenContentType: string,
+      options?: SourceFrameOptions) {
+    super(() => resource.requestContent(), options);
     this.resourceInternal = resource;
   }
 
   static createSearchableView(
-      resource: TextUtils.ContentProvider.ContentProvider, highlighterType: string,
+      resource: TextUtils.ContentProvider.ContentProvider, contentType: string,
       autoPrettyPrint?: boolean): UI.Widget.Widget {
-    return new SearchableContainer(resource, highlighterType, autoPrettyPrint);
+    return new SearchableContainer(resource, contentType, autoPrettyPrint);
+  }
+
+  protected getContentType(): string {
+    return this.givenContentType;
   }
 
   get resource(): TextUtils.ContentProvider.ContentProvider {
     return this.resourceInternal;
   }
 
-  populateTextAreaContextMenu(contextMenu: UI.ContextMenu.ContextMenu, _lineNumber: number, _columnNumber: number):
-      Promise<void> {
+  protected populateTextAreaContextMenu(
+      contextMenu: UI.ContextMenu.ContextMenu, lineNumber: number, columnNumber: number): void {
+    super.populateTextAreaContextMenu(contextMenu, lineNumber, columnNumber);
     contextMenu.appendApplicableItems(this.resourceInternal);
-    return Promise.resolve();
   }
 }
 
 export class SearchableContainer extends UI.Widget.VBox {
   private readonly sourceFrame: ResourceSourceFrame;
 
-  constructor(resource: TextUtils.ContentProvider.ContentProvider, highlighterType: string, autoPrettyPrint?: boolean) {
+  constructor(resource: TextUtils.ContentProvider.ContentProvider, contentType: string, autoPrettyPrint?: boolean) {
     super(true);
+    // eslint-disable-next-line no-restricted-syntax -- Should import styles https://crbug.com/1106746
     this.registerRequiredCSS('ui/legacy/components/source_frame/resourceSourceFrame.css');
-    const sourceFrame = new ResourceSourceFrame(resource, autoPrettyPrint);
+    const sourceFrame = new ResourceSourceFrame(resource, contentType);
     this.sourceFrame = sourceFrame;
-    sourceFrame.setHighlighterType(highlighterType);
-    const canPrettyPrint = sourceFrame.resource.contentType().isDocumentOrScriptOrStyleSheet() ||
-        sourceFrame.highlighterType() === 'application/json';
+    const canPrettyPrint =
+        sourceFrame.resource.contentType().isDocumentOrScriptOrStyleSheet() || contentType === 'application/json';
     sourceFrame.setCanPrettyPrint(canPrettyPrint, autoPrettyPrint);
     const searchableView = new UI.SearchableView.SearchableView(sourceFrame, sourceFrame);
     searchableView.element.classList.add('searchable-view');
@@ -99,6 +104,6 @@ export class SearchableContainer extends UI.Widget.VBox {
   }
 
   async revealPosition(lineNumber: number, columnNumber?: number): Promise<void> {
-    this.sourceFrame.revealPosition(lineNumber, columnNumber, true);
+    this.sourceFrame.revealPosition({lineNumber, columnNumber}, true);
   }
 }