chrome-devtools-frontend 1.0.925655 → 1.0.927419

package/front_end/panels/sources/GutterDiffPlugin.ts

@@ -1,282 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import * as Common from '../../core/common/common.js';
-import * as i18n from '../../core/i18n/i18n.js';
-import * as Persistence from '../../models/persistence/persistence.js';
-import * as Workspace from '../../models/workspace/workspace.js';
-import * as WorkspaceDiff from '../../models/workspace_diff/workspace_diff.js';
-import type * as Diff from '../../third_party/diff/diff.js';
-import * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js';
-import type * as TextEditor from '../../ui/legacy/components/text_editor/text_editor.js';
-import type * as UI from '../../ui/legacy/legacy.js';
-
-import {Plugin} from './Plugin.js';
-
-const UIStrings = {
-  /**
-  *@description A context menu item in the Gutter Diff Plugin of the Sources panel
-  */
-  localModifications: 'Local Modifications...',
-};
-const str_ = i18n.i18n.registerUIStrings('panels/sources/GutterDiffPlugin.ts', UIStrings);
-const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
-export class GutterDiffPlugin extends Plugin {
-  private readonly textEditor: SourceFrame.SourcesTextEditor.SourcesTextEditor;
-  private readonly uiSourceCode: Workspace.UISourceCode.UISourceCode;
-  private decorations: GutterDecoration[];
-  private readonly workspaceDiff: WorkspaceDiff.WorkspaceDiff.WorkspaceDiffImpl;
-
-  constructor(
-      textEditor: SourceFrame.SourcesTextEditor.SourcesTextEditor, uiSourceCode: Workspace.UISourceCode.UISourceCode) {
-    super();
-    this.textEditor = textEditor;
-    this.uiSourceCode = uiSourceCode;
-
-    this.decorations = [];
-    this.textEditor.installGutter(DiffGutterType, true);
-    this.workspaceDiff = WorkspaceDiff.WorkspaceDiff.workspaceDiff();
-    this.workspaceDiff.subscribeToDiffChange(this.uiSourceCode, this.update, this);
-    this.update();
-  }
-
-  static accepts(uiSourceCode: Workspace.UISourceCode.UISourceCode): boolean {
-    return uiSourceCode.project().type() === Workspace.Workspace.projectTypes.Network;
-  }
-
-  private updateDecorations(removed: GutterDecoration[], added: GutterDecoration[]): void {
-    this.textEditor.operation(operation);
-
-    function operation(): void {
-      for (const decoration of removed) {
-        decoration.remove();
-      }
-      for (const decoration of added) {
-        decoration.install();
-      }
-    }
-  }
-
-  private update(): void {
-    if (this.uiSourceCode) {
-      this.workspaceDiff.requestDiff(this.uiSourceCode).then(this.innerUpdate.bind(this));
-    } else {
-      this.innerUpdate(null);
-    }
-  }
-
-  private innerUpdate(lineDiff: Diff.Diff.DiffArray|null): void {
-    if (!lineDiff) {
-      this.updateDecorations(this.decorations, []);
-      this.decorations = [];
-      return;
-    }
-
-    const diff = SourceFrame.SourceCodeDiff.SourceCodeDiff.computeDiff(lineDiff);
-
-    const newDecorations = new Map<number, {
-      lineNumber: number,
-      type: SourceFrame.SourceCodeDiff.EditType,
-    }>();
-    for (let i = 0; i < diff.length; ++i) {
-      const diffEntry = diff[i];
-      for (let lineNumber = diffEntry.from; lineNumber < diffEntry.to; ++lineNumber) {
-        newDecorations.set(lineNumber, {lineNumber: lineNumber, type: diffEntry.type});
-      }
-    }
-
-    const decorationDiff = this.calculateDecorationsDiff(newDecorations);
-    const addedDecorations =
-        decorationDiff.added.map(entry => new GutterDecoration(this.textEditor, entry.lineNumber, entry.type));
-
-    this.decorations = decorationDiff.equal.concat(addedDecorations);
-    this.updateDecorations(decorationDiff.removed, addedDecorations);
-    this.decorationsSetForTest(newDecorations);
-  }
-
-  private decorationsByLine(): Map<number, GutterDecoration> {
-    const decorations = new Map<number, GutterDecoration>();
-    for (const decoration of this.decorations) {
-      const lineNumber = decoration.lineNumber();
-      if (lineNumber !== -1) {
-        decorations.set(lineNumber, decoration);
-      }
-    }
-    return decorations;
-  }
-
-  private calculateDecorationsDiff(decorations: Map<number, {
-    lineNumber: number,
-    type: SourceFrame.SourceCodeDiff.EditType,
-  }>): {
-    added: {
-      lineNumber: number,
-      type: SourceFrame.SourceCodeDiff.EditType,
-    }[],
-    removed: GutterDecoration[],
-    equal: GutterDecoration[],
-  } {
-    const oldDecorations = this.decorationsByLine();
-    const leftKeys = [...oldDecorations.keys()];
-    const rightKeys = [...decorations.keys()];
-    leftKeys.sort((a, b) => a - b);
-    rightKeys.sort((a, b) => a - b);
-
-    const removed = [];
-    const added = [];
-    const equal = [];
-    let leftIndex = 0;
-    let rightIndex = 0;
-    while (leftIndex < leftKeys.length && rightIndex < rightKeys.length) {
-      const leftKey = leftKeys[leftIndex];
-      const rightKey = rightKeys[rightIndex];
-      const left = oldDecorations.get(leftKey);
-      const right = decorations.get(rightKey);
-      if (!left) {
-        throw new Error(`No decoration with key ${leftKey}`);
-      }
-      if (!right) {
-        throw new Error(`No decoration with key ${rightKey}`);
-      }
-      if (leftKey === rightKey && left.type === right.type) {
-        equal.push(left);
-        ++leftIndex;
-        ++rightIndex;
-      } else if (leftKey <= rightKey) {
-        removed.push(left);
-        ++leftIndex;
-      } else {
-        added.push(right);
-        ++rightIndex;
-      }
-    }
-    while (leftIndex < leftKeys.length) {
-      const leftKey = leftKeys[leftIndex++];
-      const left = oldDecorations.get(leftKey);
-      if (!left) {
-        throw new Error(`No decoration with key ${leftKey}`);
-      }
-      removed.push(left);
-    }
-    while (rightIndex < rightKeys.length) {
-      const rightKey = rightKeys[rightIndex++];
-      const right = decorations.get(rightKey);
-      if (!right) {
-        throw new Error(`No decoration with key ${rightKey}`);
-      }
-      added.push(right);
-    }
-    return {added: added, removed: removed, equal: equal};
-  }
-
-  private decorationsSetForTest(_decorations: Map<number, {
-    lineNumber: number,
-    type: SourceFrame.SourceCodeDiff.EditType,
-  }>): void {
-  }
-
-  async populateLineGutterContextMenu(contextMenu: UI.ContextMenu.ContextMenu, _lineNumber: number): Promise<void> {
-    GutterDiffPlugin.appendRevealDiffContextMenu(contextMenu, this.uiSourceCode);
-  }
-
-  async populateTextAreaContextMenu(
-      contextMenu: UI.ContextMenu.ContextMenu, _lineNumber: number, _columnNumber: number): Promise<void> {
-    GutterDiffPlugin.appendRevealDiffContextMenu(contextMenu, this.uiSourceCode);
-  }
-
-  static appendRevealDiffContextMenu(
-      contextMenu: UI.ContextMenu.ContextMenu, uiSourceCode: Workspace.UISourceCode.UISourceCode): void {
-    if (!WorkspaceDiff.WorkspaceDiff.workspaceDiff().isUISourceCodeModified(uiSourceCode)) {
-      return;
-    }
-    contextMenu.revealSection().appendItem(i18nString(UIStrings.localModifications), () => {
-      Common.Revealer.reveal(new WorkspaceDiff.WorkspaceDiff.DiffUILocation(uiSourceCode));
-    });
-  }
-
-  dispose(): void {
-    for (const decoration of this.decorations) {
-      decoration.remove();
-    }
-    WorkspaceDiff.WorkspaceDiff.workspaceDiff().unsubscribeFromDiffChange(this.uiSourceCode, this.update, this);
-  }
-}
-
-export class GutterDecoration {
-  private readonly textEditor: SourceFrame.SourcesTextEditor.SourcesTextEditor;
-  private readonly position: TextEditor.CodeMirrorTextEditor.TextEditorPositionHandle;
-  private readonly className: string;
-  type: SourceFrame.SourceCodeDiff.EditType;
-
-  constructor(
-      textEditor: SourceFrame.SourcesTextEditor.SourcesTextEditor, lineNumber: number,
-      type: SourceFrame.SourceCodeDiff.EditType) {
-    this.textEditor = textEditor;
-    this.position = this.textEditor.textEditorPositionHandle(lineNumber, 0);
-    this.className = '';
-    if (type === SourceFrame.SourceCodeDiff.EditType.Insert) {
-      this.className = 'diff-entry-insert';
-    } else if (type === SourceFrame.SourceCodeDiff.EditType.Delete) {
-      this.className = 'diff-entry-delete';
-    } else if (type === SourceFrame.SourceCodeDiff.EditType.Modify) {
-      this.className = 'diff-entry-modify';
-    }
-    this.type = type;
-  }
-
-  lineNumber(): number {
-    const location = this.position.resolve();
-    if (!location) {
-      return -1;
-    }
-    return location.lineNumber;
-  }
-
-  install(): void {
-    const location = this.position.resolve();
-    if (!location) {
-      return;
-    }
-    const element = document.createElement('div');
-    element.classList.add('diff-marker');
-    element.textContent = '\xA0';
-    this.textEditor.setGutterDecoration(location.lineNumber, DiffGutterType, element);
-    this.textEditor.toggleLineClass(location.lineNumber, this.className, true);
-  }
-
-  remove(): void {
-    const location = this.position.resolve();
-    if (!location) {
-      return;
-    }
-    this.textEditor.setGutterDecoration(location.lineNumber, DiffGutterType, null);
-    this.textEditor.toggleLineClass(location.lineNumber, this.className, false);
-  }
-}
-
-export const DiffGutterType: string = 'CodeMirror-gutter-diff';
-
-let contextMenuProviderInstance: ContextMenuProvider;
-
-export class ContextMenuProvider implements UI.ContextMenu.Provider {
-  static instance(opts: {
-    forceNew: boolean|null,
-  } = {forceNew: null}): ContextMenuProvider {
-    const {forceNew} = opts;
-    if (!contextMenuProviderInstance || forceNew) {
-      contextMenuProviderInstance = new ContextMenuProvider();
-    }
-
-    return contextMenuProviderInstance;
-  }
-
-  appendApplicableItems(_event: Event, contextMenu: UI.ContextMenu.ContextMenu, target: Object): void {
-    let uiSourceCode: Workspace.UISourceCode.UISourceCode = (target as Workspace.UISourceCode.UISourceCode);
-    const binding = Persistence.Persistence.PersistenceImpl.instance().binding(uiSourceCode);
-    if (binding) {
-      uiSourceCode = binding.network;
-    }
-    GutterDiffPlugin.appendRevealDiffContextMenu(contextMenu, uiSourceCode);
-  }
-}

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

@@ -1,140 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import * as Diff from '../../../../third_party/diff/diff.js';
-import type * as TextEditor from '../text_editor/text_editor.js';
-import type {SourcesTextEditor} from './SourcesTextEditor.js';
-
-export class SourceCodeDiff {
-  private readonly textEditor: SourcesTextEditor;
-  private animatedLines: TextEditor.CodeMirrorTextEditor.TextEditorPositionHandle[];
-  private animationTimeout: number|null;
-  constructor(textEditor: SourcesTextEditor) {
-    this.textEditor = textEditor;
-    this.animatedLines = [];
-    this.animationTimeout = null;
-  }
-
-  highlightModifiedLines(oldContent: string|null, newContent: string|null): void {
-    if (typeof oldContent !== 'string' || typeof newContent !== 'string') {
-      return;
-    }
-
-    const diff =
-        SourceCodeDiff.computeDiff(Diff.Diff.DiffWrapper.lineDiff(oldContent.split('\n'), newContent.split('\n')));
-    const changedLines = [];
-    for (let i = 0; i < diff.length; ++i) {
-      const diffEntry = diff[i];
-      if (diffEntry.type === EditType.Delete) {
-        continue;
-      }
-      for (let lineNumber = diffEntry.from; lineNumber < diffEntry.to; ++lineNumber) {
-        const position = this.textEditor.textEditorPositionHandle(lineNumber, 0);
-        if (position) {
-          changedLines.push(position);
-        }
-      }
-    }
-    this.updateHighlightedLines(changedLines);
-    this.animationTimeout = window.setTimeout(
-        this.updateHighlightedLines.bind(this, []), 400);  // // Keep this timeout in sync with sourcesView.css.
-  }
-
-  private updateHighlightedLines(newLines: TextEditor.CodeMirrorTextEditor.TextEditorPositionHandle[]): void {
-    if (this.animationTimeout) {
-      clearTimeout(this.animationTimeout);
-    }
-    this.animationTimeout = null;
-    this.textEditor.operation(operation.bind(this));
-
-    function operation(this: SourceCodeDiff): void {
-      toggleLines.call(this, false);
-      this.animatedLines = newLines;
-      toggleLines.call(this, true);
-    }
-
-    function toggleLines(this: SourceCodeDiff, value: boolean): void {
-      for (let i = 0; i < this.animatedLines.length; ++i) {
-        const location = this.animatedLines[i].resolve();
-        if (location) {
-          this.textEditor.toggleLineClass(location.lineNumber, 'highlight-line-modification', value);
-        }
-      }
-    }
-  }
-
-  static computeDiff(diff: Diff.Diff.DiffArray): {
-    type: EditType,
-    from: number,
-    to: number,
-  }[] {
-    const result: {
-      type: EditType,
-      from: number,
-      to: number,
-    }[] = [];
-    let hasAdded = false;
-    let hasRemoved = false;
-    let blockStartLineNumber = 0;
-    let currentLineNumber = 0;
-    let isInsideBlock = false;
-    for (let i = 0; i < diff.length; ++i) {
-      const token = diff[i];
-      if (token[0] === Diff.Diff.Operation.Equal) {
-        if (isInsideBlock) {
-          flush();
-        }
-        currentLineNumber += token[1].length;
-        continue;
-      }
-
-      if (!isInsideBlock) {
-        isInsideBlock = true;
-        blockStartLineNumber = currentLineNumber;
-      }
-
-      if (token[0] === Diff.Diff.Operation.Delete) {
-        hasRemoved = true;
-      } else {
-        currentLineNumber += token[1].length;
-        hasAdded = true;
-      }
-    }
-    if (isInsideBlock) {
-      flush();
-    }
-    if (result.length > 1 && result[0].from === 0 && result[1].from === 0) {
-      const merged = {type: EditType.Modify, from: 0, to: result[1].to};
-      result.splice(0, 2, merged);
-    }
-    return result;
-
-    function flush(): void {
-      let type = EditType.Insert;
-      let from = blockStartLineNumber;
-      let to: 1|number = currentLineNumber;
-      if (hasAdded && hasRemoved) {
-        type = EditType.Modify;
-      } else if (!hasAdded && hasRemoved && from === 0 && to === 0) {
-        type = EditType.Modify;
-        to = 1;
-      } else if (!hasAdded && hasRemoved) {
-        type = EditType.Delete;
-        from -= 1;
-      }
-      result.push({type: type, from: from, to: to});
-      isInsideBlock = false;
-      hasAdded = false;
-      hasRemoved = false;
-    }
-  }
-}
-
-// TODO(crbug.com/1167717): Make this a const enum again
-// eslint-disable-next-line rulesdir/const_enum
-export enum EditType {
-  Insert = 'Insert',
-  Delete = 'Delete',
-  Modify = 'Modify',
-}