aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmljs/qmljsscanner.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Libs: Cleanup lambdasJarek Kobus2023-12-121-1/+1
| | | | | Change-Id: I715a124dd73f23c735dde27d3205ac7613ae04c6 Reviewed-by: hjk <hjk@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmljsscanner: fix fallthough in nullish coaleshingFawzi Mohamed2022-06-031-0/+2
| | | | | Change-Id: I05c03be4025f7c49d613c350f17cb108ae752ae6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qmljs: add # as commentFawzi Mohamed2022-05-231-0/+6
| | | | | Change-Id: I87a043a39eae57306bc81b3c83f7a363d53be4bd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* qmljsreformatter: support nullish coalescingFawzi Mohamed2022-05-061-0/+12
| | | | | | | | | | qmljsscanner did interpret ?? and ?. as a single ? and thus as the start of a ternary operator, breaking reformatting. Fixes: QTCREATORBUG-27344 Change-Id: I0429d20aed0196743f1c20e6ceac11351d5a7a3b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlJS: Compile fixhjk2021-02-251-0/+2
| | | | | | | Amends bd05384765. Change-Id: I45475798cdc1d4de997e694596f0c18009241492 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmljs: handle string templates in scannerFawzi Mohamed2021-02-251-6/+123
| | | | | | | | | | | | | | | | | | | * add (multiline) template string support templates can be nested, which means that the scanner/lexer cannot be a simple state machine anymore, but should have a stack to store the state (the number of open braces in the current template string). The lexer stare is currently stored in an int, so we abuse that and store a the number of open braces (maximum 0x7f = 127) for at most 5 nested templates in the int after the flags for the multiline comments and strings. * improve representation of delimiters (==, <=, ||,... not split in separate delimiters) * (QmlDom backport) Change-Id: I2b4d23b65febedef29a748f4c5f377fde27bd7fd Fixes: QTCREATORBUG-22766 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmljs: basic highlighting for es7Marco Benelli2018-12-041-1/+8
| | | | | | Task-number: QTCREATORBUG-21301 Change-Id: Ic59cbd68b1d40e34a87d3d8ebe5f2d8e7f413858 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlJS: Fix static variable initializationOrgad Shaneh2016-09-221-3/+4
| | | | | | | | You cannot use the variable itself in its initializer... Change-Id: Ibaf64b717b0ad5523b4ef8cf20ce4bf967a64a43 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* QmlJS: improve static initializingsTim Jenssen2016-09-211-29/+29
| | | | | Change-Id: Ifa37c912d0e43bcda896cb0ea851f97566c88d78 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* Remove use of deprecated Qt algorithmsOrgad Shaneh2016-08-091-4/+3
| | | | | Change-Id: Ib35cffa2d5762874feea9b1d4df7f569c0e5f496 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update remaining files in src Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@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>
* Clean headers in QmlJs.Friedemann Kleint2013-04-041-2/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it (Parser excluded). Change-Id: I5ec6e1076430009bb72094411b2c3386f8bea548 Reviewed-by: Aurindam Jana <aurindam.jana@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>
* Adjust license headershjk2012-10-051-21/+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>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-1/+1
| | | | | | | | 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>
* QmlJS: Fix uses of Scanner::state().Christian Kamm2011-06-031-6/+4
| | | | | | | Change-Id: I5195fc43e8a6653bf52c0eaa6cddb8dfd25b6217 Reviewed-on: http://codereview.qt.nokia.com/319 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Compile fixFriedemann Kleint2011-05-231-4/+4
| | | | | | Change-Id: I8f3eb7d21074fec00de870d33e493842286222ee Reviewed-on: http://codereview.qt.nokia.com/51 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* QmlJS: Make the Scanner recognize regular expression literals.Christian Kamm2011-05-231-8/+91
| | | | | | | Task-number: QTCREATORBUG-4566 Change-Id: I48b08f8eee79b25d0ebe186b996cdcb8f1979e3d Reviewed-on: http://codereview.qt.nokia.com/38 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* Header cleanup in src, specify module name.Friedemann Kleint2011-01-241-1/+1
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* Merge branch '2.1'con2010-12-171-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
| * License headers.con2010-12-171-7/+11
| |
* | Fix syntax highlighting of multiline QMLJS stringsRhys Weatherley2010-11-291-1/+23
|/
* QmlJS: Adjust scanner to treat ++ and -- as a single delimiter token.Christian Kamm2010-08-101-0/+10
| | | | Reviewed-by: Roberto Raggi
* Qml scanner: Don't emit token for empty line in multi-line comment.Christian Kamm2010-07-081-1/+1
| | | | Done-with: Thomas Hartmann
* Qml scanner: Fix begin location of comment tokens in multiline comments.Christian Kamm2010-07-081-1/+5
| | | | | Done-with: Thomas Hartmann Reviewed-by: Roberto Raggi
* QmlJS: Allow folding of multi-line comments.Christian Kamm2010-05-271-6/+1
| | | | | | | This also makes the editor auto-fold the license comment. Task-number: QTCREATORBUG-1455 Reviewed-by: Erik Verbruggen
* QmlJSEditor: Add completion for JS keywords and Qml reserved words.Christian Kamm2010-03-261-0/+10
| | | | | Task-number: QTCREATORBUG-919 Reviewed-by: Roberto Raggi
* Long live the king!hjk2010-03-051-1/+1
|
* Get rid of the QmlJS prefix.Roberto Raggi2010-02-151-7/+7
|
* Introduced QmlJSScanner::scanComments/setScanComments(onoff).Roberto Raggi2010-01-291-10/+24
|
* Fixed highlihing of QML context keywords.Roberto Raggi2010-01-291-1/+52
|
* Skip white spaces.Roberto Raggi2010-01-291-1/+5
|
* Say hello to the new incremental scanner for QML/JS.Roberto Raggi2010-01-281-285/+164
|
* Moved QmlJSScanner::Token in the QmlJS namespace.Roberto Raggi2010-01-191-1/+1
|
* Renamed classes and files to use the QmlJS prefix.Roberto Raggi2010-01-181-0/+363
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 13:08:21 +0000