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

Git: Use correct line numbers in limited range blame

Browse Source 
Change-Id: I12f6fc77b532e5b01f2da6c1c1ff847445447c70
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-06-13 20:34:27 +03:00
committed by Orgad Shaneh
parent 3845c833fc
commit 3f879c0c79
3 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/git/gitplugin.cpp
View File

@@ -670,6 +670,7 @@ void GitPlugin::blameFile()
QTC_ASSERT(state.hasFile(), return);
const int lineNumber = VcsBaseEditor::lineNumberOfCurrentEditor(state.currentFile());
QStringList extraOptions;
int firstLine = -1;
if (BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor()) {
QTextCursor cursor = textEditor->textCursor();
if (cursor.hasSelection()) {
@@ -677,15 +678,25 @@ void GitPlugin::blameFile()
int selectionStart = cursor.selectionStart();
int selectionEnd = cursor.selectionEnd();
cursor.setPosition(selectionStart);
argument += QString::number(cursor.blockNumber() + 1) + ',';
const int startBlock = cursor.blockNumber();
firstLine = startBlock + 1;
if (auto widget = qobject_cast<VcsBaseEditorWidget *>(textEditor->widget())) {
const int previousFirstLine = widget->firstLineNumber();
if (previousFirstLine > 0)
firstLine = previousFirstLine;
}
argument += QString::number(firstLine) + ',';
cursor.setPosition(selectionEnd);
cursor.blockNumber();
argument += QString::number(cursor.blockNumber() + 1);
const int endBlock = cursor.blockNumber();
argument += QString::number(endBlock + firstLine - startBlock);
extraOptions << argument;
}
}
m_gitClient->annotate(state.currentFileTopLevel(), state.relativeCurrentFile(), QString(),
lineNumber, extraOptions);
VcsBaseEditorWidget *editor = m_gitClient->annotate(
state.currentFileTopLevel(), state.relativeCurrentFile(), QString(),
lineNumber, extraOptions);
if (firstLine > 0)
editor->setFirstLineNumber(firstLine);
}
void GitPlugin::logProject()