Commit Graph

16 Commits

Author SHA1 Message Date
David Schulz
5ece12d4ea Highlighter: clarify 'Update Definitions' action
by renaming it to Download Definitions and adding a tooltip stating that it
collects all definitions that are missing or were updated after the release and
downloads it to the ksyntax highlighting user folder.
Also adding a separate reload definitions button in the settings behind
the user path.

Change-Id: I059cc98e33147cae910fa4fdb35631d1dca81448
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-04 13:23:58 +00:00
David Schulz
06026b7cf4 Highlighter: Apply specific ksyntax format attributes
If a ksyntax format explicitly defines font attributes like bold,
italic, underline or strike through we now apply those attributes. If
the format defines a colors, we first check whether the color is
readable before setting it.

Fixes: QTCREATORBUG-22646
Fixes: QTCREATORBUG-22229
Fixes: QTCREATORBUG-13545
Change-Id: Id0389b3c71a078dc6d6df74ee5de7f5d479a9bcb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-08 04:46:36 +00:00
David Schulz
6dde7767ce Highlighter: Use file pattern matching if mime type is 'text/plain'
Do not try to match 'text/plain' mime types against highlight
definitions, because it is automatically set if the file contains just
printable characters in the first bytes, in this case file pattern
matching gives better results.

Fixes: QTCREATORBUG-22540
Change-Id: Ifd662cd6961011f5cf5d9232ce5f17d2314b4824
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-24 08:21:44 +00:00
Eike Ziller
9d39e68173 Merge remote-tracking branch 'origin/4.9' into 4.10
Change-Id: I7725557a279cc13fe03a72c20accf63b50571608
2019-06-12 07:21:15 +02:00
David Schulz
6fd355b84b TextEditor: force rehighlight of next block if state changed
If the user state of a block changes while it gets highlighted
the next block will be rehighlighted too. Currently we store the
indentation depth in the block user state. So in order to store the
indentation depth _and_ the information whether the next block needs
to be rehighlighted we bit shift the indentation depth via the
brace depth helper functions from TextDocumentLayaout. And we cannot
store the struct KSyntaxHighlighting::State in the block user state (int)
directly to indicate that the next block also needs a rehighlight so we
toggle just the last bit of the user state.

Fixes: QTCREATORBUG-22290
Change-Id: I632f4416a725dc5fa1667bcab34fb2701294c9b8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-07 05:20:36 +00:00
hjk
473a741c9f Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 12:23:26 +00:00
David Schulz
ccb5f2302d TextEditor: fix folding regression in generic highlighter
Fixes: QTCREATORBUG-22346
Change-Id: Ib35a70da77ffaa3b84e1d85a855625e2086625da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-03 08:59:34 +00:00
David Schulz
429eb73ace TextEditor: fix highlighting whitespaces with ksyntax highlighter
Fixes: QTCREATORBUG-22097
Change-Id: Ia69198635e289fc6eff8d95bf1cdf59bda2e04e1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-03-14 09:44:11 +00:00
David Schulz
792fe95c00 TextEditor: Fix matching parenthesis highlight reggression
The update to the new KSyntaxHighlight engine was missing the matching
parenthesis highlight that was implemented in the generic highligter.

Fixes: QTCREATORBUG-22095
Change-Id: Ibac0f0739b4e1df63aadf0f18f1b76873e63a2fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-03-07 10:28:38 +00:00
Christian Stenger
6aed8223a9 SyntaxHighlighter: Update to latest master
Adapt the respective include inside the TextEditor.

Change-Id: Ie3cb17f1b0e3c0639840bc135156edd354a0aeda
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-03-04 12:55:55 +00:00
David Schulz
8a0f7bcfd5 TextEditor: add option to remember highlighter definition
Add a button to the multiple definition found info that saves the
definition of the current highlighter for the open document.

Change-Id: I04b1b7571a864d781747547a1d315ec25bb6b5a1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-02-28 07:14:43 +00:00
David Schulz
82466375b9 TextEditor: Show info when multiple highlight definitions are available
Show an editor info bar when multiple highlight definitions can be found
for a single file or mime type. Add a combo box to the info that allows
the user to choose between them.

Change-Id: I07278d065e19d4e04fba24a6d789c8b6c9f55d60
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-02-11 12:45:04 +00:00
David Schulz
67b0d9be2e TextEditor: return all definitions for a file name/mimetype/document
Change-Id: Ifd4ee9ab71b95a66cf11e30e2de688d421094a4a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-02-07 13:48:50 +00:00
David Schulz
f75934f297 TextEditor: shorten namespace noise
Change-Id: I16bc218ccefb7234cb9c1299ee3022549b178600
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-02-07 12:51:27 +00:00
David Schulz
f4a45884ca TextEditor: add convenient definition for document function
Change-Id: I8bbaec71a4682e36d3919924932b410e2e9d74a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-02-07 12:51:19 +00:00
David Schulz
14834e6b0a TextEditor: replace generic highlighter with ksyntaxhighlighting
Fixes: QTCREATORBUG-21029
Change-Id: I9894c4384e0e47da6bf030b7b8e07c3ad4737ff3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-01-28 11:37:08 +00:00