Runnable (final @NotNull List<? extends FineMergeLineFragment> fragments, @Nullable FoldingModelSupport.Data foldingState) { return () -> { myFoldingModel.updateContext(myRequest, getFoldingModelSettings()); clearDiffPresentation(); resetChangeCounters(); for (FineMergeLineFragment fragment : fragments) { MergeConflictType conflictType = fragment.getConflictType(); MergeInnerDifferences innerFragments = fragment.getInnerFragments(); SimpleThreesideDiffChange change = new SimpleThreesideDiffChange(fragment, conflictType, innerFragments, this); myDiffChanges.add(change); onChangeAdded(change); } myFoldingModel.install(foldingState, myRequest, getFoldingModelSettings()); myInitialScrollHelper.onRediff(); myContentPanel.repaintDividers(); myStatusPanel.update(); }; }