aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/texteditor/syntaxhighlighter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Some Qt6 portinghjk2020-07-221-2/+2
| | | | | | | | | - new ambiguous overloads for mapToGlobal - some functions now return qsizetype instead of int Task-number: QTCREATORBUG-24098 Change-Id: I0020e5689e093653e9e0e6f0d6263720bc2e003b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Editor: Improve splitting format range performanceDavid Schulz2020-02-101-29/+21
| | | | | | | | | Instead of copying the list and move some items individualy from one list to the other use Utils::partition. Fixes: QTCREATORBUG-23281 Change-Id: Iaf9430c041aa916feecf9214303ba30f17290ba8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TextEditor: add convenience function to clear all extra highlightsDavid Schulz2019-06-191-0/+9
| | | | | Change-Id: Id3a3c45041a23ba100447d926ed6ab829abbc92b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* TextEditor: make it obvious that formats are consumed by setExtraFormatsDavid Schulz2019-06-191-2/+2
| | | | | | | | ... by transforming the parameter to an r value and pass the argument by std::move. Change-Id: I6949ee6bbac7d8675fdbbcb62bb4f4c394bb395f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* TextEditor: add convenience function to clear additional highlightsDavid Schulz2019-06-191-0/+20
| | | | | Change-Id: Ie3cf6e7f9fb37f3e2270abaf5fca412e7a4a40da Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* TextEditor: modernize SyntaxHighlighter::setExtraFormatsDavid Schulz2019-06-191-31/+5
| | | | | Change-Id: Iaebf30d56702ef90b610d2db03c7abb40d1d2bab Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Fix build on Linux (GCC 8.2)Aaron Barany2018-12-011-1/+3
| | | | | | | | | #include <cmath> in syntaxhighlighter.cpp to have access to math functions. Use std:: namespace for math functions due to including the C++ header wrapper. Change-Id: I978cb4c54e29be38d4973f5a9cd1cede1bb49483 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* TextEditor: ModernizeAlessandro Portale2018-11-301-4/+2
| | | | | | | | modernize-* Change-Id: Ic497fea1942a77cf017be3b0033f92e3807066f1 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk@qt.io>
* TextEditor: ModernizeOrgad Shaneh2018-09-201-3/+3
| | | | | | | override, auto, nullptr, member initializers. Change-Id: I04c6ebb683849568973bd7782fb5a3279267141e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Avoid accessing global font settings from syntax highlightersEike Ziller2018-09-191-0/+8
| | | | | | Change-Id: Ic015f7449351166ec41a7745355ddc63504f6442 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix painting of current line in generic and python editorsEike Ziller2018-08-241-2/+6
| | | | | | | | | | | | | | | | | The generic highlighter and the python editor explicitly map some tokens to the format C_TEXT. Unfortunately this format is special, because it's foreground and background colors are handled by setting the editor's palette, and should not be used for setting the format on characters. If the format is explicitly set on characters, their background will be oblique and overpaint e.g. the highlight for the current line, which looks pretty ugly. Handle this directly in SyntaxHighlighter::formatForCategory for all syntax highlighters, by returning an empty QTextCharFormat for C_TEXT. Change-Id: Ifaeb556754ca8106ad6e55d7062b13b45457a809 Reviewed-by: David Schulz <david.schulz@qt.io>
* Utils: Purge asConstOrgad Shaneh2018-04-091-2/+1
| | | | | | | | Replace by qAsConst. Change-Id: I3301366f73c066c86f08df7188d70dc3b613c55c Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* TextEditor: Disconnect highlighting from text editor content changesMarco Bubke2017-07-191-8/+19
| | | | | | | | | | The syntax highligher is connected to the content changes of the text editor which is not very useful if the diagnostics been provided by an asynchronous mechanism. So we add a setter to disconnect the changes from the syntax highlighter. Change-Id: Ied4b5fe34000b13bafb1aa177b89befe6620d4d7 Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix style of whitespace in diff descriptionEike Ziller2017-07-071-0/+5
| | | | | | Task-number: QTCREATORBUG-9445 Change-Id: I1c60181b7e15c66b88cc1d5ec7584951d3aa46a0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* SyntaxHighlighter: Fix crash when typing a quote at line endOrgad Shaneh2017-05-291-1/+1
| | | | | | | in a py file. Change-Id: Icfed4db68e1183ab19dbaf83ab5c9b6083f88fca Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix highlighting of C/C++ line continuation backslashesEike Ziller2017-05-231-5/+5
| | | | | | | | | | | | The backslash itself is not a token, so we must make sure to only format the trailing whitespace characters as visual whitespace, instead of everything trailing. Broke in a92694596e804b2fc551d82f62d4ab5ab797130b Task-number: QTCREATORBUG-987 Change-Id: I4e9e84d29513ea317d7e3bde6c6b4c43749cb649 Reviewed-by: David Schulz <david.schulz@qt.io>
* Generalize function for visualizing whitespace from CppHighligherEike Ziller2017-05-231-0/+33
| | | | | | | | | | Move function which formats all non-whitespace with a given format, and all whitespace in the same range with correct whitespace highlighting (merged with the non-whitespace format), from CppHighlighter to SyntaxHighligher. Change-Id: I8cac306f6362e804698068a0df0292f88726264f Reviewed-by: David Schulz <david.schulz@qt.io>
* SyntaxHighligher: Remove the need to specify format for spacesEike Ziller2017-05-231-7/+12
| | | | | | | It has all means to know itself. Change-Id: I464c195c5ee47e5fc58414a280c166e4a332c588 Reviewed-by: David Schulz <david.schulz@qt.io>
* Simplify text format handling in syntax highlightersEike Ziller2017-05-231-3/+44
| | | | | | | | | | | | | | | | Pass the mapping from custom enum to text style in form of a function, which then can use a switch which is checked by compilers, and avoids the need to lookup a different enum somewhere else to find out what the mapping actually is. That mapping is cached to keep performance as before. Also, most highlighters created an enum just for the purpose of mapping to text styles, basically creating duplicated subsets of text style like enums everywhere. Instead provide a default, identity mapping from text styles to text styles. Change-Id: I2ea1ca702b99e36b8742dfda510b1b2753f0a1c2 Reviewed-by: David Schulz <david.schulz@qt.io>
* SyntaxHighlighter: Remove useless code branchEike Ziller2017-05-171-11/+0
| | | | | Change-Id: I20ea87cf43bae9540707c1e765e40e4baee93357 Reviewed-by: David Schulz <david.schulz@qt.io>
* TextEditor: Complete transition to Qt5-style connectsOrgad Shaneh2017-03-201-16/+16
| | | | | Change-Id: I78c84254a5ea56b5f9a478b6e1c9b4ed58937687 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* TextEditor: Remove use of deprecated additionalFormatsOrgad Shaneh2016-08-101-17/+17
| | | | | | | Replace with formats Change-Id: I9a24c0ad138c378aed1c49a15b80b7f64edabe30 Reviewed-by: David Schulz <david.schulz@qt.io>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Clean exported headers of the TextEditor plugin.Friedemann Kleint2015-02-261-0/+2
| | | | | Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | TextEditor: Remove unneeded qualificationsOrgad Shaneh2015-02-061-7/+8
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: Ief087658e2adc337ee02c49f0fb406597114df07 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.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>
* | TextEditor: More BaseText* -> Text* renamingshjk2014-09-261-4/+4
| | | | | | | | | | | | | | *Document* and *Layout* classes, all basetext* files Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Vcs: Convert to new editor construction schemehjk2014-08-281-2/+4
| | | | | | | | | | Change-Id: I4b4516c8cdf1a934a7865ac6dce904a244995b5b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Clean up/streamline SyntaxHighlighter setuphjk2014-08-271-7/+0
|/ | | | | | | | No need for the third construction way if that's not really used by the factories anyway. Change-Id: Id3b34da5b0320babae9bef96a79bbaa52e0db06d Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Reinvent deprecated qSort as Utils::sortNikita Baryshnikov2014-06-191-2/+3
| | | | | | | Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix SyntaxHighlighter documentation.Erik Verbruggen2014-04-141-74/+23
| | | | | Change-Id: Icf30cf6683f5cc04f3801465148d95bed2002a4a Reviewed-by: David Schulz <david.schulz@digia.com>
* TextEditors: Avoid sending contentsChanged signal when rehighlightingEike Ziller2014-02-041-2/+0
| | | | | | | | | | | That avoids a complete reparse of the document when font settings change, but in turn now requires an explicit redo of semantic highlighting in that case. The cpp editor part of this patch is actually still doing semantic parsing though. This will be fixed up in a later patch. Change-Id: I6f51a18cba6325856c96e155700eb912f6d3aad5 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@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>
* Rename "[Mm]ethod(s)" to "[Ff]unction(s)"Nikolai Kosjar2013-10-101-1/+1
| | | | | | | | | | | Only methods as programming functions are affected. Besides renaming some actions like "Switch Between Function Declaration/Definition" this mostly touches (api) code comments. This is a follow-up patch to commit 872bfb7. Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-09-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/extensionsystem/pluginmanager.cpp src/libs/extensionsystem/pluginspec.cpp src/plugins/coreplugin/basefilewizard.cpp src/plugins/coreplugin/coreplugin.pro src/plugins/coreplugin/coreplugin.qbs src/plugins/coreplugin/editormanager/ieditor.cpp src/plugins/coreplugin/externaltool.cpp src/plugins/coreplugin/icore.cpp src/plugins/cpptools/cppmodelmanager.cpp src/plugins/fakevim/fakevimhandler.cpp src/plugins/find/ifindfilter.cpp src/plugins/projectexplorer/buildstep.cpp src/plugins/projectexplorer/devicesupport/idevice.cpp src/plugins/projectexplorer/runconfiguration.cpp src/plugins/vcsbase/vcsbaseeditor.cpp tests/system/suite_debugger/tst_simple_analyze/test.py Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
| * Doc: edit texteditor plugin API docsLeena Miettinen2013-09-111-2/+2
| | | | | | | | | | | | | | | | | | Fix grammar and style issues and punctuation. Use the \a command instead of \param (not a QDoc command). Change-Id: Ib048f0219a2c857e5fc3fcd858afbcbd58819193 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Apply static pattern to TextEditorSettinghjk2013-09-201-1/+1
| | | | | | | | | | Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Add common interface for text formats inside syntax highlighterjkobus2013-08-261-0/+34
|/ | | | | | Change-Id: I87f64446161a57aea0896f68e4eafacef791969b Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Doc: Remove \fn lines adjacent to functionsOrgad Shaneh2013-06-051-2/+0
| | | | | | | They are unneeded, some of them are unmaintained Change-Id: I0ad87e152d8e2328b486b2f904f7cf9613004afe Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Clean headers in TextEditor.Friedemann Kleint2013-03-271-7/+0
| | | | | Change-Id: Ie679e7e9d0d20a0f71dcc1fcf0f7d8305eeeeced Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* C++: optimize the semantic highlighting in the UI thread.Erik Verbruggen2013-02-261-10/+12
| | | | | | | | Done by reserving enough space in for the various QLists when created, and by preventing unnecessary copying of lists. Change-Id: I5a9f0f7042bbaa1cf5eb076b956c35f2191468c6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@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>
* | Improve color highlighting of memory view.Friedemann Kleint2012-11-151-0/+36
|/ | | | | | | | | | Factor out and streamline code from the annotation highlighter to create a list of colors suitable for highlighting and use that in memory view. Task-number: QTCREATORBUG-8250 Change-Id: Iefd408847897ddc98e3aecd6e4f084d1415b80c0 Reviewed-by: hjk <qthjk@ovi.com>
* C++: do not set any highlighting ranges on empty lines.Erik Verbruggen2012-10-151-2/+5
| | | | | | | | | | This can happen when the semantic highlighter (which runs in a future) calculates a range for a document that has been changed in the meantime. Task-number: QTCREATORBUG-7995 Change-Id: Ibcd1a6ae840e08570a6b6ea4caf411e799ec26c8 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Adjust license headershjk2012-10-051-20/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 04:23:06 +0000