chrome-devtools-frontend 1.0.941208 → 1.0.943182

package/front_end/panels/sources/SourcesPanel.ts

@@ -481,7 +481,8 @@ export class SourcesPanel extends UI.Panel.Panel implements UI.ContextMenu.Provi
     } else {
       this.showEditor();
     }
-    this.sourcesViewInternal.showSourceLocation(uiSourceCode, lineNumber, columnNumber, omitFocus);
+    this.sourcesViewInternal.showSourceLocation(
+        uiSourceCode, lineNumber === undefined ? undefined : {lineNumber, columnNumber}, omitFocus);
   }
 
   private showEditor(): void {
@@ -534,8 +535,7 @@ export class SourcesPanel extends UI.Panel.Panel implements UI.ContextMenu.Provi
     if (window.performance.now() - this.lastModificationTime < lastModificationTimeout) {
       return;
     }
-    this.sourcesViewInternal.showSourceLocation(
-        uiLocation.uiSourceCode, uiLocation.lineNumber, uiLocation.columnNumber, undefined, true);
+    this.sourcesViewInternal.showSourceLocation(uiLocation.uiSourceCode, uiLocation, undefined, true);
   }
 
   private lastModificationTimeoutPassedForTest(): void {
@@ -825,7 +825,7 @@ export class SourcesPanel extends UI.Panel.Panel implements UI.ContextMenu.Provi
     if (!(target instanceof UISourceCodeFrame)) {
       return;
     }
-    if (target.uiSourceCode().contentType().isFromSourceMap() || target.textEditor.selection().isEmpty()) {
+    if (target.uiSourceCode().contentType().isFromSourceMap() || target.textEditor.state.selection.main.empty) {
       return;
     }
     contextMenu.debugSection().appendAction('debugger.evaluate-selection');
@@ -1312,7 +1312,8 @@ export class DebuggingActionDelegate implements UI.ActionRegistration.ActionDele
       case 'debugger.evaluate-selection': {
         const frame = UI.Context.Context.instance().flavor(UISourceCodeFrame);
         if (frame) {
-          let text = frame.textEditor.text(frame.textEditor.selection());
+          const {state: editorState} = frame.textEditor;
+          let text = editorState.sliceDoc(editorState.selection.main.from, editorState.selection.main.to);
           const executionContext = UI.Context.Context.instance().flavor(SDK.RuntimeModel.ExecutionContext);
           if (executionContext) {
             const message = SDK.ConsoleModel.ConsoleModel.instance().addCommandMessage(executionContext, text);

package/front_end/panels/sources/SourcesView.ts

@@ -84,7 +84,7 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
     this.editorContainer.addEventListener(TabbedEditorContainerEvents.EditorSelected, this.editorSelected, this);
     this.editorContainer.addEventListener(TabbedEditorContainerEvents.EditorClosed, this.editorClosed, this);
 
-    this.historyManager = new EditingLocationHistoryManager(this, this.currentSourceFrame.bind(this));
+    this.historyManager = new EditingLocationHistoryManager(this);
 
     this.toolbarContainerElementInternal = this.element.createChild('div', 'sources-toolbar');
     if (!Root.Runtime.experiments.isEnabled('sourcesPrettyPrint')) {
@@ -350,15 +350,18 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
   }
 
   showSourceLocation(
-      uiSourceCode: Workspace.UISourceCode.UISourceCode, lineNumber?: number, columnNumber?: number,
+      uiSourceCode: Workspace.UISourceCode.UISourceCode, location?: {lineNumber: number, columnNumber?: number}|number,
       omitFocus?: boolean, omitHighlight?: boolean): void {
-    this.historyManager.updateCurrentState();
+    const currentFrame = this.currentSourceFrame();
+    if (currentFrame) {
+      this.historyManager.updateCurrentState(
+          currentFrame.uiSourceCode(), currentFrame.textEditor.state.selection.main.head);
+    }
     this.editorContainer.showFile(uiSourceCode);
     const currentSourceFrame = this.currentSourceFrame();
-    if (currentSourceFrame && typeof lineNumber === 'number') {
-      currentSourceFrame.revealPosition(lineNumber, columnNumber, !omitHighlight);
+    if (currentSourceFrame && location) {
+      currentSourceFrame.revealPosition(location, !omitHighlight);
     }
-    this.historyManager.pushNewState();
     const visibleView = this.visibleView();
     if (!omitFocus && visibleView) {
       visibleView.focus();
@@ -440,8 +443,7 @@ export class SourcesView extends Common.ObjectWrapper.eventMixin<EventTypes, typ
       currentSourceFrame.setSearchableView(this.searchableViewInternal);
     }
 
-    this.searchableViewInternal.setReplaceable(
-        Boolean(currentSourceFrame) && (currentSourceFrame ? currentSourceFrame.canEditSource() : false));
+    this.searchableViewInternal.setReplaceable(Boolean(currentSourceFrame?.canEditSource()));
     this.searchableViewInternal.refreshSearch();
     this.updateToolbarChangedListener();
     this.updateScriptViewToolbarItems();

package/front_end/panels/sources/TabbedEditorContainer.ts

@@ -35,6 +35,7 @@ import * as Extensions from '../../models/extensions/extensions.js';
 import * as Persistence from '../../models/persistence/persistence.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Workspace from '../../models/workspace/workspace.js';
+import type * as CodeMirror from '../../third_party/codemirror.next/codemirror.next.js';
 import * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as Snippets from '../snippets/snippets.js';
@@ -220,45 +221,48 @@ export class TabbedEditorContainer extends Common.ObjectWrapper.ObjectWrapper<Ev
     if (!this.currentView || !(this.currentView instanceof SourceFrame.SourceFrame.SourceFrameImpl)) {
       return;
     }
-    this.currentView.textEditor.addEventListener(
-        SourceFrame.SourcesTextEditor.Events.ScrollChanged, this.scrollChanged, this);
-    this.currentView.textEditor.addEventListener(
-        SourceFrame.SourcesTextEditor.Events.SelectionChanged, this.selectionChanged, this);
+    this.currentView.addEventListener(SourceFrame.SourceFrame.Events.EditorUpdate, this.onEditorUpdate, this);
+    this.currentView.addEventListener(SourceFrame.SourceFrame.Events.EditorScroll, this.onScrollChanged, this);
   }
 
   private removeViewListeners(): void {
     if (!this.currentView || !(this.currentView instanceof SourceFrame.SourceFrame.SourceFrameImpl)) {
       return;
     }
-    this.currentView.textEditor.removeEventListener(
-        SourceFrame.SourcesTextEditor.Events.ScrollChanged, this.scrollChanged, this);
-    this.currentView.textEditor.removeEventListener(
-        SourceFrame.SourcesTextEditor.Events.SelectionChanged, this.selectionChanged, this);
+    this.currentView.removeEventListener(SourceFrame.SourceFrame.Events.EditorUpdate, this.onEditorUpdate, this);
+    this.currentView.removeEventListener(SourceFrame.SourceFrame.Events.EditorScroll, this.onScrollChanged, this);
   }
 
-  private scrollChanged({data: lineNumber}: Common.EventTarget.EventTargetEvent<number>): void {
-    if (this.scrollTimer) {
-      clearTimeout(this.scrollTimer);
-    }
-    this.scrollTimer = window.setTimeout(saveHistory.bind(this), 100);
-    if (this.currentFileInternal) {
-      this.history.updateScrollLineNumber(this.currentFileInternal.url(), lineNumber);
-    }
-
-    function saveHistory(this: TabbedEditorContainer): void {
-      this.history.save(this.previouslyViewedFilesSetting);
+  private onScrollChanged(): void {
+    if (this.currentView instanceof SourceFrame.SourceFrame.SourceFrameImpl) {
+      if (this.scrollTimer) {
+        clearTimeout(this.scrollTimer);
+      }
+      this.scrollTimer = window.setTimeout(() => this.history.save(this.previouslyViewedFilesSetting), 100);
+      if (this.currentFileInternal) {
+        const {editor} = this.currentView.textEditor;
+        const topBlock = editor.blockAtHeight(editor.scrollDOM.getBoundingClientRect().top);
+        const topLine = editor.state.doc.lineAt(topBlock.from).number - 1;
+        this.history.updateScrollLineNumber(this.currentFileInternal.url(), topLine);
+      }
     }
   }
 
-  private selectionChanged({data: range}: Common.EventTarget.EventTargetEvent<TextUtils.TextRange.TextRange>): void {
-    if (this.currentFileInternal) {
-      this.history.updateSelectionRange(this.currentFileInternal.url(), range);
-    }
-    this.history.save(this.previouslyViewedFilesSetting);
+  private onEditorUpdate({data: update}: Common.EventTarget.EventTargetEvent<CodeMirror.ViewUpdate>): void {
+    if (update.docChanged || update.selectionSet) {
+      const {main} = update.state.selection;
+      const lineFrom = update.state.doc.lineAt(main.from), lineTo = update.state.doc.lineAt(main.to);
+      const range = new TextUtils.TextRange.TextRange(
+          lineFrom.number - 1, main.from - lineFrom.from, lineTo.number - 1, main.to - lineTo.from);
+      if (this.currentFileInternal) {
+        this.history.updateSelectionRange(this.currentFileInternal.url(), range);
+      }
+      this.history.save(this.previouslyViewedFilesSetting);
 
-    if (this.currentFileInternal) {
-      Extensions.ExtensionServer.ExtensionServer.instance().sourceSelectionChanged(
-          this.currentFileInternal.url(), range);
+      if (this.currentFileInternal) {
+        Extensions.ExtensionServer.ExtensionServer.instance().sourceSelectionChanged(
+            this.currentFileInternal.url(), range);
+      }
     }
   }