summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcompletion_test.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert "C++: add support for resolving typedefs for template arguments"Nikolai Kosjar2014-09-111-28/+0
| | | | | | | | | | | This reverts commit c228b36ccf92f3a75d7687159d99da496cf5e241. There are multiple issues with the reverted patch: * Infinite loop due to indirect recursion e.g. when opening projectmodels.cpp * Crash when executing CppTools tests on Windows (no infinite loop) Change-Id: I38f02132ca57d3d32085db6146d0df7d620d7618 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: add support for resolving typedefs for template argumentsPrzemyslaw Gorszkowski2014-09-091-0/+28
| | | | | | | | | | | | | | | Example: template <typename T> struct Base { T t; }; struct Foo { int foo; }; void fun() { typedef Foo TypedefedFoo; Base<TypedefedFoo> baseFoo; baseFoo.t.// no code completion } Change-Id: I4822693d3fa1ee2e9b0e4cdd28bb9a8d441fb313 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: Base parsing on editor document instead of widgetNikolai Kosjar2014-08-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mainly takes CppEditorSupport apart. * Parsing is now invoked by CPPEditorDocument itself by listening to QTextDocument::contentsChanged(). * Upon construction and destruction CPPEditorDocument creates and deletes an EditorDocumentHandle for (un)registration in the model manager. This handle provides everything to generate the working copy and to access the editor document processor. * A CPPEditorDocument owns a BaseEditorDocumentProcessor instance that controls parsing, semantic info recalculation and the semantic highlighting for the document. This is more or less what is left from CppEditorSupport and can be considered as the backend of a CPPEditorDocument. CPPEditorDocument itself is quite small. * BuiltinEditorDocumentProcessor and ClangEditorDocumentProcessor derive from BaseEditorDocumentProcessor and implement the gaps. * Since the semantic info calculation was bound to the widget, it also calculated the local uses, which depend on the cursor position. This calculation got moved into the extracted class UseSeletionsUpdater in the cppeditor plugin, which is run once the cursor position changes or the semantic info document is updated. * Some more logic got extracted: - SemanticInfoUpdater (logic was in CppEditorSupport) - SemanticHighlighter (logic was in CppEditorSupport) * The *Parser and *Processor classes can be easily accessed by the static function get(). * CppHighlightingSupport is gone since it turned out to be useless. * The editor dependency in CompletionAssistProviders is gone since we actually only need the file path now. Change-Id: I49d3a7bd138c5ed9620123e34480772535156508 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* search for partial specialization for arraysFilipp2014-08-201-0/+39
| | | | | | | | | A<int[]> now prefer second specialization for template<typename T> class A template<typename T> class A<[]> Change-Id: I32e874f78b2f5b363d088fbab6a8897e42e44035 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: fix code completion for typedef of pointer arrayPrzemyslaw Gorszkowski2014-08-181-0/+11
| | | | | | | | | | | | | | | | Example: struct Foo { int foo; }; typedef Foo *FooArr[10]; void func() { FooArr arr; arr[0]-> // No completion } Task-number: QTCREATORBUG-12703 Change-Id: I1898dbf83eaa0a6dfa8c401390f28c78e5739bc4 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* TextEditor: Consolidate document access functions.hjk2014-08-041-1/+1
| | | | | | | | There was document(), textDocument() and baseTextDocument(). Two should be enough... Change-Id: Id9e41c8d857c5cb3269a9fce5ab594d34448c982 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* C++: nested class with enclosing template classPrzemyslaw Gorszkowski2014-08-011-2/+20
| | | | | | | | | | | | | | | | | | | | | | | The parent of instantiation of nested class of template class should be the instantiation of enclosing template class. To prevent the infinite loop for case with local typedef of enclosing template we should not change a parent of typedefed instatiation of enclosing template. Example: template <typename T> struct Enclosing { typedef Enclosing<T> EnclosingT;// first case struct Nested { typedef Enclosing<T> EnclosingT;// second case }; }; Task-number: QTCREATORBUG-11752 Task-number: QTCREATORBUG-11999 Change-Id: Iadd7b5ef73ee0c4881f59c9dabfe03339f55827b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: use pointer in template specialization and initializationPrzemyslaw Gorszkowski2014-07-311-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | Fix code completion for using pointer in template specialization and initialization. Example: template <typename T> struct S {}; template <typename T> struct S<T*> { T* t; }; struct Foo { int foo; }; int main() { S<Foo*> s; s.t-> //no code completion return 0; } Task-number: QTCREATORBUG-12638 Change-Id: Idcd461806a22f08b76236f2db6346f157b12f5d3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* TextEditor: Merge PlainTextEditor into Basehjk2014-07-301-1/+1
| | | | | | | | Same patter. Plain is fully merged now, so remove the files, too. Change-Id: Id8c0ba5689ad9980a0db3580cb9833344fd911f3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* C++: template base class and default argument for template classPrzemyslaw Gorszkowski2014-07-081-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code completion for case: struct Foo { int bar; }; template <typename T> struct Base { T t; }; template <typename T1 = Foo> struct Derived : Base<T1> {}; int main() { Derived<> foo; foo.t.// no code completion return 0; } Task-number: QTCREATORBUG-12606 Change-Id: Iadf2fae172739d0a5844c6b437fd2686616e64e7 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: base class and default argument for template classPrzemyslaw Gorszkowski2014-07-071-0/+13
| | | | | | | | | | | | | | | | | | | | | | Fix code completion in case: struct Foo { int bar; }; template <typename T1 = Foo> struct Derived : T1 { }; int main() { Derived<> foo; foo. // members from Foo are not proposed return 0; } Task-number: QTCREATORBUG-12605 Change-Id: Ibe35c7b9a161e789057a4518c72390ac52489a3e Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: fix include/framework path handling.Erik Verbruggen2014-07-041-1/+1
| | | | | | | | | | Instead of having two lists of paths, now only one list is used where both include paths and framework paths can be mixed. This reflects the way the compiler is invoked, and retains the (correct) search order. Task-number: QTCREATORBUG-11599 Change-Id: I373953e3e305df5b7a0d10920e12d146584adf9f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: Fix completion for lambda parametersNikolai Kosjar2014-07-041-0/+5
| | | | | Change-Id: I6db51aeba328dbb69ec59082a70be7bc2d95699b Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-06-131-0/+14
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/shared/qbs Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
| * C++: fix nested anonymous with __attribute__Przemyslaw Gorszkowski2014-06-061-0/+14
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-12345 Change-Id: Ib2316ebdc81393b38185b9cb659fb85b78753e7b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-141-0/+2
|\ \ | |/
| * Revert "C++: nested class with enclosing template class"Nikolai Kosjar2014-04-091-0/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 5d76b4339a717cd944c4a3c27eac860b8111d645 since it might lead to an infinite loop. Task-number: QTCREATORBUG-11999 Change-Id: I12c7f3afc4aa53a83ddc2bf2d33eb76c29b747ee Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-081-0/+16
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/cpptools/cppcompletion_test.cpp Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521
| * C++: nested class with enclosing template classPrzemyslaw Gorszkowski2014-04-041-0/+16
| | | | | | | | | | | | | | | | | | | | | | The parent of instantiation of nested class of template class should be the instantiation of enclosing template class. Task-number: QTCREATORBUG-11752 Change-Id: I8875c738848b85731f5ea88a60da190b4b0ad18f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | CppTools/Editor: Make sure test code is free of diagnostic messagesNikolai Kosjar2014-04-041-26/+14
| | | | | | | | | | | | | | | | ...where applicable. Change-Id: Ie42e1012598adf124e5f66b6a53eda01724dfb71 Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | C++: fix typedef resolvingPrzemyslaw Gorszkowski2014-04-041-0/+24
|/ | | | | | | | | | | | | | | | | Fix a case: struct A { int a; }; typedef A B; typedef B* Bptr; Bptr b; b-> Task-number: QTCREATORBUG-10021 Change-Id: Ibf5ca801dbdb72744416924c0b8fc03daad5948a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: fix support for nested anonymous classPrzemyslaw Gorszkowski2014-03-261-0/+14
| | | | | | | | | | | | The case when anonymous class is inside function. Fixed: * highlighting * completion Task-number: QTCREATORBUG-11711 Change-Id: Ic8fc5fdfb1aed62a74bf148ab7ed449d08214dda Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: nested class in functionPrzemyslaw Gorszkowski2014-03-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* C++: Do not set binding block as instantiationOriginPrzemyslaw Gorszkowski2014-03-251-0/+16
| | | | | | | | | | | The binding in a block should not be used as an instantiationOrigin, because it will be deleted if it does not contain any blocks or namespaces or classes or enums. Instead of that we should look for first enclosing class or namespace. Task-number: QTCREATORBUG-11424 Change-Id: I0fc6e935495478f71372b0fe6f611887f45b2eda Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: fix support for nested anonymous classesPrzemyslaw Gorszkowski2014-03-121-1/+62
| | | | | | | | | | | | | | | | | | | A member of nested anonymous class should be visible as a member of enclosing class(if there is no declaration of this nested anonymous class). Fix: * marking * find usage * follow symbol * completion Task-number: QTCREATORBUG-10876 Task-number: QTCREATORBUG-11170 Change-Id: If5b4d198e9075f2a8aa899ae59190f2c05f7b1ff Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Add tests for nested enumsOrgad Shaneh2014-01-241-0/+39
| | | | | | | | | Discarded during merge from 3.0 Task-number: QTCREATORBUG-5456 Change-Id: I0bb4756e3cdf3c87a4c2b0fbfe6953faaa5e1c52 Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | CppEditor/CppTools: Don't continue in test function on failureNikolai Kosjar2014-01-071-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | QVERIFY/QCOMPARE are meant to be called in the test function so that on failure they just can "return" and thus skip subsequent code. Since we use reusable test code in the test functions (the *TestCase classes), we need to ensure that on failure no further test code is executed. This mostly inlines the run function of the test classes into the constructor. Change-Id: I320ee032bdde0174ddfe3fdf3f9e18e19abf1d7f Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | CppEditor/CppTools: Clean up *Test* classesNikolai Kosjar2014-01-071-28/+33
| | | | | | | | | | | | | | | | * Unify class names * Fix coding style Change-Id: I7498192ba9e6b9fc0e97d3d4f0dbb30f1853a0c9 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | CppEditor/CppTools: Introduce Test{Case,Document}Nikolai Kosjar2014-01-071-26/+12
| | | | | | | | | | | | | | Move common functionality of the 12 test classes into base classes. Change-Id: If64d3cec876807ac6f991151189860a99b8ff4ca Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | CppTools: Add completion tests for enums inside class/namespaceOrgad Shaneh2013-12-281-0/+74
| | | | | | | | | | Change-Id: If088533d0b51d1750e3273d7ab732dffd110ec85 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Uncomment a test and fix itOrgad Shaneh2013-12-281-24/+23
| | | | | | | | | | | | | | The bug was fixed long time ago, the test is missing a semicolon Change-Id: I0236048d2da059fe208591469fb69541705463cf Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Replace comma with dot for test namesOrgad Shaneh2013-12-281-3/+3
| | | | | | | | | | | | | | Comma is used to separate tests on command-line Change-Id: I785d2137d54b0e1e4edbbd940042dc926719dcfc Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Fix indentation for some completion testsOrgad Shaneh2013-12-231-35/+35
| | | | | | | | | | Change-Id: I9a5bf4705da5ca88776dec70057da2c64e4c1494 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Make completion tests data-drivenOrgad Shaneh2013-12-231-1227/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following Ruby script: Fname = 'src/plugins/cpptools/cppcompletion_test.cpp' s = File.read(Fname) mod = s.gsub(/(?<declaration>void CppToolsPlugin::test_(?<test_name>[^(]+)\(\)\n\{)(?<body>.*?\n)\}/m) { |func| match = $~ declaration = match['declaration'] body = match['body'] test_name = match['test_name'].sub('_data', '') final = body.gsub(/(?:completions.clear\(\);\s+)?(?: +)[^\n]* =\n(?<code>.*?);\s*(?<completions>(?:completions.append\(QLatin1String\("[^"]*"\)\);\s*)*)QTest::newRow\("case: (?<name>.+?)"\)\s*<< code << _\("(?<prefix>[^"]+)"\) << completions;/m) { m = $~ res = " QTest::newRow(\"#{test_name}: #{m['name']}\") << _(\n#{m['code'].rstrip}\n ) << _(\"#{m['prefix']}\") << (QStringList()" m['completions'].scan(/completions.append\((.+)\);/) { |comp| res << "\n << #{comp[0]}" } res + ');' }.gsub(/(?: +)[^\n]* =\n(?<code>.*?);\n\s*CompletionTestCase test\(.+?, "(?<prefix>.+?)"\);\s*QStringList expected;\s*(?<completions>(?:expected.append\(QLatin1String\("[^"]*"\)\);\s*)*)const QStringList completions = test.getCompletions\(\);\s*QCOMPARE\(completions, expected\);/m) { m = $~ res = " QTest::newRow(\"#{test_name}\") << _(\n#{m['code'].rstrip}\n ) << _(\"#{m['prefix']}\") << (QStringList()" m['completions'].scan(/expected.append\((.+)\);/) { |comp| res << "\n << #{comp[0]}" } res + ');' }.gsub(/(?: +)[^\n]* =\n(?<code>.*?);\n\s*CompletionTestCase test\(.+?(?:, (?<prefix>".+?"))?\);\s*(?:const )?QStringList completions = test.getCompletions\(\);\s*QCOMPARE\(completions.size\(\), \d+\);(?<completions>(?:\s*QVERIFY\(completions.contains\([^\n]+\);)*)\n/m) { |mm| m = $~ res = " QTest::newRow(\"#{test_name}\") << _(\n#{m['code'].rstrip}\n ) << _(#{m['prefix']}) << (QStringList()" m['completions'].scan(/QVERIFY\(completions.contains\((.+?)\)\);/) { |comp| res << "\n << #{comp[0]}" } res + ");\n" }.gsub(/(?: +)[^\n]* =\n(?<code>.*?);\n\s*CompletionTestCase test\(.+?(?:, (?<prefix>".+?"))?\);\s*bool replaceAccessOperator = false;\s*const QStringList completions = test.getCompletions\(\&replaceAccessOperator\);\s*QCOMPARE\(completions.size\(\), \d+\);(?<completions>(?:\s*QVERIFY\(completions.contains\([^\n]+\);)*)\s*QVERIFY\((?<replace>!?)[^)]*\);\n/m) { |mm| m = $~ res = " QTest::newRow(\"#{test_name}\") << _(\n#{m['code'].rstrip}\n ) << _(#{m['prefix']}) << (QStringList()" m['completions'].scan(/QVERIFY\(completions.contains\((.+?)\)\);/) { |comp| res << "\n << #{comp[0]}" } res + ")\n << #{m['replace'].empty?};\n" } if final == body or final['QTest::addColumn'] declaration + final + "}" else final end }.gsub(/QTest::newRow\("([^"]+)"/) { |m| name = $1 if name.size > 73 space = name[0..73].rindex(/[ _]/) "QTest::newRow(\"#{name[0..space]}\"\n \"#{name[space+1..-1]}\"" else m end }.gsub(/\s+QTest::newRow/, "\n\n QTest::newRow") if mod != s File.open(Fname, 'wt').write(mod) end Change-Id: Id6bfb03cdf31ac27b36028fcdc861c340a5398f4 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Reorder completion testsOrgad Shaneh2013-12-231-316/+316
| | | | | | | | | | | | | | For reasonable diff on following commit Change-Id: I97e121355279f9166cea2f500cf2d4df5fafaa32 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Generalize data-driven test_completionOrgad Shaneh2013-12-231-37/+54
| | | | | | | | | | Change-Id: I409a00b869a95dff2d69c9744da75c324c82776a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Cleanup completion tests #2Orgad Shaneh2013-12-231-71/+70
| | | | | | | | | | Change-Id: I3c5f42de464a5607f1caa6a48d881c5a4a113ec3 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Remove superfluous comments from completion testsOrgad Shaneh2013-12-231-86/+10
| | | | | | | | | | Change-Id: I2526daeaf54f7f8d4b808cf556cff9242adaa391 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument()Eike Ziller2013-12-181-1/+1
|/ | | | | | | | Doesn't really make sense to have the additional IDocument *editorDocument() method. Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* C++: fix auto completion for member of classes accessed by usingPrzemyslaw Gorszkowski2013-11-221-0/+43
| | | | | | | | | | | | | | Example: namespace NS { struct S { int member; void fun(); }; } using NS::S; void S::fun() { mem// ctrl+space } Task-number: QTCREATORBUG-9037 Change-Id: I5a568be1b5c44deb02caa04996167a88a9c5d4d7 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: Limit typedef resolving depthNikolai Kosjar2013-10-181-49/+49
| | | | | | | | | | | This reverts commit 5be56c0 except for its tests. While it fixed the problem described in the bug report, it also introduced regressions. For now, we use a hard limit. Change-Id: I19a85be454e3d7969371707e3eb1c3d42a16ecee Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: fix endless loop during template instantiationPrzemyslaw Gorszkowski2013-10-171-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the first phase of fixing bug QTCREATORBUG-10320. This change resolves typedefs of template parameters(and resolves problem with endless loop). The next step will be matching appropriate template specialization (this is needed to solve problem with missing code completion). Missing matching: template specialization with the same parameters, e.g.: template <class T1, class T2, class T3> class T { }; template <class T1, class T2> class T<T1, T2, T2> { }; Task-number: QTCREATORBUG-10320 Change-Id: Icb6b539c021b2a67a66db9011a2e627f7d96526b Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Revert "EditorManager: Fix crash when closing an editor upon activation"Orgad Shaneh2013-10-081-2/+1
| | | | | | | | | | | | | | | Deleting an editor while currentEditorChanged is apparently not a good idea. Use a queued connection instead. This reverts commits 243a6259618e69b8da9ac2438480c449754f7f77, 447c4ed37f8904ca733d6e6253ad19bb0388f209, d9602ca550c53e60a5229bfec9539e41fa5a694c and 31034870389a512e3450e32ed990e1622bd6e679. Change-Id: Iccbee25fb77714963faa6f7184d1f5f53ed348a6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-10-011-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/coreplugin.pro src/plugins/coreplugin/coreplugin.qbs src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppquickfix_test.cpp src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp src/plugins/cpptools/cppcompletion_test.cpp Change-Id: I392229af933c1e56b9ea459d4d240a2144b4bfcb
| * CppEditor/CppTools: Fix plugin tests.Nikolai Kosjar2013-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with commit 243a625 EditorManager::closeEditors() does not delete the editors anymore, but calls deleteLater(). When the call returns, all kind of checks fail since the editor widget destructor was not yet called. Fixed by providing and calling Core::Tests::closeAndDeleteEditors(), which explicitly sends QEvent::DeferredDelete to the widget. Change-Id: I3287abbe74ccf7d7a18b997a847701c8be17cb55 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Completions: move continuations upper in proposals list.Alexey Semenko2013-09-031-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since fuzzy completions are allowed, the lexicographically first proposal is not necessarily most relevant. The patch modifies sorting of proposals so that the exact match and continuations go first, and fuzzy completions follow. Moreover, being a continuation seem to be a more important characteristic of a proposal, than being it a function argument or keyword etc. That's why the check for continuation is placed before the check for order. Task-number: QTCREATORBUG-8737 Task-number: QTCREATORBUG-9236 Change-Id: I89aae9d2ce6bfa59af7c2f75e6f3af00212008ca Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alexey Zhondin <lexxmark.dev@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | EditorManager: Use static pattern, adjust surrounding codehjk2013-08-301-1/+1
| | | | | | | | | | Change-Id: I3255a0150cd9a730336456c5a9f986eb74fefbff Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.8'Oswald Buddenhagen2013-08-211-859/+339
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/cpptools/cpptoolsplugin.h src/plugins/projectexplorer/customtoolchain.cpp src/plugins/vcsbase/command.cpp Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
View Lorry Controller Status