aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmljseditor
Commit message (Collapse)AuthorAgeFilesLines
* Make some qHash and comparison operators overloads hidden friendshjk2021-12-061-28/+28
| | | | | | | Restricts lookup scope more to necessary bits. Change-Id: Ia42c95aaa70534843b7f6a90bfc56d2a1202c612 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlJSEditor: block non Utf8 codecsDavid Schulz2021-11-093-2/+9
| | | | | | | | | Additionally adjust the postioning of the initial setCodec to all other forced codecs. Change-Id: Id60bfdac858851e5ad6554ff2dbcb3dd5b806c0b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/5.0' into 6.0Eike Ziller2021-10-081-2/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I87b19a51b1950d19eff95086848b0728ba2f0ebd
| * qmljseditor: fix crash at shutdownTim Jenssen2021-10-061-2/+1
| | | | | | | | | | | | Change-Id: Ifae7ec5f378c0b2d3e667bd26a509fbcbefadecf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Utils: Remove uses of deprecated PathChooser::path()hjk2021-09-281-1/+1
| | | | | | | | | | | | | | There's filePath() nowadays. Change-Id: Ief06bd07a69a287d6a5ca3c41eb7069dba869d52 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Editor: pass AssistInterface to createProcessorDavid Schulz2021-09-165-5/+5
| | | | | | | | | | | | | | | | | | The interface can be used for checking the context of a codeassist request to determine the correct processor that has to be created. Change-Id: I47ddb05c46399566e27bae21711f11a3a4132c3f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/5.0'Eike Ziller2021-09-071-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/processreaper.cpp src/plugins/clangcodemodel/clangmodelmanagersupport.cpp src/plugins/cmakeprojectmanager/cmakeprocess.cpp Change-Id: Ie248bcb02a80f3e02ab19d73033ce2ba31e7fd83
| * QmlJS: Prepend "My" to default component nameThomas Hartmann2021-09-031-0/+1
| | | | | | | | | | | | | | Task-number: QDS-3313 Change-Id: I1bd9944a63333d38c9fd77801ef63d7d55787878 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Pass QFutureInterface by referenceJarek Kobus2021-08-301-2/+2
| | | | | | | | | | | | | | | | No need for a copy. Change-Id: I0308da77199942ef49e36fb04e81713cb9d9a901 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/5.0'Eike Ziller2021-08-111-1/+1
|\| | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/locator/executefilter.cpp Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
| * Fix some compiler warningsChristian Kandeler2021-08-091-1/+1
| | | | | | | | | | | | Change-Id: I4eaf47bda086b83618f461ab19d1715c67e27ae1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Vcs: Use more FilePath for file pathshjk2021-08-021-1/+2
| | | | | | | | | | Change-Id: I855cde65d034a9647972a7fddf1e8266d7ccfa88 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Utils: Use FilePath in DropSupporthjk2021-08-021-1/+1
| | | | | | | | | | Change-Id: Id048d0dab4c58be367a081bb8041214abd6dbf98 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Vcs: Use FilePath in IVersionControl APIhjk2021-07-291-1/+1
|/ | | | | | | | Adapt first level of users. Change-Id: Ifcd7bff45631ff3b9e26a9e3176daa6cf0cf2e56 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ProjectExplorer: Use FilePaths in project tree nodeshjk2021-07-161-1/+2
| | | | | Change-Id: I31b15c428d9b962333947b1e32641fd80f61d069 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QML/JS Editor: Fix UI textLeena Miettinen2021-07-081-3/+3
| | | | | | Task-number: QTCREATORBUG-25915 Change-Id: I96da82dee989cc1833e1219f33cbee072df19f83 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Core: use FilePaths to notify files changed internallyDavid Schulz2021-06-231-5/+7
| | | | | Change-Id: I2fce65ad340f18292fc0286233e78aaf769a130d Reviewed-by: hjk <hjk@qt.io>
* Do not pass QStringView by const referenceKai Köhne2021-06-175-8/+8
| | | | | | | | | | That's what the documentation says: https://doc.qt.io/qt-6/qstringview.html#details Change-Id: I0b41fc4abad1601c0ed416a505534cf7ae7633e1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TextEditor: filepathify RefactoringChangesDavid Schulz2021-06-083-4/+6
| | | | | Change-Id: Ie97e484bcdeaa0cb2f5d04b3c79ace55ff2e426c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: filepathify LinkDavid Schulz2021-05-251-4/+4
| | | | | Change-Id: Ie62500bde139158e776f9698ee0ea00c2a113f93 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Use Utils::FutureSynchronizer instead of QFutureSynchronizerJarek Kobus2021-05-122-3/+3
| | | | | | Change-Id: Iecfa676f58e5ca82be7c9c94233dcc8d3654c2d7 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix a possible crash in FindReferences on shutdownJarek Kobus2021-05-122-0/+6
| | | | | | | | | Cancel and wait for all threads started by FindReferences in its destructor. Task-number: QTCREATORBUG-25711 Change-Id: I83c3ea832a173a7fff5c52e0c0136dfff2234afe Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix build with Qt 6Eike Ziller2021-05-121-1/+1
| | | | | | | | Amends 1e263274720 Change-Id: Ibbd1a71e46f6b4ea6feb81983a2bc9a49661cc3d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Make SemanticHighlighter::run() cancelableJarek Kobus2021-05-111-0/+5
| | | | | | | | In case the task needs to be canceled, stop doing its job and return as soon as possible. Change-Id: Id5a3462d9f0a19eda782aebdd4c25407318118db Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Synchronize all started threads in SemanticHighlighter d'torJarek Kobus2021-05-112-2/+6
| | | | | | | | This fixes a possible crash on session switch or on shutdown. Task-number: QTCREATORBUG-25708 Change-Id: I5dcc2420dca27b9856f47616c6f465ae8f059942 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Core: Add a default parameter to various ICore::*path functionshjk2021-04-272-4/+3
| | | | | | | | Saves some code on the user side. Change-Id: I32cd220b6e533f5497a1865f9c34ab9db4cfda79 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ICore: Change some path API to use FilePathEike Ziller2021-04-262-4/+5
| | | | | | Change-Id: Id841d6177206a021c9e606ce560b47d1ae6e52b9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* QDS Components: Replace "item" with "component" in UI textLeena Miettinen2021-03-191-1/+1
| | | | | | Task-number: QDS-3778 Change-Id: I67cfaad948fe9a43b2312cdb5e248d0849b7c6d9 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix search result font for symbol searchesEike Ziller2021-03-021-0/+1
| | | | | | | | | | | | SearchResultItem defaults to the standard application font, we need to tell it to use the text editor font explicitly, like the specialized addResult method did that was removed. Amends d3deefc3a4306e5b8882c7388f2ef1684dc0d922 Fixes: QTCREATORBUG-25396 Change-Id: Id8d41d93c96fbfd6d993568a37d42509da452665 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Core: Streamline SearchResultWindow interfaceChristian Kandeler2021-02-181-5/+5
| | | | | | | | | | That is, make SearchResultItem the one data type for adding search results. This will allow us to add additional properties to search results without adding more and more parameters to a bunch of functions. Change-Id: Ic2740477ae47449cee75caa2525727fe2b460f91 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove unused includes of mutex classesJarek Kobus2021-02-181-1/+0
| | | | | Change-Id: I5a34cda0b27786cb37e642479b11fbd24b8b5c36 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/4.14'Tim Jenssen2021-01-071-2/+8
|\ | | | | | | Change-Id: I70504e096be620434f38cd990c593950da8b24ba
| * QmlJSEditor: Ensure extra selections are orderedChristian Stenger2021-01-071-2/+8
| | | | | | | | | | | | | | | | | | | | | | The code model may provide selections that are not ordered as they appear inside the document due to the declarative nature of QML. Ordering before using them avoids couple of warnings stating "overlay selections not in order". Change-Id: Ie912e94aa01ffde52b01dca7a9bde24ae02e8b33 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* | Don't access static functions/fields via instanceAlessandro Portale2020-11-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Courtesy of readability-static-accessed-through-instance Amends: b2a766a79ac778febff87f0def34cf6d3f4f93e3 Round #2: This time done with Qt Creator's Analyzer, which found other occurences than run-clang-tidy.py Change-Id: I479e280c7abcf2d24baccbb0af69ae4bda05198e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/4.14'Eike Ziller2020-11-193-4/+3
|\| | | | | | | Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
| * Don't clash signal names with other methodsJarek Kobus2020-11-182-3/+3
| | | | | | | | | | | | | | | | | | | | In case when signal name clashes with other method name - rename accordingly. Remove some repeated signal declarations - they are already declared in superclass. Change-Id: Ie1430b85d6436d26996494fa44c7554fb354b6ce Reviewed-by: hjk <hjk@qt.io>
| * Remove QStringRef leftoversJarek Kobus2020-11-161-1/+0
| | | | | | | | | | Change-Id: I3cf4a4f58b9c7a8572745c73451c483f3d52e606 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Don't access static functions/fields via instanceAlessandro Portale2020-11-192-3/+3
|/ | | | | | | Courtesy of readability-static-accessed-through-instance Change-Id: I71f54244f1e091315dac2943d9e1bfad6efa56a9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Remove unneeded includesJarek Kobus2020-11-122-12/+11
| | | | | Change-Id: I67fee9303509b7080e123a2a5826e200ce498ce2 Reviewed-by: hjk <hjk@qt.io>
* qml: fix refactoring to separate componentFawzi Mohamed2020-09-301-0/+3
| | | | | | | | | * avoid extra spaces * warn about existing files Fixes: QTCREATORBUG-21091 Change-Id: Ic9ed4444bd028455e1b2d1755e6c43f352dfd5e3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Adapt to key sequence changes in Qt6Eike Ziller2020-09-291-2/+2
| | | | | | | | | | Use operator| instead of operator+ which was removed. Individual keys in QKeySequence are now QKeyCombinations instead of ints. Task-number: QTCREATORBUG-24098 Change-Id: I43a6122cf660e6a6de7edbf3ac9954e0a39cec06 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Remove bool return value from IEditor::restoreState()Eike Ziller2020-09-242-3/+3
| | | | | | | | It's never used, and actually there wouldn't be any sensible thing to do with it. Change-Id: Id8a8df18c7db4b98e5abbc034240bb90dc1dcaa9 Reviewed-by: hjk <hjk@qt.io>
* Make QmlJS(Tools) build with Qt5 & Qt6Eike Ziller2020-09-177-28/+32
| | | | | | | Port from QStringRef to QStringView Change-Id: I472d16f20e40ca52b8e5d481850a6bd8a1a38f3b Reviewed-by: hjk <hjk@qt.io>
* TextEditor: use Utils::FilePath as file member in AssistInterfaceDavid Schulz2020-09-044-10/+7
| | | | | Change-Id: I3bf9b013b9350411f918efdb9d1a36a2c22bf972 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Core: replace QString with Utils::FilePath to get documentsDavid Schulz2020-09-041-1/+1
| | | | | Change-Id: I01777c227398be8bd3bf877c5429b84a75aa361b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TextEditor: Make threshold for automatic completion configurableChristian Kandeler2020-08-131-1/+2
| | | | | | Fixes: QTCREATORBUG-19920 Change-Id: Id6be79485b1fb8c2ab4cce2706816949ae5e217b Reviewed-by: David Schulz <david.schulz@qt.io>
* Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-101-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildstep.cpp src/plugins/cmakeprojectmanager/cmakebuildstep.h tests/auto/debugger/tst_namedemangler.cpp tests/auto/qml/codemodel/check/tst_check.cpp Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
| * QmlDesigner: Fix duplicate items auto completionHenning Gruendl2020-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | Fix duplicate items in the auto completion result by trimming the strings. Otherwise items like "Item " and "Item" will both show up in the result. Task-number: QDS-2561 Change-Id: I0244fed19cf358d5c72ee169cd8ffa13672edce2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Core/Utils: Migrate further to Utils::Idhjk2020-07-067-9/+9
| | | | | | | | | | | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Various Qt6 portinghjk2020-07-161-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename QHashSeedType to QHashValueType and use it also for return values. Use qHashMulti directly instead of continuing using temporary QPairs. Avoids ugly namespace tricks to find the new pair overloads, and is actually clearer. Classes used in signals cannot be forward-declared. ... Change-Id: I22450a0c642437a43f876e8e89cc8788fff3db61 Reviewed-by: Christian Stenger <christian.stenger@qt.io>