[education/rkward/mr-origin-23] rkward/syntax: Update file rkward.xml

Thomas Friedrichsmeier null at kde.org
Wed Oct 18 17:24:53 BST 2023


Git commit 1b931810b1d7dd38425db401c013f293fba6bd9f by Thomas Friedrichsmeier, on behalf of Pierre de Villemereuil.
Committed on 18/10/2023 at 18:23.
Pushed by tfry into branch 'mr-origin-23'.

Update file rkward.xml

M  +3    -2    rkward/syntax/rkward.xml

https://invent.kde.org/education/rkward/-/commit/1b931810b1d7dd38425db401c013f293fba6bd9f

diff --git a/rkward/syntax/rkward.xml b/rkward/syntax/rkward.xml
index 1fc3b42a5..7bfcd6b31 100644
--- a/rkward/syntax/rkward.xml
+++ b/rkward/syntax/rkward.xml
@@ -56,7 +56,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 		<!-- Default is output context: if a "> " is encountered at line start, pop back to ctxbase (and to command0 from there) --> 
 		<context attribute="Output" lineEndContext="#stay" name="output">
 			<Detect2Chars attribute="Prompt" context="#pop" char=">" char1=" " column="0" lookAhead="true" endRegion="commandRegion"/>
-			<Detect2Chars attribute="Prompt" context="#pop" char="+" char1=" " column="0" lookAhead="true"/>
+			<Detect2Chars attribute="Prompt" context="#pop" char="+" char1=" " column="0" lookAhead="true" endRegion="commandRegion"/>
 			<IncludeRules context="OutputContinuationCheck"/>
 			<IncludeRules context="OutputRules"/>
 		</context>
@@ -81,6 +81,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 		<context attribute="Output Tibble" lineEndContext="#stay" name="outputtibble">
 			<!-- If a "> " is encountered at line start, pop back to ctxbase (and to command0 from there) -->
 			<Detect2Chars attribute="Prompt" context="#pop" char=">" char1=" " column="0" lookAhead="true" endRegion="commandRegion"/>
+			<Detect2Chars attribute="Prompt" context="#pop" char="+" char1=" " column="0" lookAhead="true" endRegion="commandRegion"/>
 			
 			<!-- If a "# " is encountered at line start, pop back to output context -->
 			<StringDetect attribute="Prompt" context="#pop" String="# …" column="0" lookAhead="true" endRegion="commandRegion"/>
@@ -100,7 +101,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 		<context attribute="Output StrView" lineEndContext="#pop" name="outputstrview">
 			<IncludeRules context="OutputContinuationCheck"/>
 			<RegExpr attribute="Output Index" context="#stay" String="\[[0-9]+\]" firstNonSpace="true"/>
-			<RegExpr attribute="Output StrView Highlight" context="#stay" String="[<].+[>]"/>
+			<RegExpr attribute="Output StrView Highlight" context="#stay" String="[<][^>]+[>]"/>
 		</context>
 		
 		<!-- String context is not highlighted in itself, but used to suppress other highlights (e.g. "1") -->



More information about the rkward-tracker mailing list