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

C++: nested class in function

Browse Source 
Case when nested class declaration contains object name for this class.
Example:
void fun()
{
    struct S
    {
        int i;
    } s;
    s.i;
}

Fixes:
* highlighting
* completion
* tests

Task-number: QTCREATORBUG-11710
Change-Id: I32e234f57655c388a87a199edc8be750d7bf823f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Przemyslaw Gorszkowski
2014-03-14 11:39:11 +01:00
committed by Nikolai Kosjar
parent 46c083c2eb
commit e3f5977311
3 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
View File

@@ -194,6 +194,7 @@ private slots:
void test_checksymbols_AnonymousClass();
void test_checksymbols_AnonymousClass_insideNamespace();
void test_checksymbols_AnonymousClass_QTCREATORBUG8963();
void test_checksymbols_class_declaration_with_object_name_nested_in_function();
void test_checksymbols_highlightingTypeWhenUsingNamespaceClass_QTCREATORBUG7903_globalNamespace();
void test_checksymbols_highlightingTypeWhenUsingNamespaceClass_QTCREATORBUG7903_namespace();
void test_checksymbols_highlightingTypeWhenUsingNamespaceClass_QTCREATORBUG7903_insideFunction();
@@ -1585,6 +1586,31 @@ void tst_CheckSymbols::test_checksymbols_AnonymousClass_QTCREATORBUG8963()
TestData::check(source, expectedUses);
}
void tst_CheckSymbols::test_checksymbols_class_declaration_with_object_name_nested_in_function()
{
const QByteArray source =
"int foo()\n"
"{\n"
" struct Nested\n"
" {\n"
" int i;\n"
" } n;\n"
" n.i = 42;\n"
"}\n"
;
const QList<Use> expectedUses = QList<Use>()
<< Use(1, 5, 3, CppHighlightingSupport::FunctionUse)
<< Use(3, 12, 6, CppHighlightingSupport::TypeUse)
<< Use(5, 13, 1, CppHighlightingSupport::FieldUse)
<< Use(6, 7, 1, CppHighlightingSupport::LocalUse)
<< Use(7, 5, 1, CppHighlightingSupport::LocalUse)
<< Use(7, 7, 1, CppHighlightingSupport::FieldUse)
;
TestData::check(source, expectedUses);
}
void tst_CheckSymbols::test_checksymbols_highlightingTypeWhenUsingNamespaceClass_QTCREATORBUG7903_globalNamespace()
{
const QByteArray source =