bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Editor] Disable XML elements namespaces highlighting

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-03-16 09:32:11 +01:00
parent b499c44f3d
commit 5a45893e43
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/highlighting/XmlSyntaxHighlighter.kt
View File

@@ -24,8 +24,7 @@ class XmlSyntaxHighlighter : SyntaxHighlighter {
matcher.groups["ELEMENT"] != null -> {
add(listOf("tagmark"), matcher.end("OPEN") - matcher.start("OPEN"))
add(listOf("namespace"), matcher.end("NS") - matcher.end("OPEN"))
add(listOf("tagname"), matcher.end("ELEM") - matcher.end("NS"))
add(listOf("tagname"), matcher.end("ELEM") - matcher.end("OPEN"))
val attributesString = matcher.groups["ATTRS"]?.let(MatchGroup::value)?.takeIf(String::isNotEmpty)
val attributesStringLength = attributesString?.length ?: 0
@@ -70,7 +69,7 @@ class XmlSyntaxHighlighter : SyntaxHighlighter {
companion object {
private val XML_TAG =
"""(?<ELEMENT>(?<OPEN></?\h*)(?<ELEM>(?<NS>\w+:)?\w+)(?<ATTRS>[^<>]*)(?<CLOSE>\h*/?>))|(?<COMMENT><!--[^<>]+-->)|(?<PROLOG><\?[^<>?]+?\?>)""".toRegex()
"""(?<ELEMENT>(?<OPEN></?\h*)(?<ELEM>[:\w]+)(?<ATTRS>[^<>]*)(?<CLOSE>\h*/?>))|(?<COMMENT><!--[^<>]+-->)|(?<PROLOG><\?[^<>?]+?\?>)""".toRegex()
private val ATTRIBUTES = """(?<ATTR>[:\w]+\h*)(?<EQ>=)(?<VALUE>\h*"[^"]+")""".toRegex()
}

6
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/code/stylesheet/XmlSyntaxHighlightingStylesheet.kt
View File

@@ -12,14 +12,12 @@ import tornadofx.csspseudoclass
class XmlSyntaxHighlightingStylesheet : CodeEditorStylesheet() {
companion object {
val prolog by cssclass()
val namespace by cssclass()
val tagmark by cssclass()
val tagname by cssclass()
val paren by cssclass()
val attribute by cssclass()
val value by cssclass()
val comment by cssclass()
val paragraphBox by cssclass()
val paragraphText by cssclass()
val hasCaret by csspseudoclass()
@@ -33,10 +31,6 @@ class XmlSyntaxHighlightingStylesheet : CodeEditorStylesheet() {
fontStyle = FontPosture.ITALIC
}
namespace {
fill = Color.DARKVIOLET
}
tagmark {
fill = Color.GRAY
}