From f0912bfe235a7a908e1cefaffc820bdfc372ef2f Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 20 Jul 2010 12:47:50 +0200
Subject: [PATCH] QmlJS: Make rewriter methods static
Done by erikv
---
src/libs/qmljs/qmljsrewriter.cpp | 26 +++++++++++++-------------
src/libs/qmljs/qmljsrewriter.h | 4 ++--
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/libs/qmljs/qmljsrewriter.cpp b/src/libs/qmljs/qmljsrewriter.cpp
index 093f671c66f..3d9106e9208 100644
--- a/src/libs/qmljs/qmljsrewriter.cpp
+++ b/src/libs/qmljs/qmljsrewriter.cpp
@@ -404,29 +404,29 @@ void Rewriter::removeMember(UiObjectMember *member)
int start = member->firstSourceLocation().offset;
int end = member->lastSourceLocation().end();
- includeSurroundingWhitespace(start, end);
+ includeSurroundingWhitespace(m_originalText, start, end);
m_changeSet->remove(start, end);
}
-bool Rewriter::includeSurroundingWhitespace(int &start, int &end) const
+bool Rewriter::includeSurroundingWhitespace(const QString &source, int &start, int &end)
{
bool includeStartingWhitespace = true;
bool paragraphFound = false;
if (end >= 0) {
- QChar c = m_originalText.at(end);
+ QChar c = source.at(end);
while (c.isSpace()) {
++end;
if (c.unicode() == 10) {
paragraphFound = true;
break;
- } else if (end == m_originalText.length()) {
+ } else if (end == source.length()) {
break;
}
- c = m_originalText.at(end);
+ c = source.at(end);
}
includeStartingWhitespace = paragraphFound;
@@ -435,7 +435,7 @@ bool Rewriter::includeSurroundingWhitespace(int &start, int &end) const
paragraphFound = false;
if (includeStartingWhitespace) {
while (start > 0) {
- const QChar c = m_originalText.at(start - 1);
+ const QChar c = source.at(start - 1);
if (c.unicode() == 10) {
paragraphFound = true;
@@ -453,9 +453,9 @@ bool Rewriter::includeSurroundingWhitespace(int &start, int &end) const
return paragraphFound;
}
-void Rewriter::includeLeadingEmptyLine(int &start) const
+void Rewriter::includeLeadingEmptyLine(const QString &source, int &start)
{
- QTextDocument doc(m_originalText);
+ QTextDocument doc(source);
if (start == 0)
return;
@@ -591,10 +591,10 @@ void Rewriter::removeObjectMember(UiObjectMember *member, UiObjectMember *parent
if (UiArrayBinding *parentArray = cast<UiArrayBinding *>(parent)) {
extendToLeadingOrTrailingComma(parentArray, member, start, end);
} else {
- includeSurroundingWhitespace(start, end);
+ includeSurroundingWhitespace(m_originalText, start, end);
}
- includeLeadingEmptyLine(start);
+ includeLeadingEmptyLine(m_originalText, start);
m_changeSet->remove(start, end);
}
@@ -617,16 +617,16 @@ void Rewriter::extendToLeadingOrTrailingComma(UiArrayBinding *parentArray,
if (currentMember->commaToken.isValid()) {
// leading comma
start = currentMember->commaToken.offset;
- if (includeSurroundingWhitespace(start, end))
+ if (includeSurroundingWhitespace(m_originalText, start, end))
--end;
} else if (currentMember->next && currentMember->next->commaToken.isValid()) {
// trailing comma
end = currentMember->next->commaToken.end();
- includeSurroundingWhitespace(start, end);
+ includeSurroundingWhitespace(m_originalText, start, end);
} else {
// array with 1 element, so remove the complete binding
start = parentArray->firstSourceLocation().offset;
end = parentArray->lastSourceLocation().end();
- includeSurroundingWhitespace(start, end);
+ includeSurroundingWhitespace(m_originalText, start, end);
}
}
diff --git a/src/libs/qmljs/qmljsrewriter.h b/src/libs/qmljs/qmljsrewriter.h
index 274da0c180c..ce480856e42 100644
--- a/src/libs/qmljs/qmljsrewriter.h
+++ b/src/libs/qmljs/qmljsrewriter.h
@@ -77,8 +77,8 @@ public:
static AST::UiObjectMemberList *searchMemberToInsertAfter(AST::UiObjectMemberList *members, const QString &propertyName, const QStringList &propertyOrder);
static QString flatten(AST::UiQualifiedId *first);
- bool includeSurroundingWhitespace(int &start, int &end) const;
- void includeLeadingEmptyLine(int &start) const;
+ static bool includeSurroundingWhitespace(const QString &source, int &start, int &end);
+ static void includeLeadingEmptyLine(const QString &source, int &start);
private:
void replaceMemberValue(AST::UiObjectMember *propertyMember,
--
GitLab