Minor update Dart type highlighting.

zufuliu · Oct 6, 2023 · 96dcae8 · 96dcae8
1 parent 631662f
commit 96dcae8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 1 deletion.
diff --git a/scintilla/lexers/LexCSharp.cxx b/scintilla/lexers/LexCSharp.cxx
@@ -378,6 +378,8 @@ void ColouriseCSharpDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int init
 								// type<type>
 								// type<type?>
 								// type<type<type>>
+								// type<type, type>
+								// class type: type, interface {}
 								// type identifier
 								sc.ChangeState(IsInterfaceName(s[0], s[1]) ? SCE_CSHARP_INTERFACE : SCE_CSHARP_CLASS);
 							}

diff --git a/scintilla/lexers/LexDart.cxx b/scintilla/lexers/LexDart.cxx
@@ -182,7 +182,7 @@ void ColouriseDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 							if (visibleChars == sc.LengthCurrent()) {
 								lineStateLineType = DartLineStateMaskImport;
 							}
-						} else if (StrEqualsAny(s, "class", "extends", "implements", "new", "throw", "as", "is")) {
+						} else if (StrEqualsAny(s, "class", "extends", "implements", "new", "throw", "with", "as", "is", "on")) {
 							kwType = KeywordType::Class;
 						} else if (StrEqual(s, "enum")) {
 							kwType = KeywordType::Enum;
@@ -228,6 +228,8 @@ void ColouriseDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 								// type<type>
 								// type<type?>
 								// type<type<type>>
+								// type<type, type>
+								// class type implements interface, interface {}
 								// type identifier
 								// type? identifier
 								sc.ChangeState(SCE_DART_CLASS);

diff --git a/scintilla/lexers/LexGroovy.cxx b/scintilla/lexers/LexGroovy.cxx
@@ -289,6 +289,8 @@ void ColouriseGroovyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int init
 								// type<>, type<?>, type<? super T>
 								// type<type>
 								// type<type<type>>
+								// type<type, type>
+								// class type implements interface, interface {}
 								sc.ChangeState(SCE_GROOVY_CLASS);
 							} else if (IsIdentifierStartEx(chNext)) {
 								// type identifier

diff --git a/scintilla/lexers/LexHaxe.cxx b/scintilla/lexers/LexHaxe.cxx
@@ -198,6 +198,7 @@ void ColouriseHaxeDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 								// type[]
 								// type<type>
 								// type<type<type>>
+								// type<type, type>
 								sc.ChangeState(SCE_HAXE_CLASS);
 							}
 						}

diff --git a/scintilla/lexers/LexJava.cxx b/scintilla/lexers/LexJava.cxx
@@ -319,6 +319,8 @@ void ColouriseJavaDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 								// type<>, type<?>, type<? super T>
 								// type<type>
 								// type<type<type>>
+								// type<type, type>
+								// class type implements interface, interface {}
 								// type identifier
 								sc.ChangeState(SCE_JAVA_CLASS);
 							}

diff --git a/scintilla/lexers/LexJavaScript.cxx b/scintilla/lexers/LexJavaScript.cxx
@@ -263,6 +263,8 @@ void ColouriseJsDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 								// type<type>
 								// type<type?>
 								// type<type<type>>
+								// type<type, type>
+								// class type implements interface, interface {}
 								sc.ChangeState(SCE_JS_CLASS);
 							}
 						}

diff --git a/scintilla/lexers/LexKotlin.cxx b/scintilla/lexers/LexKotlin.cxx
@@ -202,6 +202,8 @@ void ColouriseKotlinDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int init
 								// type<type>
 								// type<type?>
 								// type<type<type>>
+								// type<type, type>
+								// class type: type, interface {}
 								sc.ChangeState(SCE_KOTLIN_CLASS);
 							}
 						}

diff --git a/scintilla/lexers/LexSwift.cxx b/scintilla/lexers/LexSwift.cxx
@@ -241,8 +241,10 @@ void ColouriseSwiftDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initS
 								// type<type>
 								// type<type?>
 								// type<type<type>>
+								// type<type, type>
 								// [type]()
 								// [[type]]()
+								// class type: protocol, protocol {}
 								sc.ChangeState(SCE_SWIFT_CLASS);
 							}
 						}