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

Clang: Flatten code completion chunks

Browse Source 
Avoid the sub vector for performance reason and use an flag for every
optional argument because there can be no recursion.

Change-Id: Iae1eaa1f164e4129e30358a1719582e5231f0385
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Marco Bubke
2015-12-11 11:45:05 +01:00
parent 466fa9636e
commit 8d6c10b241
8 changed files with 101 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/libs/clangbackendipc/codecompletionchunk.cpp
View File

@@ -37,17 +37,12 @@
namespace ClangBackEnd { namespace ClangBackEnd {
CodeCompletionChunk::CodeCompletionChunk()
: kind_(Invalid)
{
}
CodeCompletionChunk::CodeCompletionChunk(CodeCompletionChunk::Kind kind, CodeCompletionChunk::CodeCompletionChunk(CodeCompletionChunk::Kind kind,
const Utf8String &text, const Utf8String &text,
const CodeCompletionChunks &optionalChunks) bool isOptional)
: text_(text), : text_(text),
optionalChunks_(optionalChunks), kind_(kind),
kind_(kind) isOptional_(isOptional)
{ {
} }
@@ -61,23 +56,21 @@ const Utf8String &CodeCompletionChunk::text() const
return text_; return text_;
} }
const CodeCompletionChunks &CodeCompletionChunk::optionalChunks() const bool CodeCompletionChunk::isOptional() const
{ {
return optionalChunks_; return isOptional_;
} }
quint32 &CodeCompletionChunk::kindAsInt() quint8 &CodeCompletionChunk::kindAsInt()
{ {
return reinterpret_cast<quint32&>(kind_); return reinterpret_cast<quint8&>(kind_);
} }
QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk) QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk)
{ {
out << chunk.kind_; out << quint8(chunk.kind_);
out << chunk.text_; out << chunk.text_;
out << chunk.isOptional_;
if (chunk.kind() == CodeCompletionChunk::Optional)
out << chunk.optionalChunks_;
return out; return out;
} }
@@ -86,9 +79,7 @@ QDataStream &operator>>(QDataStream &in, CodeCompletionChunk &chunk)
{ {
in >> chunk.kindAsInt(); in >> chunk.kindAsInt();
in >> chunk.text_; in >> chunk.text_;
in >> chunk.isOptional_;
if (chunk.kind_ == CodeCompletionChunk::Optional)
in >> chunk.optionalChunks_;
return in; return in;
} }
@@ -97,7 +88,7 @@ bool operator==(const CodeCompletionChunk &first, const CodeCompletionChunk &sec
{ {
return first.kind() == second.kind() return first.kind() == second.kind()
&& first.text() == second.text() && first.text() == second.text()
&& first.optionalChunks() == second.optionalChunks(); && first.isOptional() == second.isOptional();
} }
static const char *completionChunkKindToString(CodeCompletionChunk::Kind kind) static const char *completionChunkKindToString(CodeCompletionChunk::Kind kind)
@@ -136,8 +127,8 @@ QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk)
debug.nospace() << completionChunkKindToString(chunk.kind()) << ", "; debug.nospace() << completionChunkKindToString(chunk.kind()) << ", ";
debug.nospace() << chunk.text(); debug.nospace() << chunk.text();
if (chunk.kind() == CodeCompletionChunk::Optional) if (chunk.isOptional())
debug.nospace() << ", " << chunk.optionalChunks(); debug.nospace() << ", optional";
debug.nospace() << ")"; debug.nospace() << ")";
@@ -150,20 +141,8 @@ void PrintTo(const CodeCompletionChunk &chunk, ::std::ostream* os)
*os << completionChunkKindToString(chunk.kind()) << ", "; *os << completionChunkKindToString(chunk.kind()) << ", ";
*os << chunk.text().constData(); *os << chunk.text().constData();
if (chunk.kind() == CodeCompletionChunk::Optional) { if (chunk.isOptional())
const auto optionalChunks = chunk.optionalChunks(); *os << ", optional";
*os << ", {";
for (auto optionalChunkPosition = optionalChunks.cbegin();
optionalChunkPosition != optionalChunks.cend();
++optionalChunkPosition) {
PrintTo(*optionalChunkPosition, os);
if (std::next(optionalChunkPosition) != optionalChunks.cend())
*os << ", ";
}
*os << "}";
}
*os << "}"; *os << "}";
} }

16
src/libs/clangbackendipc/codecompletionchunk.h
View File

@@ -49,7 +49,7 @@ class CMBIPC_EXPORT CodeCompletionChunk
friend CMBIPC_EXPORT bool operator==(const CodeCompletionChunk &first, const CodeCompletionChunk &second); friend CMBIPC_EXPORT bool operator==(const CodeCompletionChunk &first, const CodeCompletionChunk &second);
public: public:
enum Kind : quint32 { enum Kind : quint8 {
Optional, Optional,
TypedText, TypedText,
Text, Text,
@@ -71,25 +71,25 @@ public:
Equal, Equal,
HorizontalSpace, HorizontalSpace,
VerticalSpace, VerticalSpace,
Invalid = 255}; Invalid = 255
};
CodeCompletionChunk(); CodeCompletionChunk() = default;
CodeCompletionChunk(Kind kind, CodeCompletionChunk(Kind kind,
const Utf8String &text, const Utf8String &text,
const CodeCompletionChunks &optionalChunks = CodeCompletionChunks()); bool isOptional = false);
Kind kind() const; Kind kind() const;
const Utf8String &text() const; const Utf8String &text() const;
const CodeCompletionChunks &optionalChunks() const; bool isOptional() const;
private: private:
quint32 &kindAsInt(); quint8 &kindAsInt();
private: private:
Utf8String text_; Utf8String text_;
CodeCompletionChunks optionalChunks_;
Kind kind_ = Invalid; Kind kind_ = Invalid;
bool isOptional_ = false;
}; };
CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk); CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const CodeCompletionChunk &chunk);

64
src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
View File

@@ -36,7 +36,8 @@
namespace ClangCodeModel { namespace ClangCodeModel {
namespace Internal { namespace Internal {
void CompletionChunksToTextConverter::parseChunks(const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks) void CompletionChunksToTextConverter::parseChunks(
const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks)
{ {
m_text.clear(); m_text.clear();
m_placeholderPositions.clear(); m_placeholderPositions.clear();
@@ -49,7 +50,7 @@ void CompletionChunksToTextConverter::parseChunks(const ClangBackEnd::CodeComple
m_codeCompletionChunks.cend(), m_codeCompletionChunks.cend(),
[this] (const ClangBackEnd::CodeCompletionChunk &chunk) [this] (const ClangBackEnd::CodeCompletionChunk &chunk)
{ {
parse(chunk); parseDependendOnTheOptionalState(chunk);
m_previousCodeCompletionChunk = chunk; m_previousCodeCompletionChunk = chunk;
}); });
} }
@@ -74,7 +75,8 @@ void CompletionChunksToTextConverter::setAddSpaces(bool addSpaces)
m_addSpaces = addSpaces; m_addSpaces = addSpaces;
} }
void CompletionChunksToTextConverter::setAddExtraVerticalSpaceBetweenBraces(bool addExtraVerticalSpaceBetweenBraces) void CompletionChunksToTextConverter::setAddExtraVerticalSpaceBetweenBraces(
bool addExtraVerticalSpaceBetweenBraces)
{ {
m_addExtraVerticalSpaceBetweenBraces = addExtraVerticalSpaceBetweenBraces; m_addExtraVerticalSpaceBetweenBraces = addExtraVerticalSpaceBetweenBraces;
} }
@@ -104,7 +106,8 @@ bool CompletionChunksToTextConverter::hasPlaceholderPositions() const
return m_placeholderPositions.size() > 0; return m_placeholderPositions.size() > 0;
} }
QString CompletionChunksToTextConverter::convertToFunctionSignature(const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks) QString CompletionChunksToTextConverter::convertToFunctionSignature(
const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks)
{ {
CompletionChunksToTextConverter converter; CompletionChunksToTextConverter converter;
converter.setAddPlaceHolderText(true); converter.setAddPlaceHolderText(true);
@@ -116,7 +119,8 @@ QString CompletionChunksToTextConverter::convertToFunctionSignature(const ClangB
return converter.text(); return converter.text();
} }
QString CompletionChunksToTextConverter::convertToName(const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks) QString CompletionChunksToTextConverter::convertToName(
const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks)
{ {
CompletionChunksToTextConverter converter; CompletionChunksToTextConverter converter;
@@ -125,7 +129,8 @@ QString CompletionChunksToTextConverter::convertToName(const ClangBackEnd::CodeC
return converter.text(); return converter.text();
} }
QString CompletionChunksToTextConverter::convertToToolTip(const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks) QString CompletionChunksToTextConverter::convertToToolTip(
const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks)
{ {
CompletionChunksToTextConverter converter; CompletionChunksToTextConverter converter;
converter.setAddPlaceHolderText(true); converter.setAddPlaceHolderText(true);
@@ -140,13 +145,13 @@ QString CompletionChunksToTextConverter::convertToToolTip(const ClangBackEnd::Co
return converter.text(); return converter.text();
} }
void CompletionChunksToTextConverter::parse(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk) void CompletionChunksToTextConverter::parse(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{ {
using ClangBackEnd::CodeCompletionChunk; using ClangBackEnd::CodeCompletionChunk;
switch (codeCompletionChunk.kind()) { switch (codeCompletionChunk.kind()) {
case CodeCompletionChunk::ResultType: parseResultType(codeCompletionChunk.text()); break; case CodeCompletionChunk::ResultType: parseResultType(codeCompletionChunk.text()); break;
case CodeCompletionChunk::Optional: parseOptional(codeCompletionChunk); break;
case CodeCompletionChunk::Placeholder: parsePlaceHolder(codeCompletionChunk); break; case CodeCompletionChunk::Placeholder: parsePlaceHolder(codeCompletionChunk); break;
case CodeCompletionChunk::LeftParen: parseLeftParen(codeCompletionChunk); break; case CodeCompletionChunk::LeftParen: parseLeftParen(codeCompletionChunk); break;
case CodeCompletionChunk::LeftBrace: parseLeftBrace(codeCompletionChunk); break; case CodeCompletionChunk::LeftBrace: parseLeftBrace(codeCompletionChunk); break;
@@ -154,6 +159,15 @@ void CompletionChunksToTextConverter::parse(const ClangBackEnd::CodeCompletionCh
} }
} }
void CompletionChunksToTextConverter::parseDependendOnTheOptionalState(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{
wrapInCursiveTagIfOptional(codeCompletionChunk);
if (isNotOptionalOrAddOptionals(codeCompletionChunk))
parse(codeCompletionChunk);
}
void CompletionChunksToTextConverter::parseResultType(const Utf8String &resultTypeText) void CompletionChunksToTextConverter::parseResultType(const Utf8String &resultTypeText)
{ {
if (m_addResultType) if (m_addResultType)
@@ -170,20 +184,21 @@ void CompletionChunksToTextConverter::parseText(const Utf8String &text)
m_text += text.toString(); m_text += text.toString();
} }
void CompletionChunksToTextConverter::parseOptional(const ClangBackEnd::CodeCompletionChunk &optionalCodeCompletionChunk) void CompletionChunksToTextConverter::wrapInCursiveTagIfOptional(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{ {
if (m_addOptional) { if (m_addOptional) {
if (m_addHtmlTags) if (m_addHtmlTags) {
m_text += QStringLiteral("<i>"); if (!m_previousCodeCompletionChunk.isOptional() && codeCompletionChunk.isOptional())
m_text += QStringLiteral("<i>");
m_text += convertToFunctionSignature(optionalCodeCompletionChunk.optionalChunks()); else if (m_previousCodeCompletionChunk.isOptional() && !codeCompletionChunk.isOptional())
m_text += QStringLiteral("</i>");
if (m_addHtmlTags) }
m_text += QStringLiteral("</i>");
} }
} }
void CompletionChunksToTextConverter::parsePlaceHolder(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk) void CompletionChunksToTextConverter::parsePlaceHolder(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{ {
if (m_addPlaceHolderText) if (m_addPlaceHolderText)
m_text += codeCompletionChunk.text().toString(); m_text += codeCompletionChunk.text().toString();
@@ -192,7 +207,8 @@ void CompletionChunksToTextConverter::parsePlaceHolder(const ClangBackEnd::CodeC
m_placeholderPositions.push_back(m_text.size()); m_placeholderPositions.push_back(m_text.size());
} }
void CompletionChunksToTextConverter::parseLeftParen(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk) void CompletionChunksToTextConverter::parseLeftParen(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{ {
if (canAddSpace()) if (canAddSpace())
m_text += QChar(QChar::Space); m_text += QChar(QChar::Space);
@@ -200,7 +216,8 @@ void CompletionChunksToTextConverter::parseLeftParen(const ClangBackEnd::CodeCom
m_text += codeCompletionChunk.text().toString(); m_text += codeCompletionChunk.text().toString();
} }
void CompletionChunksToTextConverter::parseLeftBrace(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk) void CompletionChunksToTextConverter::parseLeftBrace(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{ {
if (canAddSpace()) if (canAddSpace())
m_text += QChar(QChar::Space); m_text += QChar(QChar::Space);
@@ -214,7 +231,8 @@ void CompletionChunksToTextConverter::addExtraVerticalSpaceBetweenBraces()
addExtraVerticalSpaceBetweenBraces(m_codeCompletionChunks.begin()); addExtraVerticalSpaceBetweenBraces(m_codeCompletionChunks.begin());
} }
void CompletionChunksToTextConverter::addExtraVerticalSpaceBetweenBraces(const ClangBackEnd::CodeCompletionChunks::iterator &begin) void CompletionChunksToTextConverter::addExtraVerticalSpaceBetweenBraces(
const ClangBackEnd::CodeCompletionChunks::iterator &begin)
{ {
using ClangBackEnd::CodeCompletionChunk; using ClangBackEnd::CodeCompletionChunk;
@@ -263,6 +281,12 @@ bool CompletionChunksToTextConverter::canAddSpace() const
&& m_previousCodeCompletionChunk.kind() != ClangBackEnd::CodeCompletionChunk::RightAngle; && m_previousCodeCompletionChunk.kind() != ClangBackEnd::CodeCompletionChunk::RightAngle;
} }
bool CompletionChunksToTextConverter::isNotOptionalOrAddOptionals(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk) const
{
return !codeCompletionChunk.isOptional() || m_addOptional;
}
} // namespace Internal } // namespace Internal
} // namespace ClangCodeModel } // namespace ClangCodeModel

6
src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h
View File

@@ -63,10 +63,11 @@ public:
static QString convertToName(const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks); static QString convertToName(const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks);
static QString convertToToolTip(const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks); static QString convertToToolTip(const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks);
private: private:
void parse(const ClangBackEnd::CodeCompletionChunk & codeCompletionChunk); void parse(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk);
void parseDependendOnTheOptionalState(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk);
void parseResultType(const Utf8String &text); void parseResultType(const Utf8String &text);
void parseText(const Utf8String &text); void parseText(const Utf8String &text);
void parseOptional(const ClangBackEnd::CodeCompletionChunk &optionalCodeCompletionChunk); void wrapInCursiveTagIfOptional(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk);
void parsePlaceHolder(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk); void parsePlaceHolder(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk);
void parseLeftParen(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk); void parseLeftParen(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk);
void parseLeftBrace(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk); void parseLeftBrace(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk);
@@ -74,6 +75,7 @@ private:
void addExtraVerticalSpaceBetweenBraces(const ClangBackEnd::CodeCompletionChunks::iterator &); void addExtraVerticalSpaceBetweenBraces(const ClangBackEnd::CodeCompletionChunks::iterator &);
bool canAddSpace() const; bool canAddSpace() const;
bool isNotOptionalOrAddOptionals(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk) const;
private: private:
std::vector<int> m_placeholderPositions; std::vector<int> m_placeholderPositions;

20
src/tools/clangbackend/ipcsource/codecompletionchunkconverter.cpp
View File

@@ -42,13 +42,12 @@ void CodeCompletionChunkConverter::extractCompletionChunks(CXCompletionString co
for (uint chunkIndex = 0; chunkIndex < completionChunkCount; ++chunkIndex) { for (uint chunkIndex = 0; chunkIndex < completionChunkCount; ++chunkIndex) {
const CodeCompletionChunk::Kind kind = chunkKind(completionString, chunkIndex); const CodeCompletionChunk::Kind kind = chunkKind(completionString, chunkIndex);
if (kind == CodeCompletionChunk::Optional) if (kind == CodeCompletionChunk::Optional) {
chunks.append(CodeCompletionChunk(kind, extractOptionalCompletionChunks(clang_getCompletionChunkCompletionString(completionString, chunkIndex));
chunkText(completionString, chunkIndex), } else {
optionalChunks(completionString, chunkIndex)));
else
chunks.append(CodeCompletionChunk(kind, chunks.append(CodeCompletionChunk(kind,
chunkText(completionString, chunkIndex))); chunkText(completionString, chunkIndex)));
}
} }
} }
@@ -62,7 +61,7 @@ void CodeCompletionChunkConverter::extractOptionalCompletionChunks(CXCompletionS
if (kind == CodeCompletionChunk::Optional) if (kind == CodeCompletionChunk::Optional)
extractOptionalCompletionChunks(clang_getCompletionChunkCompletionString(completionString, chunkIndex)); extractOptionalCompletionChunks(clang_getCompletionChunkCompletionString(completionString, chunkIndex));
else else
chunks.append(CodeCompletionChunk(kind, chunkText(completionString, chunkIndex))); chunks.append(CodeCompletionChunk(kind, chunkText(completionString, chunkIndex), true));
} }
} }
@@ -85,14 +84,5 @@ Utf8String CodeCompletionChunkConverter::chunkText(CXCompletionString completion
return ClangString(clang_getCompletionChunkText(completionString, chunkIndex)); return ClangString(clang_getCompletionChunkText(completionString, chunkIndex));
} }
CodeCompletionChunks CodeCompletionChunkConverter::optionalChunks(CXCompletionString completionString, uint chunkIndex)
{
CodeCompletionChunkConverter converter;
converter.extractOptionalCompletionChunks(clang_getCompletionChunkCompletionString(completionString, chunkIndex));
return converter.chunks;
}
} // namespace ClangBackEnd } // namespace ClangBackEnd

1
src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h
View File

@@ -47,7 +47,6 @@ public:
static Utf8String chunkText(CXCompletionString completionString, uint chunkIndex); static Utf8String chunkText(CXCompletionString completionString, uint chunkIndex);
private: private:
CodeCompletionChunks optionalChunks(CXCompletionString completionString, uint chunkIndex);
static CodeCompletionChunk::Kind chunkKind(CXCompletionString completionString, uint chunkIndex); static CodeCompletionChunk::Kind chunkKind(CXCompletionString completionString, uint chunkIndex);
void extractCompletionChunks(CXCompletionString completionString); void extractCompletionChunks(CXCompletionString completionString);
void extractOptionalCompletionChunks(CXCompletionString completionString); void extractOptionalCompletionChunks(CXCompletionString completionString);

9
tests/unit/unittest/codecompletionsextractortest.cpp
View File

@@ -630,11 +630,10 @@ TEST_F(CodeCompletionsExtractor, CompletionChunksFunctionWithOptionalChunks)
{CodeCompletionChunk::TypedText, Utf8StringLiteral("FunctionWithOptional")}, {CodeCompletionChunk::TypedText, Utf8StringLiteral("FunctionWithOptional")},
{CodeCompletionChunk::LeftParen, Utf8StringLiteral("(")}, {CodeCompletionChunk::LeftParen, Utf8StringLiteral("(")},
{CodeCompletionChunk::Placeholder, Utf8StringLiteral("int x")}, {CodeCompletionChunk::Placeholder, Utf8StringLiteral("int x")},
{CodeCompletionChunk::Optional, Utf8String(), CodeCompletionChunks({ {CodeCompletionChunk::Comma, Utf8StringLiteral(", "), true},
{CodeCompletionChunk::Comma, Utf8StringLiteral(", ")}, {CodeCompletionChunk::Placeholder, Utf8StringLiteral("char y"), true},
{CodeCompletionChunk::Placeholder, Utf8StringLiteral("char y")}, {CodeCompletionChunk::Comma, Utf8StringLiteral(", "), true},
{CodeCompletionChunk::Comma, Utf8StringLiteral(", ")}, {CodeCompletionChunk::Placeholder, Utf8StringLiteral("int z"), true},
{CodeCompletionChunk::Placeholder, Utf8StringLiteral("int z")}})},
{CodeCompletionChunk::RightParen, Utf8StringLiteral(")")}}))); {CodeCompletionChunk::RightParen, Utf8StringLiteral(")")}})));
} }

31
tests/unit/unittest/completionchunkstotextconvertertest.cpp
View File

@@ -80,10 +80,12 @@ protected:
CodeCompletionChunk elseName{CodeCompletionChunk::TypedText, Utf8StringLiteral("else")}; CodeCompletionChunk elseName{CodeCompletionChunk::TypedText, Utf8StringLiteral("else")};
CodeCompletionChunk ifName{CodeCompletionChunk::TypedText, Utf8StringLiteral("if")}; CodeCompletionChunk ifName{CodeCompletionChunk::TypedText, Utf8StringLiteral("if")};
CodeCompletionChunk horizontalSpace{CodeCompletionChunk::HorizontalSpace, Utf8StringLiteral(" ")}; CodeCompletionChunk horizontalSpace{CodeCompletionChunk::HorizontalSpace, Utf8StringLiteral(" ")};
CodeCompletionChunk optional{CodeCompletionChunk::Optional, Utf8String(), {comma, functionArgumentY, comma, functionArgumentZ}};
CodeCompletionChunk enableIfT{CodeCompletionChunk::TypedText, Utf8StringLiteral("enable_if_t")}; CodeCompletionChunk enableIfT{CodeCompletionChunk::TypedText, Utf8StringLiteral("enable_if_t")};
CodeCompletionChunk enableIfTCondition{CodeCompletionChunk::Placeholder, Utf8StringLiteral("_Cond")}; CodeCompletionChunk enableIfTCondition{CodeCompletionChunk::Placeholder, Utf8StringLiteral("_Cond")};
CodeCompletionChunk enableIfTType{CodeCompletionChunk::Placeholder, Utf8StringLiteral("_Tp")}; CodeCompletionChunk optionalEnableIfTType{CodeCompletionChunk::Placeholder, Utf8StringLiteral("_Tp"), true};
CodeCompletionChunk optionalComma{CodeCompletionChunk::Comma, Utf8StringLiteral(", "), true};
CodeCompletionChunk optionalFunctionArgumentY{CodeCompletionChunk::Placeholder, Utf8StringLiteral("int y"), true};
CodeCompletionChunk optionalFunctionArgumentZ{CodeCompletionChunk::Placeholder, Utf8StringLiteral("int z"), true};
}; };
TEST_F(CompletionChunksToTextConverter, ParseIsClearingText) TEST_F(CompletionChunksToTextConverter, ParseIsClearingText)
@@ -119,7 +121,15 @@ TEST_F(CompletionChunksToTextConverter, ConvertFunctionWithParameters)
TEST_F(CompletionChunksToTextConverter, ConvertFunctionWithOptionalParameter) TEST_F(CompletionChunksToTextConverter, ConvertFunctionWithOptionalParameter)
{ {
CodeCompletionChunks completionChunks({integerResultType, functionName, leftParen, functionArgumentX, optional,rightParen}); CodeCompletionChunks completionChunks({integerResultType,
functionName,
leftParen,
functionArgumentX,
optionalComma,
optionalFunctionArgumentY,
optionalComma,
optionalFunctionArgumentZ,
rightParen});
ASSERT_THAT(Converter::convertToToolTip(completionChunks), ASSERT_THAT(Converter::convertToToolTip(completionChunks),
QStringLiteral("int Function (char x<i>, int y, int z</i>)")); QStringLiteral("int Function (char x<i>, int y, int z</i>)"));
@@ -157,12 +167,12 @@ TEST_F(CompletionChunksToTextConverter, Enumeration)
TEST_F(CompletionChunksToTextConverter, Switch) TEST_F(CompletionChunksToTextConverter, Switch)
{ {
CodeCompletionChunks completionChunks({switchName, CodeCompletionChunks completionChunks({switchName,
leftParen, leftParen,
condition, condition,
rightParen, rightParen,
leftBrace, leftBrace,
verticalSpace, verticalSpace,
rightBrace}); rightBrace});
setupConverterForKeywords(); setupConverterForKeywords();
converter.parseChunks(completionChunks); converter.parseChunks(completionChunks);
@@ -239,7 +249,8 @@ TEST_F(CompletionChunksToTextConverter, EnableIfT)
CodeCompletionChunks completionChunks({enableIfT, CodeCompletionChunks completionChunks({enableIfT,
leftAngle, leftAngle,
enableIfTCondition, enableIfTCondition,
CodeCompletionChunk(CodeCompletionChunk::Optional, Utf8String(), {comma, enableIfTType}), optionalComma,
optionalEnableIfTType,
rightAngle}); rightAngle});
setupConverterForKeywords(); setupConverterForKeywords();