Differential D10277 Diff 29565 plugins/clang/codecompletion/completionhelper.cpp

Changeset View

Standalone View

View Options

plugins/clang/codecompletion/completionhelper.cpp

Context not available.
55 QString templatePrefix; 55​ QString templatePrefix;
56}; 56​};
57 57​
58​QStringList templateParams(CXCursor cursor);
59​
58CXChildVisitResult templateParamsHelper(CXCursor cursor, CXCursor /*parent*/, CXClientData data) 60​CXChildVisitResult templateParamsHelper(CXCursor cursor, CXCursor /*parent*/, CXClientData data)
59{ 61​{
60 CXCursorKind kind = clang_getCursorKind(cursor); 62​ CXCursorKind kind = clang_getCursorKind(cursor);
61 if (kind == CXCursor_TemplateTypeParameter || kind == CXCursor_TemplateTemplateParameter || 63​ auto& params = *static_cast<QStringList*>(data);
62 kind == CXCursor_NonTypeTemplateParameter) { 64​ if (kind == CXCursor_TemplateTypeParameter) {
63 (*static_cast<QStringList*>(data)).append(ClangString(clang_getCursorSpelling(cursor)).toString()); 65​ auto paramName = ClangString(clang_getCursorSpelling(cursor)).toString();
66​ auto param = QStringLiteral("typename");
mwolffUnsubmitted
Not Done

here and below: space after if

mwolff: here and below: space after `if`
67​ if (!paramName.isEmpty()) {
mwolffUnsubmitted
Not Done

QLatin1Char(' ')

mwolff: `QLatin1Char(' ')`
68​ param += QLatin1Char(' ') + paramName;
69​ }
mwolffUnsubmitted
Not Done

move the static cast to top and then use it down here and below

auto& params = *static_cast<QStringList*>(data);
mwolff: move the static cast to top and then use it down here and below ``` auto& params =…
70​ params.append(param);
71​ }
72​ else if (kind == CXCursor_NonTypeTemplateParameter) {
73​ auto param = ClangString(clang_getTypeSpelling(clang_getCursorType(cursor))).toString();
74​ auto paramName = ClangString(clang_getCursorSpelling(cursor)).toString();
75​ if (!paramName.isEmpty()) {
mwolffUnsubmitted
Not Done

dito QLatin1Char

mwolff: dito QLatin1Char
76​ param += QLatin1Char(' ') + paramName;
77​ }
78​ params.append(param);
79​ }
80​ else if (kind == CXCursor_TemplateTemplateParameter) {
mwolffUnsubmitted
Not Done

auto

mwolff: auto
81​ auto paramName = ClangString(clang_getCursorSpelling(cursor)).toString();
82​ auto templateTypes = templateParams(cursor);
83​ auto param = QLatin1String("template<") + templateTypes.join(QStringLiteral(", ")) + QLatin1String("> class ") + paramName ;
84​ params.append(param);
64 } 85​ }
65 return CXChildVisit_Continue; 86​ return CXChildVisit_Continue;
66} 87​}
Context not available.
247 //which goes at the front of the prototype 268​ //which goes at the front of the prototype
248 const QStringList templateTypes = templateParams(kind == CXCursor_ClassTemplate ? cursor : clang_getSpecializedCursorTemplate(cursor)); 269​ const QStringList templateTypes = templateParams(kind == CXCursor_ClassTemplate ? cursor : clang_getSpecializedCursorTemplate(cursor));
249 270​
250 templatePrefix = QLatin1String("template<") + templateTypes.join(QStringLiteral(", typename ")) + QLatin1String("> "); 271​ templatePrefix = QLatin1String("template<") + templateTypes.join(QStringLiteral(", ")) + QLatin1String("> ");
251 } 272​ }
252 } 273​ }
253 274​
Context not available.
292 return CXChildVisit_Continue; 313​ return CXChildVisit_Continue;
293 } 314​ }
294 315​
316​ QString templatePrefix;
317​ if (kind == CXCursor_FunctionTemplate) {
318​ const QStringList templateTypes = templateParams(cursor);
319​ templatePrefix = QLatin1String("template<") + templateTypes.join(QStringLiteral(", ")) + QLatin1String("> ");
320​ }
321​
295 const auto scope = ClangUtils::getScope(cursor, data->origin); 322​ const auto scope = ClangUtils::getScope(cursor, data->origin);
296 QString signature = ClangUtils::getCursorSignature(cursor, scope); 323​ QString signature = ClangUtils::getCursorSignature(cursor, scope);
297 324​
Context not available.
313 } 340​ }
314 DeclarationPointer declaration = ClangHelpers::findDeclaration(clang_getCursorLocation(cursor), QualifiedIdentifier(), top); 341​ DeclarationPointer declaration = ClangHelpers::findDeclaration(clang_getCursorLocation(cursor), QualifiedIdentifier(), top);
315 data->prototypes->append(FuncImplementInfo{kind == CXCursor_Constructor, kind == CXCursor_Destructor, 342​ data->prototypes->append(FuncImplementInfo{kind == CXCursor_Constructor, kind == CXCursor_Destructor,
316 data->templatePrefix, returnType, rest, declaration}); 343​ data->templatePrefix + templatePrefix, returnType, rest, declaration});
317 344​
318 return CXChildVisit_Continue; 345​ return CXChildVisit_Continue;
319} 346​}
Context not available.