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

Clang: Fix adding snippets after opening brace

Browse Source 
The regression was introduced by

    commit 82d6d20acb
    Clang: Do not show completions after comma in initializer list

This fixes ClangCodeCompletionTest::testCompleteGlobals().

Change-Id: Ic126f1e3eaed158196268e3682ff32bc02deb7b9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-07-05 09:37:34 +02:00
parent 0d9e8d3e9d
commit 2aa067f28e
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/clangcodemodel/clangcompletioncontextanalyzer.cpp
View File

@@ -168,6 +168,7 @@ void ClangCompletionContextAnalyzer::handleFunctionCall(int afterOperatorPositio
} else { } else {
const int functionNameStart = startOfFunctionCall(afterOperatorPosition); const int functionNameStart = startOfFunctionCall(afterOperatorPosition);
if (functionNameStart >= 0) { if (functionNameStart >= 0) {
m_addSnippets = functionNameStart == afterOperatorPosition;
// Always pass the position right after '(' to libclang because // Always pass the position right after '(' to libclang because
// positions after the comma might be problematic if a preceding // positions after the comma might be problematic if a preceding
// argument is invalid code. // argument is invalid code.

21
tests/unit/unittest/clangcompletioncontextanalyzer-test.cpp
View File

@@ -564,4 +564,25 @@ TEST_F(ClangCompletionContextAnalyzer, QualifiedFunctionNameStartPosition)
ASSERT_THAT(functionNameStartPosition, 1); ASSERT_THAT(functionNameStartPosition, 1);
} }
TEST_F(ClangCompletionContextAnalyzer, SnippetsAfterOpeningBrace)
{
auto analyzer = runAnalyzer("{@");
ASSERT_TRUE(analyzer.addSnippets());
} }
TEST_F(ClangCompletionContextAnalyzer, NoSnippetsAfterFunctionCallLike_OpeningBrace)
{
auto analyzer = runAnalyzer("foo{@");
ASSERT_FALSE(analyzer.addSnippets());
}
TEST_F(ClangCompletionContextAnalyzer, NoSnippetsAfterFunctionCallLike_OpeningParen)
{
auto analyzer = runAnalyzer("foo(@");
ASSERT_FALSE(analyzer.addSnippets());
}
} // namespace