Refactoring builders [do not merge]

lib/containers/changed-file-container.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import yubikiri from 'yubikiri';
+import {CompositeDisposable} from 'event-kit';
 
 import {autobind} from '../helpers';
 import ObserveModel from '../views/observe-model';
@@ -12,6 +13,7 @@ export default class ChangedFileContainer extends React.Component {
     repository: PropTypes.object.isRequired,
     stagingStatus: PropTypes.oneOf(['staged', 'unstaged']),
     relPath: PropTypes.string.isRequired,
+    largeDiffThreshold: PropTypes.number,
 
     workspace: PropTypes.object.isRequired,
     commands: PropTypes.object.isRequired,
@@ -27,13 +29,26 @@ export default class ChangedFileContainer extends React.Component {
   constructor(props) {
     super(props);
     autobind(this, 'fetchData', 'renderWithData');
+
+    this.lastMultiFilePatch = null;
+    this.sub = new CompositeDisposable();
+
+    this.state = {renderStatusOverride: null};
   }
 
   fetchData(repository) {
     const staged = this.props.stagingStatus === 'staged';
 
+    const builder = {};
+    if (this.state.renderStatusOverride !== null) {
+      builder.renderStatusOverrides = {[this.props.relPath]: this.state.renderStatusOverride};
+    }
+    if (this.props.largeDiffThreshold !== undefined) {
+      builder.largeDiffThreshold = this.props.largeDiffThreshold;
+    }
+
     return yubikiri({
-      multiFilePatch: repository.getFilePatchForPath(this.props.relPath, {staged}),
+      multiFilePatch: repository.getFilePatchForPath(this.props.relPath, {staged, builder}),
       isPartiallyStaged: repository.isPartiallyStaged(this.props.relPath),
       hasUndoHistory: repository.hasDiscardHistory(this.props.relPath),
     });
@@ -48,6 +63,20 @@ export default class ChangedFileContainer extends React.Component {
   }
 
   renderWithData(data) {
+    const currentMultiFilePatch = data && data.multiFilePatch;
+    if (currentMultiFilePatch !== this.lastMultiFilePatch) {
+      this.sub.dispose();
+      if (currentMultiFilePatch) {
+        // Keep this component's renderStatusOverride synchronized with the FilePatch we're rendering
+        this.sub = new CompositeDisposable(
+          ...currentMultiFilePatch.getFilePatches().map(fp => fp.onDidChangeRenderStatus(() => {
+            this.setState({renderStatusOverride: fp.getRenderStatus()});
+          })),
+        );
+      }
+      this.lastMultiFilePatch = currentMultiFilePatch;
+    }
+
     if (this.props.repository.isLoading() || data === null) {
       return <LoadingView />;
     }
@@ -59,4 +88,8 @@ export default class ChangedFileContainer extends React.Component {
       />
     );
   }
+
+  componentWillUnmount() {
+    this.sub.dispose();
+  }
 }

lib/containers/commit-detail-container.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import yubikiri from 'yubikiri';
+import {CompositeDisposable} from 'event-kit';
 
 import ObserveModel from '../views/observe-model';
 import LoadingView from '../views/loading-view';
@@ -13,6 +14,13 @@ export default class CommitDetailContainer extends React.Component {
     itemType: PropTypes.func.isRequired,
   }
 
+  constructor(props) {
+    super(props);
+
+    this.lastCommit = null;
+    this.sub = new CompositeDisposable();
+  }
+
   fetchData = repository => {
     return yubikiri({
       commit: repository.getCommit(this.props.sha),
@@ -31,6 +39,19 @@ export default class CommitDetailContainer extends React.Component {
   }
 
   renderResult = data => {
+    const currentCommit = data && data.commit;
+    if (currentCommit !== this.lastCommit) {
+      this.sub.dispose();
+      if (currentCommit && currentCommit.isPresent()) {
+        this.sub = new CompositeDisposable(
+          ...currentCommit.getMultiFileDiff().getFilePatches().map(fp => fp.onDidChangeRenderStatus(() => {
+            this.forceUpdate();
+          })),
+        );
+      }
+      this.lastCommit = currentCommit;
+    }
+
     if (this.props.repository.isLoading() || data === null || !data.commit.isPresent()) {
       return <LoadingView />;
     }

lib/containers/commit-preview-container.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import yubikiri from 'yubikiri';
+import {CompositeDisposable} from 'event-kit';
 
 import ObserveModel from '../views/observe-model';
 import LoadingView from '../views/loading-view';
@@ -9,11 +10,27 @@ import CommitPreviewController from '../controllers/commit-preview-controller';
 export default class CommitPreviewContainer extends React.Component {
   static propTypes = {
     repository: PropTypes.object.isRequired,
+    largeDiffThreshold: PropTypes.number,
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.lastMultiFilePatch = null;
+    this.sub = new CompositeDisposable();
+
+    this.state = {renderStatusOverrides: {}};
   }
 
   fetchData = repository => {
+    const builder = {renderStatusOverrides: this.state.renderStatusOverrides};
+
+    if (this.props.largeDiffThreshold !== undefined) {
+      builder.largeDiffThreshold = this.props.largeDiffThreshold;
+    }
+
     return yubikiri({
-      multiFilePatch: repository.getStagedChangesPatch(),
+      multiFilePatch: repository.getStagedChangesPatch({builder}),
     });
   }
 
@@ -26,6 +43,26 @@ export default class CommitPreviewContainer extends React.Component {
   }
 
   renderResult = data => {
+    const currentMultiFilePatch = data && data.multiFilePatch;
+    if (currentMultiFilePatch !== this.lastMultiFilePatch) {
+      this.sub.dispose();
+      if (currentMultiFilePatch) {
+        this.sub = new CompositeDisposable(
+          ...currentMultiFilePatch.getFilePatches().map(fp => fp.onDidChangeRenderStatus(() => {
+            this.setState(prevState => {
+              return {
+                renderStatusOverrides: {
+                  ...prevState.renderStatusOverrides,
+                  [fp.getPath()]: fp.getRenderStatus(),
+                },
+              };
+            });
+          })),
+        );
+      }
+      this.lastMultiFilePatch = currentMultiFilePatch;
+    }
+
     if (this.props.repository.isLoading() || data === null) {
       return <LoadingView />;
     }

lib/controllers/commit-detail-controller.js

@@ -16,7 +16,7 @@ export default class CommitDetailController extends React.Component {
     this.state = {
       messageCollapsible: this.props.commit.isBodyLong(),
       messageOpen: !this.props.commit.isBodyLong(),
-    };
+    }
   }
 
   render() {

lib/controllers/pr-reviews-controller.js

@@ -19,6 +19,7 @@ export default class PullRequestReviewsController extends React.Component {
       ),
     }),
     getBufferRowForDiffPosition: PropTypes.func.isRequired,
+    isPatchTooLargeOrCollapsed: PropTypes.func.isRequired,
   }
 
   constructor(props) {