Rearrange operator styles.

zufuliu · Jan 24, 2024 · 73cadae · 73cadae
1 parent 77da98c
commit 73cadae
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/scintilla/include/SciLexer.h b/scintilla/include/SciLexer.h
@@ -1350,8 +1350,8 @@
 #define SCE_JULIA_FORMAT_SPECIFIER 20
 #define SCE_JULIA_REGEX 21
 #define SCE_JULIA_TRIPLE_REGEX 22
-#define SCE_JULIA_OPERATOR2 23
-#define SCE_JULIA_OPERATOR 24
+#define SCE_JULIA_OPERATOR 23
+#define SCE_JULIA_OPERATOR2 24
 #define SCE_JULIA_FUNCTION 25
 #define SCE_JULIA_WORD 26
 #define SCE_JULIA_WORD_DEMOTED 27
@@ -1471,8 +1471,8 @@
 #define SCE_DART_TRIPLE_RAWSTRING_SQ 17
 #define SCE_DART_TRIPLE_RAWSTRING_DQ 18
 #define SCE_DART_ESCAPECHAR 19
-#define SCE_DART_OPERATOR2 20
-#define SCE_DART_OPERATOR 21
+#define SCE_DART_OPERATOR 20
+#define SCE_DART_OPERATOR2 21
 #define SCE_DART_NUMBER 22
 #define SCE_DART_SYMBOL_OPERATOR 23
 #define SCE_DART_LABEL 24
@@ -1560,15 +1560,15 @@
 #define SCE_JAVA_COMMENTTAGHTML 6
 #define SCE_JAVA_TASKMARKER 7
 #define SCE_JAVA_OPERATOR 8
-#define SCE_JAVA_CHARACTER 9
+#define SCE_JAVA_OPERATOR2 9
 #define SCE_JAVA_STRING 10
 #define SCE_JAVA_TEMPLATE 11
 #define SCE_JAVA_TRIPLE_TEMPLATE 12
 #define SCE_JAVA_TRIPLE_STRING 13
 #define SCE_JAVA_ESCAPECHAR 14
 #define SCE_JAVA_FORMAT_SPECIFIER 15
 #define SCE_JAVA_PLACEHOLDER 16
-#define SCE_JAVA_OPERATOR2 17
+#define SCE_JAVA_CHARACTER 17
 #define SCE_JAVA_NUMBER 18
 #define SCE_JAVA_ANNOTATION 19
 #define SCE_JAVA_IDENTIFIER 20

diff --git a/scintilla/include/SciLexer.iface b/scintilla/include/SciLexer.iface
@@ -2634,8 +2634,8 @@ val SCE_JULIA_ESCAPECHAR=
 val SCE_JULIA_FORMAT_SPECIFIER=
 val SCE_JULIA_REGEX=
 val SCE_JULIA_TRIPLE_REGEX=
-val SCE_JULIA_OPERATOR2=
 val SCE_JULIA_OPERATOR=
+val SCE_JULIA_OPERATOR2=
 val SCE_JULIA_FUNCTION=
 val SCE_JULIA_WORD=
 val SCE_JULIA_WORD_DEMOTED=
@@ -2767,8 +2767,8 @@ val SCE_DART_RAWSTRING_DQ=
 val SCE_DART_TRIPLE_RAWSTRING_SQ=
 val SCE_DART_TRIPLE_RAWSTRING_DQ=
 val SCE_DART_ESCAPECHAR=
-val SCE_DART_OPERATOR2=
 val SCE_DART_OPERATOR=
+val SCE_DART_OPERATOR2=
 val SCE_DART_NUMBER=
 val SCE_DART_SYMBOL_OPERATOR=
 val SCE_DART_LABEL=
@@ -2862,15 +2862,15 @@ val SCE_JAVA_COMMENTTAGAT=
 val SCE_JAVA_COMMENTTAGHTML=
 val SCE_JAVA_TASKMARKER=
 val SCE_JAVA_OPERATOR=
-val SCE_JAVA_CHARACTER=
+val SCE_JAVA_OPERATOR2=
 val SCE_JAVA_STRING=
 val SCE_JAVA_TEMPLATE=11
 val SCE_JAVA_TRIPLE_TEMPLATE=12
 val SCE_JAVA_TRIPLE_STRING=
 val SCE_JAVA_ESCAPECHAR=
 val SCE_JAVA_FORMAT_SPECIFIER=
 val SCE_JAVA_PLACEHOLDER=
-val SCE_JAVA_OPERATOR2=
+val SCE_JAVA_CHARACTER=
 val SCE_JAVA_NUMBER=
 val SCE_JAVA_ANNOTATION=
 val SCE_JAVA_IDENTIFIER=

diff --git a/src/EditLexers/stlJava.c b/src/EditLexers/stlJava.c
@@ -134,7 +134,7 @@ EDITLEXER lexJava = {
 		| KeywordAttr64(7, KeywordAttr_NoLexer | KeywordAttr_NoAutoComp) // annotation
 		| KeywordAttr64(9, KeywordAttr_NoLexer | KeywordAttr_NoAutoComp) // Javadoc
 		, SCE_JAVA_TASKMARKER,
-		SCE_JAVA_CHARACTER, SCE_JAVA_PLACEHOLDER,
+		SCE_JAVA_STRING, SCE_JAVA_CHARACTER,
 //Settings--Autogenerated -- end of section automatically generated
 	EDITLEXER_HOLE(L"Java Source", Styles_Java),
 	L"java; jad; aidl; bsh",

diff --git a/tools/LexerConfig.py b/tools/LexerConfig.py
@@ -564,7 +564,7 @@ class KeywordAttr(IntFlag):
 		'operator_style': ['SCE_JAVA_OPERATOR', 'SCE_JAVA_OPERATOR2'],
 		'extra_word_char': '$:',
 		#'ignore_word_style': ['SCE_JAVA_WORD', 'SCE_JAVA_WORD2', 'SCE_JAVA_DIRECTIVE'],
-		'string_style_range': ['SCE_JAVA_CHARACTER', 'SCE_JAVA_PLACEHOLDER'],
+		'string_style_range': ['SCE_JAVA_STRING', 'SCE_JAVA_CHARACTER'],
 	},
 	'NP2LEX_JAVASCRIPT': {
 		'tab_settings': TabSettings_Space2,