From 2280513b780283eb6d933c9d01ce9f54f7af4c1a Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 23 Mar 2021 17:28:26 +0100 Subject: [PATCH] + add: Decorator styling for Python files + chg: style color for triple strings in Python Lexer --- language/common_res.h | 1 + language/np3_de_de/lexer_de_de.rc | 5 +++++ language/np3_en_us/lexer_en_us.rc | 5 +++++ src/StyleLexers/styleLexPY.c | 9 +++++---- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/language/common_res.h b/language/common_res.h index 89e44f9f2..31c75926f 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -1143,6 +1143,7 @@ #define IDS_LEX_STR_63369 63369 #define IDS_LEX_STR_63370 63370 #define IDS_LEX_STR_63371 63371 +#define IDS_LEX_STR_63372 63372 #define IDS_LEX_CSV_COL_0 63400 #define IDS_LEX_CSV_COL_1 63401 diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc index d6f7963f9..8501417fb 100644 --- a/language/np3_de_de/lexer_de_de.rc +++ b/language/np3_de_de/lexer_de_de.rc @@ -473,6 +473,11 @@ BEGIN IDS_LEX_STR_63371 "Comment Doc Word" END +STRINGTABLE +BEGIN + IDS_LEX_STR_63372 "Decorator" +END + STRINGTABLE BEGIN IDS_LEX_CSV_COL_0 "Column 0" diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc index fdad9b830..52c0754cc 100644 --- a/language/np3_en_us/lexer_en_us.rc +++ b/language/np3_en_us/lexer_en_us.rc @@ -473,6 +473,11 @@ BEGIN IDS_LEX_STR_63371 "Comment Doc Word" END +STRINGTABLE +BEGIN + IDS_LEX_STR_63372 "Decorator" +END + STRINGTABLE BEGIN IDS_LEX_CSV_COL_0 "Column 0" diff --git a/src/StyleLexers/styleLexPY.c b/src/StyleLexers/styleLexPY.c index e9deca807..7cbe46cd1 100644 --- a/src/StyleLexers/styleLexPY.c +++ b/src/StyleLexers/styleLexPY.c @@ -17,12 +17,13 @@ EDITLEXER lexPY = { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_P_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, { {MULTI_STYLE(SCE_P_COMMENTLINE,SCE_P_COMMENTBLOCK,0,0)}, IDS_LEX_STR_63127, L"Comment", L"fore:#880000", L"" }, - { {SCE_P_WORD}, IDS_LEX_STR_63128, L"Keyword", L"fore:#000088", L"" }, + { {MULTI_STYLE(SCE_P_WORD,SCE_P_WORD2,0,0)}, IDS_LEX_STR_63128, L"Keyword", L"fore:#000088", L"" }, { {SCE_P_IDENTIFIER}, IDS_LEX_STR_63129, L"Identifier", L"", L"" }, - { {MULTI_STYLE(SCE_P_STRING,SCE_P_FSTRING,SCE_P_STRINGEOL,0)}, IDS_LEX_STR_63211, L"String Double Quoted", L"fore:#008800", L"" }, { {MULTI_STYLE(SCE_P_CHARACTER,SCE_P_FCHARACTER,0,0)}, IDS_LEX_STR_63212, L"String Single Quoted", L"fore:#008800", L"" }, - { {MULTI_STYLE(SCE_P_TRIPLEDOUBLE,SCE_P_FTRIPLEDOUBLE,0,0)}, IDS_LEX_STR_63244, L"String Triple Double Quotes", L"fore:#008800", L"" }, - { {MULTI_STYLE(SCE_P_TRIPLE, SCE_P_FTRIPLE,0,0)}, IDS_LEX_STR_63245, L"String Triple Single Quotes", L"fore:#008800", L"" }, + { {MULTI_STYLE(SCE_P_STRING,SCE_P_FSTRING,SCE_P_STRINGEOL,0)}, IDS_LEX_STR_63211, L"String Double Quoted", L"fore:#008800", L"" }, + { {MULTI_STYLE(SCE_P_TRIPLE, SCE_P_FTRIPLE,0,0)}, IDS_LEX_STR_63245, L"String Triple Single Quotes", L"fore:#88B634", L"" }, + { {MULTI_STYLE(SCE_P_TRIPLEDOUBLE,SCE_P_FTRIPLEDOUBLE,0,0)}, IDS_LEX_STR_63244, L"String Triple Double Quotes", L"fore:#88B634", L"" }, + { {SCE_P_DECORATOR}, IDS_LEX_STR_63372, L"Decorator", L"fore:#F2B600", L"" }, { {SCE_P_NUMBER}, IDS_LEX_STR_63130, L"Number", L"fore:#FF4000", L"" }, { {SCE_P_OPERATOR}, IDS_LEX_STR_63132, L"Operator", L"bold; fore:#666600", L"" }, { {SCE_P_DEFNAME}, IDS_LEX_STR_63247, L"Function Name", L"fore:#660066", L"" },