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

qmljsrewriter: fixes removing of properties

Browse Source
This commit is contained in:
Thomas Hartmann
2010-07-09 16:01:19 +02:00
parent c79bf94c53
commit 97eb3e1304
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/qmljs/qmljsrewriter.cpp
View File

@@ -406,7 +406,7 @@ void Rewriter::removeMember(UiObjectMember *member)
includeSurroundingWhitespace(start, end);
m_changeSet->replace(start, end, QLatin1String(""));
m_changeSet->remove(start, end);
}
bool Rewriter::includeSurroundingWhitespace(int &start, int &end) const
@@ -416,10 +416,12 @@ bool Rewriter::includeSurroundingWhitespace(int &start, int &end) const
if (end >= 0) {
QChar c = m_originalText.at(end);
while (c.isSpace()) {
++end;
if (c == QChar::ParagraphSeparator) {
if (c.unicode() == 10) {
paragraphFound = true;
break;
} else if (end == m_originalText.length()) {
@@ -438,7 +440,7 @@ bool Rewriter::includeSurroundingWhitespace(int &start, int &end) const
if (!c.isSpace())
break;
else if (c == QChar::ParagraphSeparator)
else if (c.unicode() == 10)
break;
--start;
@@ -590,7 +592,7 @@ void Rewriter::removeObjectMember(UiObjectMember *member, UiObjectMember *parent
}
includeLeadingEmptyLine(start);
m_changeSet->replace(start, end, QLatin1String(""));
m_changeSet->remove(start, end);
}
void Rewriter::extendToLeadingOrTrailingComma(UiArrayBinding *parentArray,