From f9615ed5082b32cbb96569d710247e81446d0447 Mon Sep 17 00:00:00 2001
From: "David C. Rankin" <drankinatty@gmail.com>
Date: Tue, 24 Sep 2024 17:09:46 +0900
Subject: [PATCH] Kate: update rust syntax to highlight alerts and todo.

Signed-off-by: David C. Rankin <drankinatty@gmail.com>
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 48dd6d8de2d691c24f56a292aa40454affd73f16)
---
 kate/data/rust.xml         | 9 +++++++--
 kate/data/update-files.xml | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/kate/data/rust.xml b/kate/data/rust.xml
index 10bf247b0..0dd82f86c 100644
--- a/kate/data/rust.xml
+++ b/kate/data/rust.xml
@@ -34,7 +34,7 @@
 	<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
 	<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
 ]>
-<language name="Rust" version="1.0" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/rust" priority="15">
+<language name="Rust" version="1.1" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/rust" priority="15">
 <highlighting>
 	<list name="fn">
 		<item> fn </item>
@@ -323,10 +323,14 @@
 			<RegExpr String="U[0-9a-fA-F]{8}" attribute="CharEscape" context="#pop"/>
 			<RegExpr String="." attribute="Error" context="#pop"/>
 		</context>
-		<context attribute="Comment" lineEndContext="#pop" name="Commentar 1"/>
+		<context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+			<LineContinue attribute="Comment" context="#stay"/>
+			<IncludeRules context="##Alerts" />
+		</context>
 		<context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
 			<DetectSpaces/>
 			<Detect2Chars char="*" char1="/" attribute="Comment" context="#pop" endRegion="Comment"/>
+			<IncludeRules context="##Alerts" />
 		</context>
 	</contexts>
 	<itemDatas>
@@ -348,6 +352,7 @@
 		<itemData name="Macro"        defStyleNum="dsOthers"/>
 		<itemData name="Attribute"    defStyleNum="dsOthers"/>
 		<itemData name="Lifetime"     defStyleNum="dsOthers" bold="1"/>
+		<itemData name="Alert"        defStyleNum="dsAlert" spellChecking="false"/>
 		<itemData name="Error"        defStyleNum="dsError"/>
 	</itemDatas>
 </highlighting>
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index 12924302b..e57c63ada 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -205,7 +205,7 @@
 <Definition name="RSI IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rsiidl.xml" version="3"/>
 <Definition name="Rich Text Format" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rtf.xml" version="2"/>
 <Definition name="Ruby" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ruby.xml" version="1.27"/>
-<Definition name="Rust" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rust.xml" version="1.0"/>
+<Definition name="Rust" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rust.xml" version="1.1"/>
 <Definition name="R Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/r.xml" version="3-1"/>
 <Definition name="Sather" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sather.xml" version="2"/>
 <Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="6"/>