Update

Zenlua · Zenlua · commit d9a8cb20f0a7 · 2026-07-19T19:09:12.000+07:00
diff --git a/app/src/main/java/com/tool/tree/ui/SyntaxHighlighterFactory.kt b/app/src/main/java/com/tool/tree/ui/SyntaxHighlighterFactory.kt
@@ -2,6 +2,7 @@ package com.tool.tree.ui
 
 import android.graphics.Typeface
 import android.text.Editable
+import android.text.Spanned
 import android.text.TextWatcher
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
@@ -115,7 +116,7 @@ abstract class BaseSyntaxHighlighter(
             ForegroundColorSpan(color),
             start,
             safeEnd,
-            Editable.SPAN_EXCLUSIVE_EXCLUSIVE
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
         )
     }
 
@@ -126,7 +127,7 @@ abstract class BaseSyntaxHighlighter(
             StyleSpan(Typeface.BOLD),
             start,
             safeEnd,
-            Editable.SPAN_EXCLUSIVE_EXCLUSIVE
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
         )
     }
 
@@ -167,41 +168,41 @@ class ShellSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(
         val s = text.toString()
 
         // Comments
-        Regex("(?m)#.*$").findAll(s).forEach {
+        Regex("""(?m)#.*$""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, commentColor())
         }
 
         // Strings: double quotes, single quotes, backticks
-        Regex("\"(?:\\.|[^\"])*\"").findAll(s).forEach {
+        Regex(""""(?:\\.|[^"])*"""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, stringColor())
         }
-        Regex("'(?:[^']*)'").findAll(s).forEach {
+        Regex("""'(?:[^']*)'""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, stringColor())
         }
-        Regex("`(?:\\.|[^`])*`").findAll(s).forEach {
+        Regex("""`(?:\\.|[^`])*`""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, stringColor())
         }
 
         // Command substitution
-        Regex("\\$\\((?:[^()]*|\\([^()]*\\))*\\)").findAll(s).forEach {
+        Regex("""\$\((?:[^()]*|\([^()]*\))*\)""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, builtinColor())
         }
 
         // Variables
-        Regex("\\$\{[A-Za-z_][A-Za-z0-9_]*[^}]*}").findAll(s).forEach {
+        Regex("""\$\{[A-Za-z_][A-Za-z0-9_]*[^}]*}""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, numberColor())
         }
-        Regex("\\$[A-Za-z_][A-Za-z0-9_]*").findAll(s).forEach {
+        Regex("""\$[A-Za-z_][A-Za-z0-9_]*""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, numberColor())
         }
 
         // Numbers
-        Regex("(?<![A-Za-z0-9_])(?:0x[0-9A-Fa-f]+|[0-9]+)(?![A-Za-z0-9_])").findAll(s).forEach {
+        Regex("""(?<![A-Za-z0-9_])(?:0x[0-9A-Fa-f]+|[0-9]+)(?![A-Za-z0-9_])""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, numberColor())
         }
 
         // Keywords / builtins
-        Regex("(?<![A-Za-z0-9_])([A-Za-z_][A-Za-z0-9_]*)(?![A-Za-z0-9_])").findAll(s).forEach {
+        Regex("""(?<![A-Za-z0-9_])([A-Za-z_][A-Za-z0-9_]*)(?![A-Za-z0-9_])""").findAll(s).forEach {
             val word = it.value
             when {
                 keywords.contains(word) -> {
@@ -213,7 +214,7 @@ class ShellSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(
         }
 
         // Punctuation/operators
-        Regex("&&|\|\||\\||;|\\(|\\)|\\{|\\}|\\[\\[|\\]\\]|<|>").findAll(s).forEach {
+        Regex("""&&|\|\||\||;|\(|\)|\{|\}|\[\[|\]\]|<|>""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, punctuationColor())
         }
     }
@@ -233,38 +234,38 @@ class XmlSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(
         val s = text.toString()
 
         // XML comments
-        Regex("(?s)<!--.*?-->").findAll(s).forEach {
+        Regex("""(?s)<!--.*?-->""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, commentColor())
         }
 
         // CDATA
-        Regex("(?s)<!\[CDATA\[.*?\]\]>").findAll(s).forEach {
+        Regex("""(?s)<!\[CDATA\[.*?\]\]>""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, stringColor())
         }
 
         // Tags
-        Regex("</?[A-Za-z_][A-Za-z0-9_:\\-\.]*").findAll(s).forEach {
+        Regex("""</?[A-Za-z_][A-Za-z0-9_:\-\.]*""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, keywordColor())
             bold(text, it.range.first, it.range.last + 1)
         }
 
-        // Attribute names
-        Regex("\b[A-Za-z_][A-Za-z0-9_:\\-\.]*=(?=\")").findAll(s).forEach {
-            color(text, it.range.first, it.range.last, builtinColor())
+        // Attribute names (the part before =")
+        Regex("""\b[A-Za-z_][A-Za-z0-9_:\-\.]*(?=\s*=)""").findAll(s).forEach {
+            color(text, it.range.first, it.range.last + 1, builtinColor())
         }
 
         // Attribute values
-        Regex("\"(?:\\.|[^\"])*\"").findAll(s).forEach {
+        Regex(""""(?:\\.|[^"])*"""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, stringColor())
         }
 
         // Entities
-        Regex("&(?:amp|lt|gt|apos|quot|#x?[0-9A-Fa-f]+);").findAll(s).forEach {
+        Regex("""&(?:amp|lt|gt|apos|quot|#x?[0-9A-Fa-f]+);""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, numberColor())
         }
 
         // Angle brackets / punctuation
-        Regex("</?|/>|>").findAll(s).forEach {
+        Regex("""</?|/>|>""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, punctuationColor())
         }
     }
@@ -284,12 +285,12 @@ class PropSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(
         val s = text.toString()
 
         // Comments
-        Regex("(?m)^\s*[#!].*$").findAll(s).forEach {
+        Regex("""(?m)^\s*[#!].*$""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, commentColor())
         }
 
         // Key = value
-        Regex("(?m)^\s*([A-Za-z0-9_.-]+)(\s*=)").findAll(s).forEach {
+        Regex("""(?m)^\s*([A-Za-z0-9_.-]+)(\s*=)""").findAll(s).forEach {
             val line = it.value
             val keyEnd = line.indexOf('=')
             if (keyEnd > 0) {
@@ -300,17 +301,17 @@ class PropSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(
         }
 
         // Quoted values
-        Regex("\"(?:\\.|[^\"])*\"").findAll(s).forEach {
+        Regex(""""(?:\\.|[^"])*"""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, stringColor())
         }
 
         // Numbers
-        Regex("(?<![A-Za-z0-9_])(?:0x[0-9A-Fa-f]+|[0-9]+)(?![A-Za-z0-9_])").findAll(s).forEach {
+        Regex("""(?<![A-Za-z0-9_])(?:0x[0-9A-Fa-f]+|[0-9]+)(?![A-Za-z0-9_])""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, numberColor())
         }
 
         // Separators
-        Regex("=").findAll(s).forEach {
+        Regex("""=""").findAll(s).forEach {
             color(text, it.range.first, it.range.last + 1, punctuationColor())
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package com.tool.tree.ui`
`2`	`2`
`3`	`3`	`import android.graphics.Typeface`
`4`	`4`	`import android.text.Editable`
	`5`	`+import android.text.Spanned`
`5`	`6`	`import android.text.TextWatcher`
`6`	`7`	`import android.text.style.ForegroundColorSpan`
`7`	`8`	`import android.text.style.StyleSpan`
`@@ -115,7 +116,7 @@ abstract class BaseSyntaxHighlighter(`
`115`	`116`	`ForegroundColorSpan(color),`
`116`	`117`	`start,`
`117`	`118`	`safeEnd,`
`118`		`- Editable.SPAN_EXCLUSIVE_EXCLUSIVE`
	`119`	`+ Spanned.SPAN_EXCLUSIVE_EXCLUSIVE`
`119`	`120`	`)`
`120`	`121`	`}`
`121`	`122`
`@@ -126,7 +127,7 @@ abstract class BaseSyntaxHighlighter(`
`126`	`127`	`StyleSpan(Typeface.BOLD),`
`127`	`128`	`start,`
`128`	`129`	`safeEnd,`
`129`		`- Editable.SPAN_EXCLUSIVE_EXCLUSIVE`
	`130`	`+ Spanned.SPAN_EXCLUSIVE_EXCLUSIVE`
`130`	`131`	`)`
`131`	`132`	`}`
`132`	`133`
`@@ -167,41 +168,41 @@ class ShellSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(`
`167`	`168`	`val s = text.toString()`
`168`	`169`
`169`	`170`	`// Comments`
`170`		`- Regex("(?m)#.*$").findAll(s).forEach {`
	`171`	`+ Regex("""(?m)#.*$""").findAll(s).forEach {`
`171`	`172`	`color(text, it.range.first, it.range.last + 1, commentColor())`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`// Strings: double quotes, single quotes, backticks`
`175`		`- Regex("\"(?:\\.\|[^\"])*\"").findAll(s).forEach {`
	`176`	`+ Regex(""""(?:\\.\|[^"])*"""").findAll(s).forEach {`
`176`	`177`	`color(text, it.range.first, it.range.last + 1, stringColor())`
`177`	`178`	`}`
`178`		`- Regex("'(?:[^']*)'").findAll(s).forEach {`
	`179`	`+ Regex("""'(?:[^']*)'""").findAll(s).forEach {`
`179`	`180`	`color(text, it.range.first, it.range.last + 1, stringColor())`
`180`	`181`	`}`
`181`		- Regex("`(?:\\.\|[^`])*`").findAll(s).forEach {
	`182`	+ Regex("""`(?:\\.\|[^`])*`""").findAll(s).forEach {
`182`	`183`	`color(text, it.range.first, it.range.last + 1, stringColor())`
`183`	`184`	`}`
`184`	`185`
`185`	`186`	`// Command substitution`
`186`		`- Regex("\\$\\((?:[^()]\|\\([^()]\\))*\\)").findAll(s).forEach {`
	`187`	`+ Regex("""\$\((?:[^()]\|\([^()]\))*\)""").findAll(s).forEach {`
`187`	`188`	`color(text, it.range.first, it.range.last + 1, builtinColor())`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`// Variables`
`191`		`- Regex("\\$\{[A-Za-z_][A-Za-z0-9_][^}]}").findAll(s).forEach {`
	`192`	`+ Regex("""\$\{[A-Za-z_][A-Za-z0-9_][^}]}""").findAll(s).forEach {`
`192`	`193`	`color(text, it.range.first, it.range.last + 1, numberColor())`
`193`	`194`	`}`
`194`		`- Regex("\\$[A-Za-z_][A-Za-z0-9_]*").findAll(s).forEach {`
	`195`	`+ Regex("""\$[A-Za-z_][A-Za-z0-9_]*""").findAll(s).forEach {`
`195`	`196`	`color(text, it.range.first, it.range.last + 1, numberColor())`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`// Numbers`
`199`		`- Regex("(?<![A-Za-z0-9_])(?:0x[0-9A-Fa-f]+\|[0-9]+)(?![A-Za-z0-9_])").findAll(s).forEach {`
	`200`	`+ Regex("""(?<![A-Za-z0-9_])(?:0x[0-9A-Fa-f]+\|[0-9]+)(?![A-Za-z0-9_])""").findAll(s).forEach {`
`200`	`201`	`color(text, it.range.first, it.range.last + 1, numberColor())`
`201`	`202`	`}`
`202`	`203`
`203`	`204`	`// Keywords / builtins`
`204`		`- Regex("(?<![A-Za-z0-9_])([A-Za-z_][A-Za-z0-9_]*)(?![A-Za-z0-9_])").findAll(s).forEach {`
	`205`	`+ Regex("""(?<![A-Za-z0-9_])([A-Za-z_][A-Za-z0-9_]*)(?![A-Za-z0-9_])""").findAll(s).forEach {`
`205`	`206`	`val word = it.value`
`206`	`207`	`when {`
`207`	`208`	`keywords.contains(word) -> {`
`@@ -213,7 +214,7 @@ class ShellSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(`
`213`	`214`	`}`
`214`	`215`
`215`	`216`	`// Punctuation/operators`
`216`		`- Regex("&&\|\\|\\|\|\\\|\|;\|\\(\|\\)\|\\{\|\\}\|\\[\\[\|\\]\\]\|<\|>").findAll(s).forEach {`
	`217`	`+ Regex("""&&\|\\|\\|\|\\|\|;\|\(\|\)\|\{\|\}\|\[\[\|\]\]\|<\|>""").findAll(s).forEach {`
`217`	`218`	`color(text, it.range.first, it.range.last + 1, punctuationColor())`
`218`	`219`	`}`
`219`	`220`	`}`
`@@ -233,38 +234,38 @@ class XmlSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(`
`233`	`234`	`val s = text.toString()`
`234`	`235`
`235`	`236`	`// XML comments`
`236`		`- Regex("(?s)<!--.*?-->").findAll(s).forEach {`
	`237`	`+ Regex("""(?s)<!--.*?-->""").findAll(s).forEach {`
`237`	`238`	`color(text, it.range.first, it.range.last + 1, commentColor())`
`238`	`239`	`}`
`239`	`240`
`240`	`241`	`// CDATA`
`241`		`- Regex("(?s)<!\[CDATA\[.*?\]\]>").findAll(s).forEach {`
	`242`	`+ Regex("""(?s)<!\[CDATA\[.*?\]\]>""").findAll(s).forEach {`
`242`	`243`	`color(text, it.range.first, it.range.last + 1, stringColor())`
`243`	`244`	`}`
`244`	`245`
`245`	`246`	`// Tags`
`246`		`- Regex("</?[A-Za-z_][A-Za-z0-9_:\\-\.]*").findAll(s).forEach {`
	`247`	`+ Regex("""</?[A-Za-z_][A-Za-z0-9_:\-\.]*""").findAll(s).forEach {`
`247`	`248`	`color(text, it.range.first, it.range.last + 1, keywordColor())`
`248`	`249`	`bold(text, it.range.first, it.range.last + 1)`
`249`	`250`	`}`
`250`	`251`
`251`		`- // Attribute names`
`252`		`- Regex("\b[A-Za-z_][A-Za-z0-9_:\\-\.]*=(?=\")").findAll(s).forEach {`
`253`		`- color(text, it.range.first, it.range.last, builtinColor())`
	`252`	`+ // Attribute names (the part before =")`
	`253`	`+ Regex("""\b[A-Za-z_][A-Za-z0-9_:\-\.](?=\s=)""").findAll(s).forEach {`
	`254`	`+ color(text, it.range.first, it.range.last + 1, builtinColor())`
`254`	`255`	`}`
`255`	`256`
`256`	`257`	`// Attribute values`
`257`		`- Regex("\"(?:\\.\|[^\"])*\"").findAll(s).forEach {`
	`258`	`+ Regex(""""(?:\\.\|[^"])*"""").findAll(s).forEach {`
`258`	`259`	`color(text, it.range.first, it.range.last + 1, stringColor())`
`259`	`260`	`}`
`260`	`261`
`261`	`262`	`// Entities`
`262`		`- Regex("&(?:amp\|lt\|gt\|apos\|quot\|#x?[0-9A-Fa-f]+);").findAll(s).forEach {`
	`263`	`+ Regex("""&(?:amp\|lt\|gt\|apos\|quot\|#x?[0-9A-Fa-f]+);""").findAll(s).forEach {`
`263`	`264`	`color(text, it.range.first, it.range.last + 1, numberColor())`
`264`	`265`	`}`
`265`	`266`
`266`	`267`	`// Angle brackets / punctuation`
`267`		`- Regex("</?\|/>\|>").findAll(s).forEach {`
	`268`	`+ Regex("""</?\|/>\|>""").findAll(s).forEach {`
`268`	`269`	`color(text, it.range.first, it.range.last + 1, punctuationColor())`
`269`	`270`	`}`
`270`	`271`	`}`
`@@ -284,12 +285,12 @@ class PropSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(`
`284`	`285`	`val s = text.toString()`
`285`	`286`
`286`	`287`	`// Comments`
`287`		`- Regex("(?m)^\s[#!].$").findAll(s).forEach {`
	`288`	`+ Regex("""(?m)^\s[#!].$""").findAll(s).forEach {`
`288`	`289`	`color(text, it.range.first, it.range.last + 1, commentColor())`
`289`	`290`	`}`
`290`	`291`
`291`	`292`	`// Key = value`
`292`		`- Regex("(?m)^\s([A-Za-z0-9_.-]+)(\s=)").findAll(s).forEach {`
	`293`	`+ Regex("""(?m)^\s([A-Za-z0-9_.-]+)(\s=)""").findAll(s).forEach {`
`293`	`294`	`val line = it.value`
`294`	`295`	`val keyEnd = line.indexOf('=')`
`295`	`296`	`if (keyEnd > 0) {`
`@@ -300,17 +301,17 @@ class PropSyntaxHighlighter(editText: EditText) : BaseSyntaxHighlighter(`
`300`	`301`	`}`
`301`	`302`
`302`	`303`	`// Quoted values`
`303`		`- Regex("\"(?:\\.\|[^\"])*\"").findAll(s).forEach {`
	`304`	`+ Regex(""""(?:\\.\|[^"])*"""").findAll(s).forEach {`
`304`	`305`	`color(text, it.range.first, it.range.last + 1, stringColor())`
`305`	`306`	`}`
`306`	`307`
`307`	`308`	`// Numbers`
`308`		`- Regex("(?<![A-Za-z0-9_])(?:0x[0-9A-Fa-f]+\|[0-9]+)(?![A-Za-z0-9_])").findAll(s).forEach {`
	`309`	`+ Regex("""(?<![A-Za-z0-9_])(?:0x[0-9A-Fa-f]+\|[0-9]+)(?![A-Za-z0-9_])""").findAll(s).forEach {`
`309`	`310`	`color(text, it.range.first, it.range.last + 1, numberColor())`
`310`	`311`	`}`
`311`	`312`
`312`	`313`	`// Separators`
`313`		`- Regex("=").findAll(s).forEach {`
	`314`	`+ Regex("""=""").findAll(s).forEach {`
`314`	`315`	`color(text, it.range.first, it.range.last + 1, punctuationColor())`
`315`	`316`	`}`
`316`	`317`	`}`