DevTools: Diff subsystem

third_party/WebKit/Source/devtools/front_end/source_frame/UISourceCodeFrame.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 20 matching lines @@
  */
 SourceFrame.UISourceCodeFrame = class extends SourceFrame.SourceFrame {
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   constructor(uiSourceCode) {
     super(uiSourceCode.contentURL(), workingCopy);
     this._uiSourceCode = uiSourceCode;
     this.setEditable(this._canEditSource());
 
-    if (Runtime.experiments.isEnabled('sourceDiff'))
-      this._diff = new SourceFrame.SourceCodeDiff(uiSourceCode.requestOriginalContent(), this.textEditor);
+    if (Runtime.experiments.isEnabled('sourceDiff')) {
+      this._diff =
+          new SourceFrame.SourceCodeDiff(WorkspaceDiff.UISourceCodeDiff.forUISourceCode(uiSourceCode), this.textEditor);
+    }
 
     /** @type {?UI.AutocompleteConfig} */
     this._autocompleteConfig = {isWordChar: Common.TextUtils.isWordChar};
     Common.moduleSetting('textEditorAutocompletion').addChangeListener(this._updateAutocomplete, this);
     this._updateAutocomplete();
 
     /** @type {?Persistence.PersistenceBinding} */
     this._persistenceBinding = Persistence.persistence.binding(uiSourceCode);
 
     /** @type {!Map<number, !SourceFrame.UISourceCodeFrame.RowMessageBucket>} */
@@ skipping 106 matching lines @@
 
     this._muteSourceCodeEvents = true;
     this._uiSourceCode.commitWorkingCopy();
     delete this._muteSourceCodeEvents;
   }
 
   /**
    * @override
    */
   onTextEditorContentSet() {
-    if (this._diff)
-      this._diff.updateDiffMarkersImmediately();
     super.onTextEditorContentSet();
     for (var message of this._allMessages())
       this._addMessageToSource(message);
     this._decorateAllTypes();
   }
 
   /**
    * @return {!Array<!Workspace.UISourceCode.Message>}
    */
   _allMessages() {
     return this._persistenceBinding ?
         this._persistenceBinding.network.messages().concat(this._persistenceBinding.fileSystem.messages()) :
         this._uiSourceCode.messages();
   }
 
   /**
    * @override
    * @param {!Common.TextRange} oldRange
    * @param {!Common.TextRange} newRange
    */
   onTextChanged(oldRange, newRange) {
-    if (this._diff)
-      this._diff.updateDiffMarkersWhenPossible();

[lushnikov, 2017/03/04 04:00:28]

why did these go?

[einbinder, 2017/03/07 06:03:31]

There is a DiffChanged event

     super.onTextChanged(oldRange, newRange);
     this._errorPopoverHelper.hidePopover();
     if (this._isSettingContent)
       return;
     this._muteSourceCodeEvents = true;
     if (this.textEditor.isClean())
       this._uiSourceCode.resetWorkingCopy();
     else
       this._uiSourceCode.setWorkingCopyGetter(this.textEditor.text.bind(this.textEditor));
     delete this._muteSourceCodeEvents;
@@ skipping 109 matching lines @@
       var infobar = infobars[i];
       if (!infobar)
         continue;
       this.element.insertBefore(infobar.element, this.element.children[0]);
       infobar.setParentView(this);
     }
     this.doResize();
   }
 
   dispose() {
+    if (this._diff)
+      this._diff.dispose();
     this.textEditor.dispose();
     Common.moduleSetting('textEditorAutocompletion').removeChangeListener(this._updateAutocomplete, this);
     this.detach();
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onMessageAdded(event) {
     var message = /** @type {!Workspace.UISourceCode.Message} */ (event.data);
@@ skipping 345 matching lines @@
 
 /**
  * @param {!Workspace.UISourceCode.Message} a
  * @param {!Workspace.UISourceCode.Message} b
  * @return {number}
  */
 Workspace.UISourceCode.Message.messageLevelComparator = function(a, b) {
   return Workspace.UISourceCode.Message._messageLevelPriority[a.level()] -
       Workspace.UISourceCode.Message._messageLevelPriority[b.level()];
 };