[ jEdit-commits ] [ jEdit core ] jEdit core branch master updated. v5.7.0-24-ga9885bb3c

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jEdit core".

The branch, master has been updated
       via  a9885bb3c58a0fcd31cd608f501dbfe4d33e5c4a (commit)
       via  2c30e5e0833ff11d4476dc2f34a2f30cbe38603b (commit)
       via  74c4fd1afe5517cbc8e9a2272c45c410db95c014 (commit)
      from  78e5d38fac53681f82d9000bce85510378bc031b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit: https://sourceforge.net/p/jedit/jEdit/ci/a9885bb3c58a0fcd31cd608f501dbfe4d33e5c4a/
tree: https://sourceforge.net/p/jedit/jEdit/ci/a9885bb3c58a0fcd31cd608f501dbfe4d33e5c4a/tree/

commit a9885bb3c58a0fcd31cd608f501dbfe4d33e5c4a
Author: Björn Kautler <Bj...@Ka...>
Date:   Mon Mar 31 02:15:04 2025 +0200

    Fix htaccess edit mode to be context sensitive (#3812)

diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 833801fb6..d89f09e16 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -45,6 +45,8 @@ for contributing to this release.
 - Consider context insensitivity of an edit mode also on first usage after
   reloading edit modes (#3812 - Björn Kautler)
 
+- Fix htaccess edit mode to be context sensitive (#3812 - Björn Kautler)
+
 }}}
 {{{ Miscellaneous
 
diff --git a/modes/htaccess.xml b/modes/htaccess.xml
index 3e547e928..f805f4c69 100644
--- a/modes/htaccess.xml
+++ b/modes/htaccess.xml
@@ -6,7 +6,6 @@
 	<PROPS>
 		<PROPERTY NAME="lineComment" VALUE="#" />
 		<PROPERTY NAME="noWordSep" VALUE="-" />
-		<PROPERTY NAME="contextInsensitive" VALUE="true" />
 	</PROPS>
 	<RULES HIGHLIGHT_DIGITS="FALSE" IGNORE_CASE="TRUE">
 

commit: https://sourceforge.net/p/jedit/jEdit/ci/2c30e5e0833ff11d4476dc2f34a2f30cbe38603b/
tree: https://sourceforge.net/p/jedit/jEdit/ci/2c30e5e0833ff11d4476dc2f34a2f30cbe38603b/tree/

commit 2c30e5e0833ff11d4476dc2f34a2f30cbe38603b
Author: Björn Kautler <Bj...@Ka...>
Date:   Mon Mar 31 02:11:58 2025 +0200

    Consider context insensitivity of an edit mode also on first usage after reloading edit modes (#3812)

diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 59e5063c5..833801fb6 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -42,6 +42,9 @@ for contributing to this release.
   not do nothing anymore when connecting to a wrong-answering service
   (Björn Kautler)
 
+- Consider context insensitivity of an edit mode also on first usage after
+  reloading edit modes (#3812 - Björn Kautler)
+
 }}}
 {{{ Miscellaneous
 
diff --git a/org/gjt/sp/jedit/buffer/JEditBuffer.java b/org/gjt/sp/jedit/buffer/JEditBuffer.java
index 55dd7a538..cf10cc58f 100644
--- a/org/gjt/sp/jedit/buffer/JEditBuffer.java
+++ b/org/gjt/sp/jedit/buffer/JEditBuffer.java
@@ -1973,6 +1973,7 @@ loop:		for(int i = 0; i < seg.count; i++)
 
 		this.mode = mode;
 
+		mode.loadIfNecessary();
 		contextInsensitive = forceContextInsensitive ||
 			mode.getBooleanProperty("contextInsensitive");
 

commit: https://sourceforge.net/p/jedit/jEdit/ci/74c4fd1afe5517cbc8e9a2272c45c410db95c014/
tree: https://sourceforge.net/p/jedit/jEdit/ci/74c4fd1afe5517cbc8e9a2272c45c410db95c014/tree/

commit 74c4fd1afe5517cbc8e9a2272c45c410db95c014
Author: Björn Kautler <Bj...@Ka...>
Date:   Mon Mar 31 00:11:59 2025 +0200

    Do not check edit mode rules twice for hash chars that do not have upper- and lowercase versions

diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 6b8ed0e4b..59e5063c5 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -45,6 +45,8 @@ for contributing to this release.
 }}}
 {{{ Miscellaneous
 
+- Do not check edit mode rules twice for hash chars that do not have upper- and
+  lowercase versions (Björn Kautler)
 
 }}}
 {{{ API Changes
diff --git a/org/gjt/sp/jedit/syntax/ParserRuleSet.java b/org/gjt/sp/jedit/syntax/ParserRuleSet.java
index a20c5c44d..84fffdad2 100644
--- a/org/gjt/sp/jedit/syntax/ParserRuleSet.java
+++ b/org/gjt/sp/jedit/syntax/ParserRuleSet.java
@@ -145,7 +145,9 @@ public class ParserRuleSet
 			else
 			{
 				addRule(parserRule.upHashChar[0], parserRule);
-				addRule(Character.toLowerCase(parserRule.upHashChar[0]), parserRule);
+				char lowerHashChar = Character.toLowerCase(parserRule.upHashChar[0]);
+				if(lowerHashChar != parserRule.upHashChar[0])
+					addRule(lowerHashChar, parserRule);
 			}
 		}
 		else
@@ -153,7 +155,9 @@ public class ParserRuleSet
 			for (char upHashChar : parserRule.upHashChars)
 			{
 				addRule(upHashChar, parserRule);
-				addRule(Character.toLowerCase(upHashChar), parserRule);
+				char lowerHashChar = Character.toLowerCase(upHashChar);
+				if(lowerHashChar != upHashChar)
+					addRule(lowerHashChar, parserRule);
 			}
 		}
 	} //}}}

-----------------------------------------------------------------------

Summary of changes:
 doc/CHANGES.txt                            | 7 +++++++
 modes/htaccess.xml                         | 1 -
 org/gjt/sp/jedit/buffer/JEditBuffer.java   | 1 +
 org/gjt/sp/jedit/syntax/ParserRuleSet.java | 8 ++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
jEdit core