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

ProWriter: Fix removeVarValues() function

Browse Source 
This function wrongly assumed that there is always an empty line between
variable assignments. For instance, When renaming a header file in a
project file where HEADERS follows right after SOURCES, the function
would erroneously claim that it removed the header file from the SOURCES
segment, so follow-up code added the name name there instead of to
HEADERS.

Fixes: QTCREATORBUG-23720
Change-Id: I55288b22fe16fa0593b277d8808ab5d64ba90549
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-30 18:13:43 +02:00
parent f75e54160d
commit 11cd79adca
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/proparser/prowriter.cpp
View File

@@ -471,12 +471,17 @@ QList<int> ProWriter::removeVarValues(ProFile *profile, QStringList *lines,
// This code expects proVars to be sorted by the variables' appearance in the file. // This code expects proVars to be sorted by the variables' appearance in the file.
int delta = 1; int delta = 1;
for (const VarLocation &loc : qAsConst(varLocations)) { for (int varIndex = 0; varIndex < varLocations.count(); ++varIndex) {
const VarLocation &loc = varLocations[varIndex];
bool first = true; bool first = true;
int lineNo = loc.second - delta; int lineNo = loc.second - delta;
typedef QPair<int, int> ContPos; typedef QPair<int, int> ContPos;
QList<ContPos> contPos; QList<ContPos> contPos;
while (lineNo < lines->count()) { const auto nextSegmentStart = [varIndex, lines, &delta, &varLocations] {
return varIndex == varLocations.count() - 1
? lines->count() : varLocations[varIndex + 1].second - delta;
};
while (lineNo < nextSegmentStart()) {
QString &line = (*lines)[lineNo]; QString &line = (*lines)[lineNo];
int lineLen = line.length(); int lineLen = line.length();
bool killed = false; bool killed = false;