summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/MatchingText.cpp
Commit message (Collapse)AuthorAgeFilesLines
* C++: Accept language features in BackwardsScanner et alOrgad Shaneh2015-02-271-2/+3
| | | | | Change-Id: Id97ca27fa909979573efca12dc0cd14b28eacd17 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | CPlusPlus: Simplify MatchingText interfacehjk2014-09-171-8/+5
|/ | | | | Change-Id: I46878d9ca048d0c79032445f5adc27c12d27f30c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* 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>
* Fix coding style for else statementsOrgad Shaneh2013-07-171-1/+1
| | | | | Change-Id: I1309db70e98d678e150388c76ce665e988fdf081 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* fix include style relating to cplusplus librariesOswald Buddenhagen2013-04-031-2/+3
| | | | | | | | | | | ... and adjust INCLUDEPATH accordingly. while i'm at messing with include statements, also re-order the include blocks according to policy and sort them within bigger blocks. Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* CplusPlus: Remove pragma suppressing gcc warning.Christian Kandeler2012-10-151-9/+0
| | | | | | | | The respective warning was provoked by Qt code, which has been fixed and no longer causes that problem. Change-Id: I1b9efc2e6f9d2af7719d4c921f37f8335c351bfe Reviewed-by: hjk <qthjk@ovi.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* rename QtDebug to QDebughjk2012-08-061-1/+1
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* C++: Introduce unicode char/strings supportLeandro Melo2012-06-061-2/+2
| | | | | | | | | | | | | | Those are the types char16_t and char32_t along with the new char/string literals u'', U'', u"", u8"", and U"". This is particularly important for the use of QStringLiteral since in some platforms it relies on expansion such as above. Note: The string literals quickfixes still need some tunning. Task-number: QTCREATORBUG-7449 Change-Id: Iebcfea15677dc8e0ebb6143def89a5477e1be7d4 Reviewed-by: hjk <qthjk@ovi.com>
* Silence a warning about unrecognised pragma with ICCThiago Macieira2012-05-281-1/+1
| | | | | | | | | | | | src/libs/cplusplus/MatchingText.cpp(64): warning #161: unrecognized #pragma # pragma GCC diagnostic ignored "-Wstrict-overflow" ^ This pragma is recognised in GCC only, so don't enable it for when ICC fakes to be GCC. Change-Id: I3d9830dc2b12632dd08d8c8961219bd253ad8c1d Reviewed-by: hjk <qthjk@ovi.com>
* C++: Lambda formatting issues.Flex Ferrum2012-03-121-4/+9
| | | | | | | | Fix code formatting in cases when '{' and '}' appear within expression context (ex. lambda expression, initializer lists). Change-Id: I42b28170a8d6d5fd08a9a1a8d8e7698219c18966 Reviewed-by: Erik Verbruggen <erik.verbruggen@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>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* 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>
* Disable gcc warning about always-true Q_ASSERT checkKai Koehne2011-08-171-0/+9
| | | | | | | | | gcc 4.5.1 warned about the Q_ASSERT in QStringRef::at() being always false for isCompleteStringLiteral, isCompleteCharLiteral. Change-Id: Idb20f81f92876eff685166c8deeebd6e151303b1 Reviewed-on: http://codereview.qt.nokia.com/3070 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* Exported header cleanup.Friedemann Kleint2011-01-201-0/+3
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* Removing SimpleTokenErik Verbruggen2010-07-021-4/+4
|
* Removed the TokenCache.Erik Verbruggen2010-07-021-7/+2
|
* Merge branch '2.0'Thorbjørn Lindeijer2010-06-151-2/+2
|\ | | | | | | | | | | | | Conflicts: src/plugins/cppeditor/cppquickfix.cpp src/plugins/mercurial/mercurialjobrunner.cpp src/plugins/subversion/subversionplugin.cpp
| * Fixed handling of text wrapping and a text layout corner caseThorbjørn Lindeijer2010-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | Due to using QTextCursor::columnNumber() instead of QTextCursor::positionInBlock(), a lot of code would not work correctly when used with wrapped lines. In addition, there was an issue with columnNumber() returning 0 right after inserting a character before the last character of a line. Reviewed-by: mae
* | Merge branch 'origin/2.0' (early part)Erik Verbruggen2010-06-151-3/+3
|\ \ | |/
| * Don't pass QChar as const & since it's just a unsigned shortThorbjørn Lindeijer2010-06-141-3/+3
| | | | | | | | Reviewed-by: ogoffart
* | Introduced token caching to prevent repetetive tokenizing.Erik Verbruggen2010-06-141-3/+5
| | | | | | | | | | | | Also removed TokenUnderCursor as it's functionality is in the token cache. Reviewed-by: ckamm
* | Revert "Introduced a token cache for the C++ editor."Erik Verbruggen2010-06-041-5/+3
| | | | | | | | This reverts commit c2393df02332618c8cf6159d9d6f6a40041ced89.
* | Introduced a token cache for the C++ editor.Erik Verbruggen2010-06-041-3/+5
|/ | | | | This should speed things up a bit, because before, the line was tokenized at least 3 times.
* Long live the king!hjk2010-03-051-1/+1
|
* Added semicolon after } when creating unnamed enumerationRoquette2010-02-011-1/+1
| | | | | | Task-number: QTCREATORBUG-643 Merge-request: 109 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* Insert semicolon when matching enum declarations.Roberto Raggi2009-11-161-1/+1
| | | | Task-number: QTCREATORBUG-282
* Remove debuggign outputdt2009-10-061-2/+0
|
* Don't override escaped quotes.Roberto Raggi2009-10-051-8/+32
|
* Remove all the synthesized characters when matching curly bracesRoberto Raggi2009-09-211-4/+10
|
* Made the indenter more Qt friendly. Added support for moc keywords.Roberto Raggi2009-09-211-6/+6
|
* Renamed maybeOverrideCharacter()Roberto Raggi2009-09-181-2/+2
|
* CleanupRoberto Raggi2009-09-181-20/+17
|
* Introduced MatchingText::shouldInsertNewline() and use it to insert lines ↵Roberto Raggi2009-09-181-5/+41
| | | | after a class definition.
* Re-enable check for automatically inserted block end.Roberto Raggi2009-09-171-2/+1
|
* Pass the lookahead character to matching text.Roberto Raggi2009-09-171-2/+23
|
* Automagically insert matching characters.Roberto Raggi2009-09-171-1/+108
|
* Added the helper class MatchingText and use it to automagically insert text ↵Roberto Raggi2009-09-171-0/+131
for curly braces.
View Lorry Controller Status