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

Merge remote-tracking branch 'gerrit/3.2'

Browse Source 
Change-Id: I8e200637585eeea739840868d8450cba955df058
This commit is contained in:
Eike Ziller
2014-07-08 13:38:06 +02:00
parent 6de3389397 0bab6e37b4
commit ca59e8b53a
43 changed files with 413 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cpptools/cppcompletion_test.cpp
View File

@@ -2281,6 +2281,20 @@ void CppToolsPlugin::test_completion_data()
<< QLatin1String("Derived")
<< QLatin1String("foo")
<< QLatin1String("Foo"));
QTest::newRow("default_arguments_for_class_templates_and_template_base_class_QTCREATORBUG-12606") << _(
"struct Foo { int foo; };\n"
"template <typename T>\n"
"struct Base { T t; };\n"
"template <typename T = Foo>\n"
"struct Derived : Base<T> {};\n"
"void fun() {\n"
" Derived<> derived;\n"
" @\n"
"}\n"
) << _("derived.t.") << (QStringList()
<< QLatin1String("foo")
<< QLatin1String("Foo"));
}
void CppToolsPlugin::test_completion_member_access_operator()

3
src/plugins/cpptools/cpptoolseditorsupport.cpp
View File

@@ -526,7 +526,8 @@ SemanticInfo CppEditorSupport::recalculateSemanticInfoNow(const SemanticInfo::So
const QSharedPointer<SnapshotUpdater> snapshotUpdater = snapshotUpdater_internal();
QTC_ASSERT(snapshotUpdater, return newSemanticInfo);
newSemanticInfo.snapshot = snapshotUpdater->snapshot();
QTC_ASSERT(newSemanticInfo.snapshot.contains(source.fileName), return newSemanticInfo);
if (!newSemanticInfo.snapshot.contains(source.fileName))
return newSemanticInfo; // SnapshotUpdater::update() not yet started.
Document::Ptr doc = newSemanticInfo.snapshot.preprocessedDocument(source.code,
source.fileName);
if (processor)