summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcompletionassist.cpp
Commit message (Collapse)AuthorAgeFilesLines
* C++: Fix crash in code completion.Erik Verbruggen2013-05-031-2/+2
| | | | | | | | | | Caused by a dangling pointer of a template instantiation which had been cloned into the wrong control. The fix is to remove that control and refer to the control of the bindings (which is the correct one). Change-Id: I951a60f2e613aae1e4ac901ce99c820212018709 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: fixed code completion for namespace aliasesPrzemyslaw Gorszkowski2013-04-101-1/+3
| | | | | | | | | Task-number: QTCREATORBUG-166 Change-Id: I7a19065a57bfb943e5fc4e2bd9bd81988c1175e3 Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Reduce padding in often-used structsTobias Hunger2013-02-211-1/+1
| | | | | | | | | | Reduce the padding in some often-used structs for 64bit machines. 32bit machines should also profit from most changes, but to a lesser degree. Change-Id: Ic4c67b94e962731de4f31164c52a372d78944ccc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | C++: add test-case for member access replacement in completion.Erik Verbruggen2013-01-301-24/+0
| | | | | | | | | | | | Change-Id: Id5fe00b94a6622178db9bd26f54d29efe88970f7 Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Editor: Removed useless local variable.David Schulz2013-01-211-5/+2
| | | | | | | | | | | | | | | | No need to create local variables for pointers which are used just once. Change-Id: If917689019ac1319b9f9d3aee8fa15ec5a34d751 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-161-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/android/androidrunner.cpp src/plugins/projectexplorer/kitmanager.cpp Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
| * C++: fix invalid common prefix calculation.Erik Verbruggen2013-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This was the indirect cause for "random" freezes when using code-completion. The direct cause was a while loop counting down to 0, but starting with a negative value. Both are fixed now. Task-number: QTCREATORBUG-8472 Task-number: QTCREATORBUG-8532 Change-Id: I782a46be3ac8282d7484d0bf0c6fd30be6b171c8 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | C++: Remove hard-coded configuration file name.Erik Verbruggen2012-12-041-1/+1
| | | | | | | | | | Change-Id: Ibe4cc69eafd14dab7707862b1068ce1e21b1d8e0 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppTools: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-221-7/+7
| | | | | | | | | | Change-Id: I31a6117c2b4be3f8603c16a9f98b6937a0b9aeb2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | C++: Fix regression not showing classes in completion.Nikolai Kosjar2012-11-201-1/+1
| | | | | | | | | | Change-Id: I06b4289460d623da4b70d324d0cdf53ff7c972e7 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | C++11: Correct scoping for scoped enums.Christian Kamm2012-10-311-7/+13
| | | | | | | | | | | | | | Fixes completion, highlighting and find usages. Change-Id: I1ea12c6a9c7a4f8ba0f9d55e31d6b7986233e7d8 Reviewed-by: hjk <qthjk@ovi.com>
* | CppEditor: remove operator() overloads from OverViewhjk2012-10-171-3/+3
| | | | | | | | | | | | | | Feels less obfuscated. Change-Id: Ide0ec1f38762038ddbb1eddb4f70f7d6acdf1ff7 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | C++: Introduce an ordering of completion items.Christian Kamm2012-10-151-7/+26
| | | | | | | | | | | | | | | | | | For example locals and function argument names appear early whereas macros and keywords are way down. That should move helpful items to the top of the list. Change-Id: Ibcfe973ebbac2e3bce9cafbe14dc4c71430ddca7 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Cpp: No need for accessors for simple structshjk2012-10-111-13/+13
|/ | | | | Change-Id: Ie09c1fc59dd54d2302a78cfc9769d5cda6012be7 Reviewed-by: hjk <qthjk@ovi.com>
* C++: fix member rewriting when doing template instantiation.Erik Verbruggen2012-10-111-1/+3
| | | | | | Task-number: QTCREATORBUG-7964 Change-Id: Icc7d87bb4f2d1ab0560a6c06187d9c23da9fe3e9 Reviewed-by: David Schulz <david.schulz@digia.com>
* Editor: Fix Completion of includes triggered at '.'David Schulz2012-10-101-3/+13
| | | | | | | Task-number: QTCREATORBUG-7522 Change-Id: I1a6c165b968fcb0a4058e91f95ca70d8b77a8970 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-07-241-0/+7
|\ | | | | | | | | | | | | Conflicts: src/libs/cplusplus/cplusplus-lib.pri Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
| * C++: Fix class scope completion for templates.Christian Kamm2012-07-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | * You now get completion for std::vector<int>::[complete]. * Also added a test. Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/cpptools/cpptoolsplugin.h Change-Id: I596ebf6bd18ec9a347113f8d162cc124c8a0d6b4 Reviewed-by: hjk <qthjk@ovi.com>
* | Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | | | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Added tooltips on completions proposalsSergey Shambir2012-07-171-3/+14
| | | | | | | | | | | | Change-Id: Ic22b99e25159edfa4977e13c98f334ce75809af7 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | C++: Fix potentially infinite loop in completionLeandro Melo2012-06-291-10/+11
| | | | | | | | | | | | | | | | | | Could be reproduced in code as below (cursor at |): QFormLayout|formLayout *fl = new QFormLayout(this); Change-Id: I7f5e9ac8ff8dfffbca63d7ab9f837333440c9810 Reviewed-by: hjk <qthjk@ovi.com>
* | C++: Do not reuse content in completion if it's unfinished identifierLeandro Melo2012-06-201-6/+12
| | | | | | | | | | | | | | Taskn-number: QTCREATORBUG-7521 Change-Id: I7b8edb93d143f599c93a82c82bf2c0d49c8e49e9 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | [C++] Rewrite of the preprocessor.Erik Verbruggen2012-03-291-1/+1
|/ | | | | | | | | | | | | This rewrite fixes a couple of issues with the pre-processor. It now supports: - macros in macro bodies - stringification of parameters [cpp.stringize] - the concatenation operator [cpp.concat] - #include MACRO_HERE - defined() inside macro bodies used in pp-conditions. Change-Id: Ifdb78041fb6afadf44f939a4bd66ce2832b8601f Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Do not add parentheses when completing dereferenced function.Francois Ferrand2012-03-131-1/+21
| | | | | | | | When completing function name, scan text backwards to find if we are trying to dereference the function. Change-Id: I32cabecb651ff35d949600d9fdeb61c8e68ae98f Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* [C++] Added object pool handling for CompletionAssistProvider.Erik Verbruggen2012-02-231-98/+38
| | | | | Change-Id: I89634989a7f360a30f7ed1bde4e67c93551ddfe4 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-18/+18
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-4/+4
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Improve code-assist API isSortableLeandro Melo2012-02-101-7/+9
| | | | | | | | | | | | Now IGenericProposalModel::isSortable also takes the current prefix as a parameter. This is particularly useful for cases like in the C++ completion: For global completions it will only sort if there's already a content prefix - Notice, however, that the "sorting threshold" for a maximum number of items is still kept in IGenericProposalModel::sort. Task-number: QTCREATORBUG-6404 Change-Id: I3c2f282aa565287b8b4989930b6a27093862ef25 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-241-2/+2
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* C++: Replace non-absolute-critical asserts for soft onesLeandro Melo2012-01-241-1/+2
| | | | | Change-Id: I021074a78d90929b4e83b8aff9db1ae7995e8c6a Reviewed-by: hjk <qthjk@ovi.com>
* C++: Rename source/setSource to utf8Source/setUtf8SourceLeandro Melo2012-01-131-1/+1
| | | | | | | | Continuinng a previous commit... This is in order to make the interface clearer. Change-Id: Ic1b05217f878578bc84a064927507b75981c47d6 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* C++: Accept UTF-8 byte arrays in type of expressionLeandro Melo2012-01-131-5/+6
| | | | | | | | | | | The model uses UTF-8 internally and it makes more sense to only convert when necessary. A following commit will rename the source/setSource methods in document for more clarity too. Change-Id: I960ea0754efabd1436ad4b4299a57faeb65a8bee Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | more Id type fixeshjk2011-11-101-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283 x Change-Id: Iab58bc34bc56371405d132315573b484a533b77c Reviewed-by: hjk <qthjk@ovi.com>
* | C++: Improve completion assistYuchen Deng2011-10-171-2/+13
|/ | | | | | | | | | | | | | | | | Avoid inserting characters that are already there. e.g. int testFly() {} te|Fly() When triggers a completion, the code will changed to: testFly()| But in before, the code will changed to: testFly()|Fly() Notice: Character of '|' show the cursor position. Change-Id: I6c111e30356b2549aebc6fbea05608e70d6ab41f Merge-request: 398 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* C++: Fix duplicate items in C++ completion for Qt methodsLeandro Melo2011-09-081-28/+26
| | | | | | | | | | | | | | In the old code completion engine items were created on the stack and passed around by value. With the refactoring of the code assist API they became heap objects manipulated through pointers. This patch fixes one reminiscence not caught during the refactoring in which the same actual pointer was being used more than once to be appended on the list. Change-Id: I2009fb0b6aa18df57aa5ca9bde0591536ca2cd74 Reviewed-on: http://codereview.qt-project.org/4444 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* Code assist: Fix memory leak in completionLeandro Melo2011-09-071-0/+1
| | | | | | | | | | | One fix is in the runner, which is part of the completion engine itself. The other is specific for C++. Task-number: QTCREATORBUG-5947 Change-Id: Ib8fff1eb5adad1ffb2a11da66c50b545e1457df8 Reviewed-on: http://codereview.qt.nokia.com/4355 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* C++ completion: Minimize qualified names in function signatures.Christian Kamm2011-08-081-1/+17
| | | | | | Change-Id: I8e2c38e279952372b3e12f6ea8da18b75b39a5d4 Reviewed-on: http://codereview.qt.nokia.com/2733 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* C++ editor: Share the model data acrross completion itemsLeandro Melo2011-05-261-22/+9
| | | | | | | | | More than one proposal item could be accessed during an iteration. So they should not take ownershipt of the data, but simply share it. Change-Id: I7b81b8772cd8ad4d6c2332ba6b5bc320055cd5a2 Reviewed-on: http://codereview.qt.nokia.com/136 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* C++ editor: Check _ to accept idle editor completionLeandro Melo2011-05-261-1/+1
| | | | | | | | In addition to letters and numbers. Change-Id: I89ec68c50a62516cc0b91d267fd96bb908cbf8bc Reviewed-on: http://codereview.qt.nokia.com/131 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Completion: Don't propose when there's a "good" candidateLeandro Melo2011-05-201-22/+0
| | | | | | | | This also generalizes some code previously specific to C++. Change-Id: I5774d04a45f28a4e276a0ef282ce0aa5a2f2e552 Reviewed-on: http://codereview.qt.nokia.com/48 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* C++ editor: Fix potential crash in completionLeandro Melo2011-05-191-24/+44
| | | | | | | | | | There was still a problem in the previous change (that's why it was reverted) which should be fixed now. Task-number: QTCREATORBUG-4940 Change-Id: I8a0d993b9f313fc98494cf93fed1f87939a358b1 Reviewed-on: http://codereview.qt.nokia.com/27 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* Revert "C++ editor: Fix potential crash in completion"Leandro Melo2011-05-191-17/+13
| | | | | | | | | | This reverts commit a395022a84149884771eefee9577ba2441ba45a4. There are some undesired side effects... Change-Id: I001ed375911a4ffda5bd25c804ce06f99be40e3c Reviewed-on: http://codereview.qt.nokia.com/25 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* C++ editor: Fix potential crash in completionLeandro Melo2011-05-191-13/+17
| | | | | | | Task-number: QTCREATORBUG-4940 Change-Id: If55c2ddc7949cbd31029eef8317b4d0a015f272e Reviewed-on: http://codereview.qt.nokia.com/17 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
View Lorry Controller Status