Commit Graph

459 Commits

Author SHA1 Message Date
Erik Verbruggen
8de6ccc775 Revert "Split Objective-C keyword parsing to handle the '@' separately."
This reverts commit 2a59d2ae0c.
2010-02-15 12:24:31 +01:00
Erik Verbruggen
2a59d2ae0c Split Objective-C keyword parsing to handle the '@' separately.
Because apparently, while designing the Objective-C language, somebody
thought it was a world-class idea to allow any white-space between the
'@' character and the subsequent keyword. With this fix, we now
correctly parse:
    @  dynamic
and:
    @
      selector
and:
    @"foo"
     "bar"
    @"mooze"
(This last one is 1 single string split over multiple lines.)
Wonderful, isn't it?

What we (and Clang) do not support, but what GCC supports is something
like:
   @"foo"@@  "bar"  @"mooze"  @@
which is equivalent to @"foobarmooze".
2010-02-15 09:27:00 +01:00
Friedemann Kleint
674486a7fa CppCodeModelSupport: functionAt: Prepend namespaces to name.
To improve CDB debugger tooltips which go via the function name.
2010-02-04 15:16:35 +01:00
Wolfgang Beck
e134e24919 Source update. 2010-02-03 13:21:08 +10:00
Friedemann Kleint
f672bff338 Fix some code scanning issues.
foreach()-Loops.
2010-02-01 14:00:07 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
Roberto Raggi
1ba889a1bf Generalized the filtering of completion items. 2010-01-26 11:44:45 +01:00
Thorbjørn Lindeijer
49d511502f Fixed compile warning 2010-01-20 17:58:49 +01:00
Wolfgang Beck
4b33881729 Merge ichecker branch changes into the mainline. New project can be found under src/tools/ICheck 2010-01-19 15:26:08 +10:00
Thorbjørn Lindeijer
f3b738bb66 Reuse local snapshot reference 2010-01-14 11:54:11 +01:00
con
7199223a6e Merge remote branch 'origin/1.3'
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmleditor/QmlEditor.pluginspec
	src/plugins/qmleditor/idcollector.cpp
	src/plugins/qmleditor/idcollector.h
	src/plugins/qmleditor/parser/qmljsglobal_p.h
	src/plugins/qmleditor/qmlcodecompletion.cpp
	src/plugins/qmleditor/qmlcodeformatter.cpp
	src/plugins/qmleditor/qmlcodeformatter.h
	src/plugins/qmleditor/qmlexpressionundercursor.cpp
	src/plugins/qmleditor/qmllookupcontext.cpp
	src/plugins/qmleditor/qmlresolveexpression.cpp
	src/plugins/qmleditor/qmlsymbol.cpp
	src/plugins/qmleditor/qmlsymbol.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	src/shared/qml/parser/qmljsast.cpp
	src/shared/qml/parser/qmljsast_p.h
	src/shared/qml/parser/qmljsastfwd_p.h
	src/shared/qml/parser/qmljsastvisitor.cpp
	src/shared/qml/parser/qmljsastvisitor_p.h
	src/shared/qml/parser/qmljsengine_p.cpp
	src/shared/qml/parser/qmljsengine_p.h
	src/shared/qml/parser/qmljsgrammar.cpp
	src/shared/qml/parser/qmljsgrammar_p.h
	src/shared/qml/parser/qmljslexer.cpp
	src/shared/qml/parser/qmljslexer_p.h
	src/shared/qml/parser/qmljsmemorypool_p.h
	src/shared/qml/parser/qmljsnodepool_p.h
	src/shared/qml/parser/qmljsparser.cpp
	src/shared/qml/parser/qmljsparser_p.h
2010-01-12 18:02:04 +01:00
dt
60c8686ed8 Add the precompiled headers to the project info
QMake passes those headers directly to gcc, so the user doesn't need to
include themselves.
2010-01-12 13:19:15 +01:00
Roberto Raggi
3ec38cbe5b Keep the snapshot around when performing a global completion 2010-01-12 12:31:27 +01:00
con
a24738ffab Fixes: Diff editors don't get correct name.
They were no longer showing e.g. the file name of the diffed file.
Also separate editor id and editor context a bit.
2010-01-11 16:54:30 +01:00
Roberto Raggi
421f5323f1 Split CppCodeCompletion::startCompletion(). 2010-01-11 14:08:15 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
con
2e495e7075 Version bump. 2010-01-07 18:17:10 +01:00
Thorbjørn Lindeijer
aeaaa39225 Use the completion case sensitivity settings also for relevance
Avoids some annoyance for people using case-sensitive completion, when
unrelated completions items would get higher relevance because they
start with the typed string when matched case-insensitively.

In case-insensitive mode, a case-sensitive prefix match now does get a
higher relevance than a case-insensitive match.

Reviewed-by: con
2010-01-07 15:42:08 +01:00
ck
dedea5ea19 Move Q_DECLARE_OPERATORS_FOR_FLAGS out of namespaces.
If this macro is used inside a namespace, it hides global operators.

Reviewed-by: hjk
2010-01-07 13:53:48 +01:00
Christian Kamm
f90f9e4879 Find macro uses.
Reviewed-by: Erik Verbruggen
2009-12-21 14:57:05 +01:00
Christian Kamm
c3cc7cf4d8 Enhance data stored for macros and macro uses.
In preparation for finding macro uses.

* Macro: add offset and length
* MacroUse: add line
* Document: add convenience functions for finding a macro definition, use
  or undefined use at a given location.

Reviewed-by: Erik Verbruggen
2009-12-21 14:57:05 +01:00
con
6c27faf0fc Remove unused code. 2009-12-21 12:11:15 +01:00
con
1a95f6f205 Implement string based search & replace in multiple files.
This uses the same UI as "Rename Symbol".
Moves the actual rename implementation to a static method in
BaseFileFind and uses it for rename symbol and search & replace.
Moves the signal notification for the code model from VCSManager to
the more general FileManager.
Note that as for rename symbol, there's no undo yet.

Task-number: QTCREATORBUG-73
2009-12-21 11:08:52 +01:00
Daniel Molkentin
3cf861a8ce Add windows definitions to make the code model happy.
__stdcall for all compilers (MSVC and MinGW, possibly others may use it)
__w64 is MSVC only, deprecated there, but still used in some places

Reviewed-By: Roberto Raggi
(cherry picked from commit 5832c6b584)
2009-12-18 13:57:32 +01:00
Roberto Raggi
51de95c497 Use the text editor revision to ignore outdated parse results. 2009-12-15 15:52:55 +01:00
Roberto Raggi
aa8a670669 Hide the implementation details of CppModelManagerInterface::WorkingCopy. 2009-12-15 15:26:40 +01:00
Roberto Raggi
b168eec2a1 Replaced the hardcoded QHash<QString, QString> with CppModelManagerInterface::WorkingCopy. 2009-12-15 15:16:46 +01:00
Tobias Hunger
8fbe994053 Fix warning about use of uninitialized value
Reviewed-by: thorbjorn
2009-12-15 10:16:02 +01:00
Thorbjørn Lindeijer
46e612761f Be smarter about CamelCase when doing case-insensitive completion
Even when an upper case character can also match a lower case one, it
should only be treated as a CamelCase match when the matched character
is also upper case. This avoids some false positives.

Also, the part that allows a word in a CamelCase identifier to be
truncated should never be matched case-insensitively.
2009-12-11 14:38:28 +01:00
Daniel Molkentin
5832c6b584 Add windows definitions to make the code model happy.
__stdcall for all compilers (MSVC and MinGW, possibly others may use it)
__w64 is MSVC only, deprecated there, but still used in some places

Reviewed-By: Roberto Raggi
2009-12-10 16:38:19 +01:00
Roberto Raggi
116acbbae0 Removed dummy #defines for __asm__ and __asm 2009-12-10 12:42:06 +01:00
Roberto Raggi
f03ce847db Search symbols also in enum scopes. 2009-12-10 10:24:31 +01:00
Thorbjørn Lindeijer
3f1b45b057 Implemented first-letter case-sensitive for completion as default
By default now only the first letter is case-sensitive. It is still
possible to choose full or no case-sensitivity as well.

Task-number: QTCREATORBUG-236
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2009-12-09 19:26:34 +01:00
Roberto Raggi
3d2e454358 Add only symbols declared in class scopes when performing class-completion. 2009-12-08 12:43:40 +01:00
Roberto Raggi
bdb4e48ebf Store the working list in a QHash. 2009-12-07 12:47:45 +01:00
Roberto Raggi
0614e19ddc Rename MyProcess and MyReduce. 2009-12-07 12:47:45 +01:00
Roberto Raggi
15ee71b324 Disable the indexer when m_indexerEnabled is false. 2009-12-07 12:03:31 +01:00
Roberto Raggi
60caec48d1 Store the documents in an hash. 2009-12-07 11:12:55 +01:00
Roberto Raggi
14376c3c32 Initial work on the new CPlusPlus::Snapshot.
Encapsulate the details.
2009-12-07 10:54:27 +01:00
Roberto Raggi
de86a1f4f4 Removed unused formal argument. 2009-12-04 13:30:05 +01:00
Roberto Raggi
aae5b92125 Use mappedReduce when searching for the usages of a symbol. 2009-12-04 13:04:47 +01:00
con
8b9c748abb Merge remote branch 'origin/1.3' 2009-12-03 15:15:08 +01:00
Roberto Raggi
43df685c68 Removed useless arguments 2009-12-03 11:59:37 +01:00
Thorbjørn Lindeijer
5373017abd Fixed inline implemented methods not showing up in the methods filter
Done with Roberto Raggi.

Task-number: QTCREATORBUG-405
2009-12-03 11:34:31 +01:00
Roberto Raggi
8741494f41 Rename dependsOn() in filesDepedingOn() and introduced Snapshot::dependencyTable(). 2009-12-02 17:07:10 +01:00
Roberto Raggi
f3bebd7f1b Moved Completion::getCompletion() in ICompletionCollector and made the filtering of completion items more C++ friendly. 2009-12-02 12:18:12 +01:00
Roberto Raggi
d5c2dedd8a Save the usages. 2009-12-02 12:16:41 +01:00
Roberto Raggi
e84de32ad1 Use resultsReadyAt. 2009-12-01 17:07:50 +01:00