Merge remote-tracking branch 'origin/4.15'

Change-Id: I75ffc79eeb8d73296a2271a636fae48e35427947
This commit is contained in:
Eike Ziller
2021-05-05 11:46:19 +02:00
33 changed files with 455 additions and 68 deletions

View File

@@ -318,7 +318,8 @@ IEditor *GitGrep::openEditor(const SearchResultItem &item,
const QString topLevel = parameters.additionalParameters.toString();
IEditor *editor = m_client->openShowEditor(
topLevel, params.ref, path, GitClient::ShowEditor::OnlyIfDifferent);
editor->gotoLine(item.mainRange().begin.line, item.mainRange().begin.column);
if (editor)
editor->gotoLine(item.mainRange().begin.line, item.mainRange().begin.column);
return editor;
}