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

Clang: Fix completion icon for members in member init list

Browse Source 
Change-Id: Ib02320dcf4de7cbb8ac6fbf29d1929edae77591a
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-11-12 12:39:35 +01:00
parent 1bbac68e5d
commit 5b12ada2dc
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/clangbackend/source/codecompletionsextractor.cpp
View File

@@ -184,6 +184,7 @@ void CodeCompletionsExtractor::extractCompletionKind()
currentCodeCompletion_.completionKind = CodeCompletion::FunctionCompletionKind; currentCodeCompletion_.completionKind = CodeCompletion::FunctionCompletionKind;
break; break;
case CXCursor_VariableRef: case CXCursor_VariableRef:
case CXCursor_MemberRef:
case CXCursor_VarDecl: case CXCursor_VarDecl:
case CXCursor_FieldDecl: case CXCursor_FieldDecl:
case CXCursor_ParmDecl: case CXCursor_ParmDecl:

14
tests/unit/unittest/codecompletionsextractor-test.cpp
View File

@@ -156,6 +156,7 @@ protected:
Document namespaceDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_namespace.cpp"), compilationArguments, {}, documents}; Document namespaceDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_namespace.cpp"), compilationArguments, {}, documents};
Document enumerationDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_enumeration.cpp"), compilationArguments, {}, documents}; Document enumerationDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_enumeration.cpp"), compilationArguments, {}, documents};
Document constructorDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_constructor.cpp"), compilationArguments, {}, documents}; Document constructorDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_constructor.cpp"), compilationArguments, {}, documents};
Document constructorMemberInitDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_constructorMemberInitialization.cpp"), compilationArguments, {}, documents};
Document briefCommentDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_brief_comment.cpp"), compilationArguments, {}, documents}; Document briefCommentDocument{Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_brief_comment.cpp"), compilationArguments, {}, documents};
}; };
@@ -435,6 +436,19 @@ TEST_F(CodeCompletionsExtractorSlowTest, Constructor)
CodeCompletion::Available)); CodeCompletion::Available));
} }
TEST_F(CodeCompletionsExtractorSlowTest, ConstructorMemberInitializer) {
ClangCodeCompleteResults completeResults(getResults(constructorMemberInitDocument, 2, 18));
::CodeCompletionsExtractor extractor(
unsavedFiles.unsavedFile(constructorDocument.filePath()),
completeResults.data());
ASSERT_THAT(extractor,
HasCompletion(Utf8StringLiteral("member"),
CodeCompletion::VariableCompletionKind,
CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractorSlowTest, Destructor) TEST_F(CodeCompletionsExtractorSlowTest, Destructor)
{ {
ClangCodeCompleteResults completeResults(getResults(constructorDocument, 20)); ClangCodeCompleteResults completeResults(getResults(constructorDocument, 20));

5
tests/unit/unittest/data/complete_extractor_constructorMemberInitialization.cpp Normal file
View File

@@ -0,0 +1,5 @@
class Constructor {
Constructor() : {}
int member;
};