Implement expanding / shrinking skipped lines

Change-Id: I6921b7a39288f6a9747574b1a8e75d571f4723ce
Reviewed-by: hjk <hjk121@nokiamail.com>

src/plugins/diffeditor/diffeditorwidget.cpp

@@ -88,6 +88,7 @@ public:
     void clearLineNumbers();
     void clearSkippedLines() { m_skippedLines.clear(); }
     void clearSeparators() { m_separators.clear(); }
+    QTextBlock firstVisibleBlock() const { return SnippetEditorWidget::firstVisibleBlock(); }
 
 protected:
     virtual int extraAreaWidth(int *markWidthPtr = 0) const { return BaseTextEditorWidget::extraAreaWidth(markWidthPtr); }
@@ -95,6 +96,7 @@ protected:
     virtual QString lineNumber(int blockNumber) const;
     virtual int lineNumberDigits() const;
     virtual bool selectionVisible(int blockNumber) const;
+    virtual bool replacementVisible(int blockNumber) const;
     virtual void paintEvent(QPaintEvent *e);
     virtual void scrollContentsBy(int dx, int dy);
 
@@ -103,7 +105,7 @@ private:
     int m_lineNumberDigits;
     // block number, skipped lines
     QMap<int, int> m_skippedLines;
-    // block number, separator
+    // block number, separator. Separator used as lines alignment and inside skipped lines
     QMap<int, bool> m_separators;
 };
 
@@ -111,6 +113,7 @@ DiffViewEditorWidget::DiffViewEditorWidget(QWidget *parent)
     : SnippetEditorWidget(parent), m_lineNumberDigits(1)
 {
     setLineNumbersVisible(true);
+    setCodeFoldingSupported(true);
     setFrameStyle(QFrame::NoFrame);
 }
 
@@ -129,6 +132,11 @@ bool DiffViewEditorWidget::selectionVisible(int blockNumber) const
     return !m_separators.value(blockNumber, false);
 }
 
+bool DiffViewEditorWidget::replacementVisible(int blockNumber) const
+{
+    return m_skippedLines.value(blockNumber);
+}
+
 void DiffViewEditorWidget::setLineNumber(int blockNumber, const QString &lineNumber)
 {
     m_lineNumbers.insert(blockNumber, lineNumber);
@@ -196,7 +204,8 @@ void DiffViewEditorWidget::paintEvent(QPaintEvent *e)
 DiffEditorWidget::DiffEditorWidget(QWidget *parent)
     : QWidget(parent),
       m_contextLinesNumber(1),
-      m_ignoreWhitespaces(true)
+      m_ignoreWhitespaces(true),
+      m_foldingBlocker(false)
 {
     TextEditor::TextEditorSettings *settings = TextEditorSettings::instance();
 
@@ -219,12 +228,16 @@ DiffEditorWidget::DiffEditorWidget(QWidget *parent)
             this, SLOT(leftSliderChanged()));
     connect(m_leftEditor, SIGNAL(cursorPositionChanged()),
             this, SLOT(leftSliderChanged()));
+    connect(m_leftEditor->document()->documentLayout(), SIGNAL(documentSizeChanged(QSizeF)),
+            this, SLOT(leftDocumentSizeChanged()));
     connect(m_rightEditor->verticalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(rightSliderChanged()));
     connect(m_rightEditor->verticalScrollBar(), SIGNAL(actionTriggered(int)),
             this, SLOT(rightSliderChanged()));
     connect(m_rightEditor, SIGNAL(cursorPositionChanged()),
             this, SLOT(rightSliderChanged()));
+    connect(m_rightEditor->document()->documentLayout(), SIGNAL(documentSizeChanged(QSizeF)),
+            this, SLOT(rightDocumentSizeChanged()));
 
     m_splitter = new QSplitter(this);
     m_splitter->addWidget(m_leftEditor);
@@ -586,7 +599,7 @@ FileData DiffEditorWidget::calculateContextData(const ChunkData &originalData) c
     if (m_contextLinesNumber < 0)
         return FileData(originalData);
 
-    const int joinChunkThreshold = 0;
+    const int joinChunkThreshold = 1;
 
     FileData fileData;
     QMap<int, bool> hiddenRows;
@@ -760,19 +773,30 @@ void DiffEditorWidget::showDiff()
             blockNumber++;
             QTextBlock leftBlock = m_leftEditor->document()->findBlockByNumber(blockNumber);
             for (int j = 0; j < chunkData.rows.count(); j++) {
-                leftBlock.setVisible(false);
+                TextEditor::BaseTextDocumentLayout::setFoldingIndent(leftBlock, 1);
-                leftBlock.setLineCount(0);
                 leftBlock = leftBlock.next();
             }
             QTextBlock rightBlock = m_rightEditor->document()->findBlockByNumber(blockNumber);
             for (int j = 0; j < chunkData.rows.count(); j++) {
-                rightBlock.setVisible(false);
+                TextEditor::BaseTextDocumentLayout::setFoldingIndent(rightBlock, 1);
-                rightBlock.setLineCount(0);
                 rightBlock = rightBlock.next();
             }
         }
         blockNumber += chunkData.rows.count();
     }
+    blockNumber = 0;
+    for (int i = 0; i < m_contextFileData.chunks.count(); i++) {
+        ChunkData chunkData = m_contextFileData.chunks.at(i);
+        if (!chunkData.alwaysShown) {
+            QTextBlock leftBlock = m_leftEditor->document()->findBlockByNumber(blockNumber);
+            TextEditor::BaseTextDocumentLayout::doFoldOrUnfold(leftBlock, false);
+            QTextBlock rightBlock = m_rightEditor->document()->findBlockByNumber(blockNumber);
+            TextEditor::BaseTextDocumentLayout::doFoldOrUnfold(rightBlock, false);
+            blockNumber++;
+        }
+        blockNumber += chunkData.rows.count();
+    }
+    m_foldingBlocker = true;
     BaseTextDocumentLayout *leftLayout = qobject_cast<BaseTextDocumentLayout *>(m_leftEditor->document()->documentLayout());
     if (leftLayout) {
         leftLayout->requestUpdate();
@@ -783,6 +807,7 @@ void DiffEditorWidget::showDiff()
         rightLayout->requestUpdate();
         rightLayout->emitDocumentSizeChanged();
     }
+    m_foldingBlocker = false;
 
 //    int ela5 = time.elapsed();
 
@@ -959,6 +984,99 @@ void DiffEditorWidget::rightSliderChanged()
     m_leftEditor->verticalScrollBar()->setValue(m_rightEditor->verticalScrollBar()->value());
 }
 
+void DiffEditorWidget::leftDocumentSizeChanged()
+{
+    synchronizeFoldings(m_leftEditor, m_rightEditor);
+}
+
+void DiffEditorWidget::rightDocumentSizeChanged()
+{
+    synchronizeFoldings(m_rightEditor, m_leftEditor);
+}
+
+void DiffEditorWidget::synchronizeFoldings(DiffViewEditorWidget *source, DiffViewEditorWidget *destination)
+{
+    if (m_foldingBlocker)
+        return;
+
+    m_foldingBlocker = true;
+    QTextBlock sourceBlock = source->document()->firstBlock();
+    QTextBlock destinationBlock = destination->document()->firstBlock();
+    while (sourceBlock.isValid() && destinationBlock.isValid()) {
+        if (TextEditor::BaseTextDocumentLayout::canFold(sourceBlock)) {
+            const bool isSourceFolded = TextEditor::BaseTextDocumentLayout::isFolded(sourceBlock);
+            const bool isDestinationFolded = TextEditor::BaseTextDocumentLayout::isFolded(destinationBlock);
+            if (isSourceFolded != isDestinationFolded) {
+                if (isSourceFolded) { // we fold the destination
+                    QTextBlock previousSource = sourceBlock.previous(); // skippedLines
+                    QTextBlock previousDestination = destinationBlock.previous(); // skippedLines
+                    QTextBlock firstVisibleDestinationBlock = destination->firstVisibleBlock();
+                    QTextBlock firstDestinationBlock = destination->document()->firstBlock();
+                    TextEditor::BaseTextDocumentLayout::doFoldOrUnfold(destinationBlock, !isSourceFolded);
+                    TextEditor::BaseTextDocumentLayout::setFoldingIndent(sourceBlock, 1);
+                    TextEditor::BaseTextDocumentLayout::setFoldingIndent(destinationBlock, 1);
+                    previousSource.setVisible(true);
+                    previousSource.setLineCount(1);
+                    previousDestination.setVisible(true);
+                    previousDestination.setLineCount(1);
+                    sourceBlock.setVisible(false);
+                    sourceBlock.setLineCount(0);
+                    destinationBlock.setVisible(false);
+                    destinationBlock.setLineCount(0);
+                    TextEditor::BaseTextDocumentLayout::setFolded(previousSource, true);
+                    TextEditor::BaseTextDocumentLayout::setFolded(previousDestination, true);
+
+                    if (firstVisibleDestinationBlock == destinationBlock) {
+                        /*
+                        The following hack is completely crazy. That's the only way to scroll 1 line up
+                        in case destinationBlock was the top visible block.
+                        There is no need to scroll the source since this is in sync anyway
+                        (leftSliderChanged(), rightSliderChanged())
+                        */
+                        destination->verticalScrollBar()->setValue(destination->verticalScrollBar()->value() - 1);
+                        destination->verticalScrollBar()->setValue(destination->verticalScrollBar()->value() + 1);
+                        if (firstVisibleDestinationBlock.previous() == firstDestinationBlock) {
+                            /*
+                            Even more crazy case: the destinationBlock was the first top visible block.
+                            */
+                            destination->verticalScrollBar()->setValue(0);
+                        }
+                    }
+                } else { // we unfold the destination
+                    QTextBlock nextSource = sourceBlock.next();
+                    QTextBlock nextDestination = destinationBlock.next();
+                    TextEditor::BaseTextDocumentLayout::doFoldOrUnfold(destinationBlock, !isSourceFolded);
+                    TextEditor::BaseTextDocumentLayout::setFoldingIndent(nextSource, 0);
+                    TextEditor::BaseTextDocumentLayout::setFoldingIndent(nextDestination, 0);
+                    sourceBlock.setVisible(false);
+                    sourceBlock.setLineCount(0);
+                    destinationBlock.setVisible(false);
+                    destinationBlock.setLineCount(0);
+                    TextEditor::BaseTextDocumentLayout::setFolded(nextSource, false);
+                    TextEditor::BaseTextDocumentLayout::setFolded(nextDestination, false);
+                }
+                break; // only one should be synchronized
+            }
+        }
+
+        sourceBlock = sourceBlock.next();
+        destinationBlock = destinationBlock.next();
+    }
+
+    BaseTextDocumentLayout *sourceLayout = qobject_cast<BaseTextDocumentLayout *>(source->document()->documentLayout());
+    if (sourceLayout) {
+        sourceLayout->requestUpdate();
+        sourceLayout->emitDocumentSizeChanged();
+    }
+    source->updateFoldingHighlight(source->mapFromGlobal(QCursor::pos()));
+
+    BaseTextDocumentLayout *destinationLayout = qobject_cast<BaseTextDocumentLayout *>(destination->document()->documentLayout());
+    if (destinationLayout) {
+        destinationLayout->requestUpdate();
+        destinationLayout->emitDocumentSizeChanged();
+    }
+    m_foldingBlocker = false;
+}
 
 
 } // namespace DiffEditor

src/plugins/diffeditor/diffeditorwidget.h

@@ -124,6 +124,8 @@ protected:
 private slots:
     void leftSliderChanged();
     void rightSliderChanged();
+    void leftDocumentSizeChanged();
+    void rightDocumentSizeChanged();
 
 private:
     bool isWhitespace(const QChar &c) const;
@@ -136,6 +138,7 @@ private:
     ChunkData calculateOriginalData(const QList<Diff> &diffList) const;
     FileData calculateContextData(const ChunkData &originalData) const;
     void showDiff();
+    void synchronizeFoldings(DiffViewEditorWidget *source, DiffViewEditorWidget *destination);
 
     DiffViewEditorWidget *m_leftEditor;
     DiffViewEditorWidget *m_rightEditor;
@@ -147,6 +150,8 @@ private:
 
     ChunkData m_originalChunkData;
     FileData m_contextFileData;
+
+    bool m_foldingBlocker;
 };
 
 } // namespace DiffEditor

src/plugins/texteditor/basetexteditor.cpp

@@ -2745,7 +2745,7 @@ QTextBlock BaseTextEditorWidget::foldedBlockAt(const QPoint &pos, QRect *box) co
 
     while (block.isValid() && top <= viewportHeight) {
         QTextBlock nextBlock = block.next();
-        if (block.isVisible() && bottom >= 0) {
+        if (block.isVisible() && bottom >= 0 && replacementVisible(block.blockNumber())) {
             if (nextBlock.isValid() && !nextBlock.isVisible()) {
                 QTextLayout *layout = block.layout();
                 QTextLine line = layout->lineAt(layout->lineCount()-1);
@@ -3532,7 +3532,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e)
                 }
             }
 
-            if (nextBlock.isValid() && !nextBlock.isVisible()) {
+            if (nextBlock.isValid() && !nextBlock.isVisible() && replacementVisible(block.blockNumber())) {
 
                 bool selectThis = (hasSelection
                                    && nextBlock.position() >= selectionStart
@@ -4408,6 +4408,28 @@ void BaseTextEditorWidget::extraAreaContextMenuEvent(QContextMenuEvent *e)
     }
 }
 
+void BaseTextEditorWidget::updateFoldingHighlight(const QPoint &pos)
+{
+    if (!d->m_codeFoldingVisible)
+        return;
+
+    QTextCursor cursor = cursorForPosition(QPoint(0, pos.y()));
+
+    // Update which folder marker is highlighted
+    const int highlightBlockNumber = d->extraAreaHighlightFoldedBlockNumber;
+    d->extraAreaHighlightFoldedBlockNumber = -1;
+
+    if (pos.x() > extraArea()->width() - foldBoxWidth(fontMetrics())) {
+        d->extraAreaHighlightFoldedBlockNumber = cursor.blockNumber();
+    } else if (d->m_displaySettings.m_highlightBlocks) {
+        QTextCursor cursor = textCursor();
+        d->extraAreaHighlightFoldedBlockNumber = cursor.blockNumber();
+    }
+
+    if (highlightBlockNumber != d->extraAreaHighlightFoldedBlockNumber)
+        d->m_highlightBlocksTimer->start(d->m_highlightBlocksInfo.isEmpty() ? 120 : 0);
+}
+
 void BaseTextEditorWidget::extraAreaMouseEvent(QMouseEvent *e)
 {
     QTextCursor cursor = cursorForPosition(QPoint(0, e->pos().y()));
@@ -4417,21 +4439,9 @@ void BaseTextEditorWidget::extraAreaMouseEvent(QMouseEvent *e)
     const bool inMarkArea = e->pos().x() <= markWidth && e->pos().x() >= 0;
 
     if (d->m_codeFoldingVisible
-        && e->type() == QEvent::MouseMove && e->buttons() == 0) { // mouse tracking
+            && e->type() == QEvent::MouseMove && e->buttons() == 0) { // mouse tracking
-        // Update which folder marker is highlighted
+        updateFoldingHighlight(e->pos());
-        const int highlightBlockNumber = d->extraAreaHighlightFoldedBlockNumber;
+    }
-        d->extraAreaHighlightFoldedBlockNumber = -1;
-
-        if (e->pos().x() > extraArea()->width() - foldBoxWidth(fontMetrics())) {
-            d->extraAreaHighlightFoldedBlockNumber = cursor.blockNumber();
-        } else if (d->m_displaySettings.m_highlightBlocks) {
-            QTextCursor cursor = textCursor();
-            d->extraAreaHighlightFoldedBlockNumber = cursor.blockNumber();
-        }
-
-        if (highlightBlockNumber != d->extraAreaHighlightFoldedBlockNumber)
-            d->m_highlightBlocksTimer->start(d->m_highlightBlocksInfo.isEmpty() ? 120 : 0);
-        }
 
     // Set whether the mouse cursor is a hand or normal arrow
     if (e->type() == QEvent::MouseMove) {
@@ -6199,6 +6209,13 @@ int BaseTextEditorWidget::lineNumberDigits() const
 
 bool BaseTextEditorWidget::selectionVisible(int blockNumber) const
 {
+    Q_UNUSED(blockNumber)
+    return true;
+}
+
+bool BaseTextEditorWidget::replacementVisible(int blockNumber) const
+{
+    Q_UNUSED(blockNumber)
     return true;
 }
 

src/plugins/texteditor/basetexteditor.h

@@ -362,7 +362,7 @@ protected:
     virtual int lineNumberTopPositionOffset(int blockNumber) const;
     virtual int lineNumberDigits() const;
     virtual bool selectionVisible(int blockNumber) const;
-
+    virtual bool replacementVisible(int blockNumber) const;
     static QString msgTextTooLarge(quint64 size);
 
 private:
@@ -404,6 +404,7 @@ public:
     virtual void extraAreaLeaveEvent(QEvent *);
     virtual void extraAreaContextMenuEvent(QContextMenuEvent *);
     virtual void extraAreaMouseEvent(QMouseEvent *);
+    void updateFoldingHighlight(const QPoint &pos);
 
     const TabSettings &tabSettings() const;
     void setLanguageSettingsId(Core::Id settingsId);