CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4042 from RaiKoHoff/Dev_Master

Browse Source 
Fix: Lexer style config names: differences between display and .ini-config
This commit is contained in:
Pairi Daiza 2022-04-16 14:37:21 +02:00 committed by GitHub
commit 1236f9a90c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
language/common_res.h
View File

@ -1249,6 +1249,13 @@
#define IDS_LEX_STR_63379 63379
#define IDS_LEX_STR_63380 63380
#define IDS_LEX_STR_63381 63381
#define IDS_LEX_STR_63382 63382
#define IDS_LEX_STR_63383 63383
#define IDS_LEX_STR_63384 63384
#define IDS_LEX_STR_63385 63385
#define IDS_LEX_STR_63386 63386
#define IDS_LEX_STR_63387 63387
#define IDS_LEX_STR_63388 63388
#define IDS_LEX_CSV_COL_0 63400
#define IDS_LEX_CSV_COL_1 63401

8
language/np3_de_de/lexer_de_de.rc
View File

@ -129,6 +129,7 @@ BEGIN
IDS_LEX_KOTLIN_SRC "Kotlin Source Code"
IDS_LEX_JULIA_SCR "Julia Script"
IDS_LEX_KIX_SCR "KiXtart Script"
IDS_LEX_FORTRAN "Fortran Source Code"
END
STRINGTABLE
@ -487,6 +488,13 @@ BEGIN
IDS_LEX_STR_63379 "Unclosed String"
IDS_LEX_STR_63380 "URL/IRI"
IDS_LEX_STR_63381 "Compact IRI"
IDS_LEX_STR_63382 "Send Key"
IDS_LEX_STR_63383 "Meta-Data"
IDS_LEX_STR_63384 "Enumeration"
IDS_LEX_STR_63385 "TriQ-String"
IDS_LEX_STR_63386 "Symbol Identifier"
IDS_LEX_STR_63387 "Symbol Operator"
IDS_LEX_STR_63388 "String EOL"
END
STRINGTABLE

8
language/np3_en_us/lexer_en_us.rc
View File

@ -129,6 +129,7 @@ BEGIN
IDS_LEX_KOTLIN_SRC "Kotlin Source Code"
IDS_LEX_JULIA_SCR "Julia Script"
IDS_LEX_KIX_SCR "KiXtart Script"
IDS_LEX_FORTRAN "Fortran Source Code"
END
STRINGTABLE
@ -487,6 +488,13 @@ BEGIN
IDS_LEX_STR_63379 "Unclosed String"
IDS_LEX_STR_63380 "URL/IRI"
IDS_LEX_STR_63381 "Compact IRI"
IDS_LEX_STR_63382 "Send Key"
IDS_LEX_STR_63383 "Meta-Data"
IDS_LEX_STR_63384 "Enumeration"
IDS_LEX_STR_63385 "TriQ-String"
IDS_LEX_STR_63386 "Symbol Identifier"
IDS_LEX_STR_63387 "Symbol Operator"
IDS_LEX_STR_63388 "String EOL"
END
STRINGTABLE

4
src/StyleLexers/styleLexAU3.c
View File

@ -667,9 +667,9 @@ EDITLEXER lexAU3 =
{ {SCE_AU3_STRING}, IDS_LEX_STR_63131, L"String", L"fore:#008080", L"" },
{ {SCE_AU3_OPERATOR}, IDS_LEX_STR_63132, L"Operator", L"fore:#C000C0", L"" },
{ {SCE_AU3_VARIABLE}, IDS_LEX_STR_63249, L"Variable", L"fore:#808000", L"" },
{ {SCE_AU3_SENT}, IDS_LEX_STR_63279, L"Send Key", L"fore:#FF0000", L"" },
{ {SCE_AU3_SENT}, IDS_LEX_STR_63382, L"Send Key", L"fore:#FF0000", L"" },
{ {SCE_AU3_PREPROCESSOR}, IDS_LEX_STR_63133, L"Preprocessor", L"fore:#FF8000", L"" },
{ {SCE_AU3_SPECIAL}, IDS_LEX_STR_63280, L"Special", L"fore:#FF8000", L"" },
{ {SCE_AU3_SPECIAL}, IDS_LEX_STR_63377, L"Special", L"fore:#FF8000", L"" },
EDITLEXER_SENTINEL
}
};

11
src/StyleLexers/styleLexDart.c
View File

@ -50,22 +50,23 @@ EDITLEXER lexDart =
//{ {SCE_DART_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" },
{ {SCE_DART_WORD}, IDS_LEX_STR_63128, L"Keyword", L"fore:#0000FF", L"" },
{ {SCE_DART_WORD2}, IDS_LEX_STR_63260, L"Keyword 2nd", L"fore:#0000FF", L"" },
{ {SCE_DART_METADATA}, IDS_LEX_STR_63203, L"Meta-Data", L"fore:#FF8000", L"" },
{ {SCE_DART_METADATA}, IDS_LEX_STR_63383, L"Meta-Data", L"fore:#FF8000", L"" },
{ {SCE_DART_CLASS}, IDS_LEX_STR_63258, L"Class", L"fore:#0080FF", L"" },
{ {SCE_DART_ENUM}, IDS_LEX_STR_63203, L"Enumeration", L"fore:#FF8000", L"" },
{ {SCE_DART_ENUM}, IDS_LEX_STR_63384, L"Enumeration", L"fore:#FF8000", L"" },
{ {SCE_DART_FUNCTION}, IDS_LEX_STR_63277, L"Function", L"fore:#A46000", L"" },
{ {MULTI_STYLE(SCE_DART_COMMENTBLOCK, SCE_DART_COMMENTLINE, 0, 0)}, IDS_LEX_STR_63127, L"Comment", L"fore:#608060", L"" },
{ {MULTI_STYLE(SCE_DART_COMMENTBLOCKDOC, SCE_DART_COMMENTLINEDOC, 0, 0)}, IDS_LEX_STR_63259, L"Comment Doc", L"fore:#408040", L"" },
{ {SCE_DART_TASKMARKER}, IDS_LEX_STR_63373, L"Task Marker", L"bold; fore:#408080" },
{ {MULTI_STYLE(SCE_DART_STRING_SQ, SCE_DART_STRING_DQ, 0, 0)}, IDS_LEX_STR_63131, L"String", L"fore:#008000", L"" },
{ {MULTI_STYLE(SCE_DART_TRIPLE_STRING_SQ, SCE_DART_TRIPLE_STRING_DQ, SCE_DART_TRIPLE_STRINGSTART, SCE_DART_TRIPLE_STRINGEND)}, IDS_LEX_STR_63131, L"TriQ-String", L"fore:#F08000", L"" },
{ {MULTI_STYLE(SCE_DART_TRIPLE_STRING_SQ, SCE_DART_TRIPLE_STRING_DQ, SCE_DART_TRIPLE_STRINGSTART, SCE_DART_TRIPLE_STRINGEND)}, IDS_LEX_STR_63385, L"TriQ-String", L"fore:#F08000", L"" },
{ {MULTI_STYLE(SCE_DART_RAWSTRING_SQ, SCE_DART_RAWSTRING_DQ, SCE_DART_TRIPLE_RAWSTRING_SQ, SCE_DART_TRIPLE_RAWSTRING_DQ)}, IDS_LEX_STR_63134, L"Verbatim String", L"fore:#F08000", L"" },
{ {SCE_DART_ESCAPECHAR}, IDS_LEX_STR_63366, L"ESC Sequence", L"fore:#0080C0", L"" },
{ {SCE_DART_LABEL}, IDS_LEX_STR_63235, L"Label", L"fore:#7C5AF3", L"" },
{ {SCE_DART_NUMBER}, IDS_LEX_STR_63130, L"Number", L"fore:#FF0000", L"" },
{ {SCE_DART_VARIABLE}, IDS_LEX_STR_63249, L"Variable", L"fore:#9E4D2A", L"" },
{ {MULTI_STYLE(SCE_DART_SYMBOL_OPERATOR, SCE_DART_SYMBOL_IDENTIFIER, 0, 0)}, IDS_LEX_STR_63132, L"Operator", L"fore:#7C5AF3", L"" },
{ {MULTI_STYLE(SCE_DART_OPERATOR, SCE_DART_OPERATOR2, 0, 0)}, IDS_LEX_STR_63132, L"Operator2", L"fore:#B000B0", L"" },
{ {MULTI_STYLE(SCE_DART_OPERATOR, SCE_DART_OPERATOR2, 0, 0)}, IDS_LEX_STR_63132, L"Operator", L"fore:#B000B0", L"" },
{ {SCE_DART_SYMBOL_IDENTIFIER}, IDS_LEX_STR_63386, L"Symbol Identifier", L"fore:#7C5AF3", L"" },
{ {SCE_DART_SYMBOL_OPERATOR}, IDS_LEX_STR_63387, L"Symbol Operator", L"fore:#7C5AF3", L"" },
EDITLEXER_SENTINEL
}
};

2
src/StyleLexers/styleLexFortran.c
View File

@ -87,7 +87,7 @@ EDITLEXER lexFortran =
{ {SCE_F_WORD3}, IDS_LEX_STR_63305, L"User-Defined Function", L"bold; italic; fore:#800080", L"" },
{ {SCE_F_STRING1}, IDS_LEX_STR_63212, L"String Single Quoted", L"fore:#008800", L"" },
{ {SCE_F_STRING2}, IDS_LEX_STR_63211, L"String Double Quoted", L"fore:#008800", L"" },
{ {SCE_F_STRINGEOL}, IDS_LEX_STR_63131, L"String EOL", L"fore:#008000", L"" },
{ {SCE_F_STRINGEOL}, IDS_LEX_STR_63388, L"String EOL", L"fore:#008000", L"" },
{ {SCE_F_NUMBER}, IDS_LEX_STR_63130, L"Number", L"fore:#BD3000", L"" },
{ {MULTI_STYLE(SCE_F_OPERATOR,SCE_F_OPERATOR2,0,0)}, IDS_LEX_STR_63132, L"Operator", L"bold; fore:#A60053", L"" },
{ {SCE_F_LABEL}, IDS_LEX_STR_63235, L"Label", L"fore:#C10061", L"" },

2
src/StyleLexers/styleLexKotlin.c
View File

@ -96,7 +96,7 @@ EDITLEXER lexKotlin =
{ { SCE_KOTLIN_ANNOTATION }, IDS_LEX_STR_63370, L"Annotation", L"fore:#FF8000", L"" },
{ { SCE_KOTLIN_CLASS }, IDS_LEX_STR_63258, L"Class", L"fore:#0080FF", L"" },
{ { SCE_KOTLIN_INTERFACE }, IDS_LEX_STR_63369, L"Interface", L"bold; fore:#1E90FF", L"" },
{ { SCE_KOTLIN_ENUM }, IDS_LEX_STR_63203, L"Enumeration", L"fore:#FF8000", L"" },
{ { SCE_KOTLIN_ENUM }, IDS_LEX_STR_63384, L"Enumeration", L"fore:#FF8000", L"" },
{ { SCE_KOTLIN_FUNCTION }, IDS_LEX_STR_63277, L"Function", L"fore:#A46000", L"" },
{ { MULTI_STYLE(SCE_KOTLIN_COMMENTBLOCK, SCE_KOTLIN_COMMENTLINE, 0, 0) }, IDS_LEX_STR_63127, L"Comment", L"fore:#608060", L"" },
{ { MULTI_STYLE(SCE_KOTLIN_COMMENTBLOCKDOC, SCE_KOTLIN_COMMENTLINEDOC, 0, 0) }, IDS_LEX_STR_63259, L"Comment Doc", L"fore:#408080", L"" },