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

DiffEditor: Use DiffSide enum inside ChunkSelection

Browse Source 
Change-Id: If23b0f46856eebec96624e58b6ad90b1b3e8be23
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-26 15:08:59 +02:00
parent a1c4d563a1
commit 6dc412e255
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/diffeditordocument.cpp
View File

@@ -74,8 +74,8 @@ ChunkData DiffEditorDocument::filterChunk(const ChunkData &data,
chunk.rows.clear();
for (int i = 0; i < data.rows.count(); ++i) {
RowData row = data.rows[i];
const bool isLeftSelected = selection.leftSelection.contains(i);
const bool isRightSelected = selection.rightSelection.contains(i);
const bool isLeftSelected = selection.selection[LeftSide].contains(i);
const bool isRightSelected = selection.selection[RightSide].contains(i);
if (isLeftSelected || isRightSelected) {
if (row.equal || (isLeftSelected && isRightSelected)) {

2
src/plugins/diffeditor/diffutils.cpp
View File

@@ -17,7 +17,7 @@ namespace DiffEditor {
int ChunkSelection::selectedRowsCount() const
{
return Utils::toSet(leftSelection).unite(Utils::toSet(rightSelection)).size();
return Utils::toSet(selection[LeftSide]).unite(Utils::toSet(selection[RightSide])).size();
}
static QList<TextLineData> assemblyRows(const QList<TextLineData> &lines,

8
src/plugins/diffeditor/diffutils.h
View File

@@ -5,6 +5,7 @@
#include "diffeditor_global.h"
#include <utils/algorithm.h>
#include <utils/filepath.h>
#include <QMap>
@@ -83,11 +84,10 @@ class DIFFEDITOR_EXPORT ChunkSelection {
public:
ChunkSelection() = default;
ChunkSelection(const QList<int> &left, const QList<int> &right)
: leftSelection(left), rightSelection(right) {}
bool isNull() const { return leftSelection.isEmpty() && rightSelection.isEmpty(); }
: selection({left, right}) {}
bool isNull() const { return Utils::allOf(selection, &QList<int>::isEmpty); }
int selectedRowsCount() const;
QList<int> leftSelection;
QList<int> rightSelection;
std::array<QList<int>, SideCount> selection{};
};
class DIFFEDITOR_EXPORT FileData {