The registry is an implementation detail and doesn't need to be exported
so move it to the textmark.cpp file.
Change-Id: Ic103b122cb20063fa4bc220bdc90cecff27054aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Separate local and remote branches
* List branches for each remote in a separate line
* List up to 12 branches per group
* Elide in the middle, list first and last branches in each group
Task-number: QTCREATORBUG-16949
Change-Id: If293cbd2536921261d9f420c71c2b68c8cb5bfe2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
..instead of ignoring it and then querying the same value right after.
Change-Id: I33b27a09857048a7f5088990d47d2e2ee4deb669
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Handle all enum values that can be reported for clang highlighting
marks.
Change-Id: I07eec789902f36d70fa15f26cad0b151e2adff6e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Needed for a follow-up change.
Change-Id: Ibb4815f3411f0d63deac8c32583178470668f67b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
*** UNEXPECTED STATE TRANSITION: "State changed from DebuggerFinished(22) to DebuggerFinished(22) [master]"
Change-Id: Iddacafbe337b95aa441aecbaf3ebf85c08a83d81
Reviewed-by: hjk <hjk@qt.io>
Example use case: Multiple wizard json files want to reference a shared
resource file without using fragile relative paths.
Change-Id: I2502083d4c371c25a8b66e7d5d3b4fb9d8697317
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CC is a dead system.
* The test each time a file in a new directory is opened to see if it's
managed by CC is extremely slow (it invokes a process).
Change-Id: I7c578a401a4757b0701146e11da60ac9c5f27ae1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Blame, log and git rebase editors.
Task-number: QTCREATORBUG-17735
Change-Id: Ifd23ba7b6ccf3ef98d3026cdc8c17fd88c97797c
Reviewed-by: David Schulz <david.schulz@qt.io>
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 a92694596e
Task-number: QTCREATORBUG-987
Change-Id: I4e9e84d29513ea317d7e3bde6c6b4c43749cb649
Reviewed-by: David Schulz <david.schulz@qt.io>
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>
libClang categorizes these as keywords, so we need to check
if a keyword is actually a primitive type, and use that.
Task-number: QTCREATORBUG-17867
Change-Id: I354bb0422505ed7732a0799d9c86d3acfdeb0785
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
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>
Complete includes when one choice exists.
Fix complete in the middle.
Task-number: QTCREATORBUG-15710
Change-Id: Iec794c17aabc8de47f981382f4b4286b9325827d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Unless it balances the curly braces
* typing '{' leads to auto insertion of '}'.
* typing '}' skips already present '}'.
* removing '{' leads to auto removal of '}'.
This prevents unbalanced curly braces, which are problematic for clang.
Concrete use cases are: typing of initializer lists, lambdas, function
definitions.
Task-number: QTCREATORBUG-15073
Change-Id: Iec8c6aa5aca054455c1e1bfde3a65c4fd1f579c3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Using the QUrl:resolve() does not work with Qt 5.9.
Since the file url is a local file and not directory this was
weird usage of QUrl anyway.
Change-Id: I2d709bc40a404b61ea3c3edbbfd1727a6ee2111c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
&Edit was conflicting with &Edit from the menu bar. To make the shortcut
more useful 'i' is used instead of 'E'.
Change-Id: I88541bec44cfe68e4b36508887597ce05867f25f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
List .qrc-files with the other files, even though they can be
expanded to reveal the resource files contents.
Task-number: QTCREATORBUG-18234
Change-Id: Iad05fb358c35eb81c4f74b7a0524447801981ae5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
When File>New File or Project is selected, then no node should be selected
on the summary page. If the wizard is triggered via the context menu of the
project tree, then select that node as context instead.
Task-number: QTCREATORBUG-18093
Change-Id: Ic9a14ad72c23c9a40ba2866772e0dcd5b28f9a74
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Loader are working in the designer and we will add more support for
them in the future.
Change-Id: Ied62d65b0eb9933b44a7833ccafcb934d4ae6fba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Correct columns in clang diagnostics and completion
Task-number: QTCREATORBUG-16775
Change-Id: I7260a0e52007fe261e83492dca5d457c34476497
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Since the qrc scanning is now asynchronous the qrc mapping
is not always reliable. Especially the first time when a new
.qrc file is added.
To keep at least the iso icon tool working reliable we always
assume an iso-icons directory.
Since the mapping qrc to file system is one to many anyway, this is
not breaking anything.
Task-number: QTCREATORBUG-18225
Change-Id: Ibb6d77960bd643f8c1f37bebc0c0e400588d0429
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Newly introduced enum values need to get a higher value than the
existing ones of the same type. Otherwise such values will be
interpreted wrongly when loaded from settings created by earlier
versions of Qt Creator.
Task-number: QTCREATORBUG-18235
Change-Id: I0f8497352d1ef382b5c8a65db4e1dea20b6296da
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
David Schulz
Jochen Becher
Eike Ziller
Orgad Shaneh
Robert Loehning
hjk
Nikolai Kosjar
Alessandro Portale
Ivan Donchevskii
Thomas Hartmann
Jesus Fernandez
Tobias Hunger
Vikas Pachdha
Christian Kandeler