diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2019-11-20 16:01:17 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2019-12-02 15:49:03 +0000 |
| commit | 3b9ce988651b53563fddbb3927d747f23b48b923 (patch) | |
| tree | a11893e68fe00415cb340cba260c32e843b81f76 /src/plugins/diffeditor/diffutils.cpp | |
| parent | 27d503558fdd18fdc3ba21deac85ed63f8c4518b (diff) | |
| download | qt-creator-3b9ce988651b53563fddbb3927d747f23b48b923.tar.gz | |
Git/DiffEditor: Fix staging added/removed lines separately
Fixes: QTCREATORBUG-23243
Change-Id: Ice19e1c778aabd9cb1b9fe0681234073de85cfcb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffutils.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index e233173629..6c024ebd01 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -26,6 +26,7 @@ #include "diffutils.h" #include <texteditor/fontsettings.h> +#include <utils/algorithm.h> #include <utils/differ.h> #include <QFutureInterfaceBase> @@ -37,6 +38,11 @@ using namespace Utils; namespace DiffEditor { +int ChunkSelection::selectedRowsCount() const +{ + return Utils::toSet(leftSelection).unite(Utils::toSet(rightSelection)).count(); +} + static QList<TextLineData> assemblyRows(const QList<TextLineData> &lines, const QMap<int, int> &lineSpans) { |