feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Do not jump to any file when in the diff header

Browse Source 
Do not jump to a file on double-click when in a diff header.

Task-number: QTCREATORBUG-4364
This commit is contained in:
Tobias Hunger
2011-04-08 10:40:59 +02:00
parent 1f99db9d8f
commit a809a0d2a6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -49,6 +49,7 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <texteditor/basetextdocumentlayout.h>
#include <texteditor/fontsettings.h> #include <texteditor/fontsettings.h>
#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorconstants.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -708,6 +709,9 @@ void VCSBaseEditorWidget::jumpToChangeFromDiff(QTextCursor cursor)
const QChar deletionIndicator = QLatin1Char('-'); const QChar deletionIndicator = QLatin1Char('-');
// find nearest change hunk // find nearest change hunk
QTextBlock block = cursor.block(); QTextBlock block = cursor.block();
if (TextEditor::BaseTextDocumentLayout::foldingIndent(block) <= 1)
/* We are in a diff header, do not jump anywhere. DiffHighlighter sets the foldingIndent for us. */
return;
for ( ; block.isValid() ; block = block.previous()) { for ( ; block.isValid() ; block = block.previous()) {
const QString line = block.text(); const QString line = block.text();
if (checkChunkLine(line, &chunkStart)) { if (checkChunkLine(line, &chunkStart)) {