[Ruby] Add missing percent literal delimiters < and >.

zufuliu · Mar 15, 2024 · 6984ae8 · 6984ae8
1 parent 15bcf97
commit 6984ae8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/scintilla/lexers/LexBash.cxx b/scintilla/lexers/LexBash.cxx
@@ -96,9 +96,12 @@ constexpr bool IsBashNumber(int digit, int base) noexcept {
 }
 
 constexpr int opposite(int ch) noexcept {
-	if (ch == '(') return ')';
-	if (ch == '[') return ']';
-	if (ch == '{') return '}';
+	if (ch == '(') {
+		return ')';
+	}
+	if (AnyOf<'[', '{'>(ch)) {
+		return ch + 2;
+	}
 	return ch;
 }
 

diff --git a/scintilla/lexers/LexPerl.cxx b/scintilla/lexers/LexPerl.cxx
@@ -315,10 +315,15 @@ int actualNumStyle(int numberStyle) noexcept {
 }
 
 constexpr int opposite(int ch) noexcept {
-	if (ch == '(') return ')';
-	if (ch == '[') return ']';
-	if (ch == '{') return '}';
-	if (ch == '<') return '>';
+	if (ch == '(') {
+		return ')';
+	}
+	if (AnyOf<'[', '{'>(ch)) {
+		return ch + 2;
+	}
+	if (ch == '<') {
+		return '>';
+	}
 	return ch;
 }
 

diff --git a/scintilla/lexers/LexRuby.cxx b/scintilla/lexers/LexRuby.cxx
@@ -205,14 +205,17 @@ bool lookingAtHereDocDelim(LexAccessor &styler, Sci_Position pos, const char *He
 	return false;
 }
 
-//XXX Identical to Perl, put in common area
+// https://docs.ruby-lang.org/en/master/syntax/literals_rdoc.html#label-Percent+Literals
 constexpr char opposite(char ch) noexcept {
-	if (ch == '(')
+	if (ch == '(') {
 		return ')';
-	if (ch == '[')
-		return ']';
-	if (ch == '{')
-		return '}';
+	}
+	if (AnyOf<'[', '{'>(ch)) {
+		return ch + 2;
+	}
+	if (ch == '<') {
+		return '>';
+	}
 	return ch;
 }