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

ClangFormat: Extract switch statement into function

Browse Source 
Clarifies the logic and improves readability.

Change-Id: I42668c65d73fb455996fa3a9bc5384f0b204a778
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-03-12 11:55:43 +01:00
parent 1e28a66bb5
commit 7f0589ef59
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/clangformat/clangformatbaseindenter.cpp
View File

@@ -29,11 +29,11 @@
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/textutils.h>
#include <utils/qtcassert.h>
#include <utils/textutils.h>
#include <QTextDocument>
#include <QDebug>
#include <QTextDocument>
namespace ClangFormat {
@@ -179,6 +179,27 @@ bool nextBlockExistsAndEmpty(const QTextBlock &currentBlock)
return nextBlock.text().trimmed().isEmpty();
}
QByteArray dummyTextForContext(CharacterContext context, bool closingBraceBlock)
{
if (closingBraceBlock
&& (context == CharacterContext::NewStatement
|| context == CharacterContext::Continuation)) {
return QByteArray();
}
switch (context) {
case CharacterContext::Unknown:
QTC_ASSERT(false, return "";);
case CharacterContext::AfterComma:
return "a,";
case CharacterContext::NewStatement:
return "a;";
case CharacterContext::Continuation:
case CharacterContext::LastAfterComma:
return "& a &";
}
}
// Add extra text in case of the empty line or the line starting with ')'.
// Track such extra pieces of text in isInsideModifiedLine().
int forceIndentWithExtraText(QByteArray &buffer,
@@ -220,24 +241,7 @@ int forceIndentWithExtraText(QByteArray &buffer,
charContext = characterContext(block, lastBlock);
}
switch (charContext) {
case CharacterContext::Unknown:
QTC_ASSERT(false, return 0;);
case CharacterContext::AfterComma:
dummyText = "a,";
break;
case CharacterContext::NewStatement:
if (!closingBraceBlock)
dummyText = "a;";
break;
case CharacterContext::Continuation:
if (closingBraceBlock)
break;
Q_FALLTHROUGH();
case CharacterContext::LastAfterComma:
dummyText = "& a &";
break;
}
dummyText = dummyTextForContext(charContext, closingBraceBlock);
}
buffer.insert(utf8Offset, dummyText);