From c58cfa2fbee647bebc52092c17601065d6e37211 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Fri, 7 Sep 2018 16:32:09 +0200 Subject: [PATCH] + chg: new AHK(_L) Lexer by RaptorX (https://github.com/RaptorX/LexAHKL/) (keeping old Lexer for comparison until obsolete) --- language/common_res.h | 6 +++++ language/np3_af_za/lexer_af_za.rc | Bin 34854 -> 35368 bytes language/np3_de_de/lexer_de_de.rc | Bin 34858 -> 35372 bytes language/np3_en_gb/lexer_en_gb.rc | Bin 34920 -> 35450 bytes language/np3_en_us/lexer_en_us.rc | Bin 31668 -> 32168 bytes language/np3_es_es/lexer_es_es.rc | Bin 34944 -> 35458 bytes language/np3_fr_fr/lexer_fr_fr.rc | Bin 34856 -> 35370 bytes language/np3_ja_jp/lexer_ja_jp.rc | Bin 31742 -> 32252 bytes language/np3_nl_nl/lexer_nl_nl.rc | Bin 31668 -> 32184 bytes language/np3_zh_cn/lexer_zh_cn.rc | Bin 33562 -> 34068 bytes sciXlexers/SciXLexer.h | 37 +++++++++++++++++++++++++++- scintilla/Scintilla.vcxproj | 1 + scintilla/Scintilla.vcxproj.filters | 3 +++ scintilla/src/Catalogue.cxx | 1 + src/Notepad3.vcxproj | 1 + src/Notepad3.vcxproj.filters | 3 +++ src/StyleLexers/EditLexer.h | 1 + src/StyleLexers/styleLexAHK.c | 2 +- src/Styles.c | 1 + src/Styles.h | 2 +- test/TestAhkNotepad3.ahk | 2 +- 21 files changed, 56 insertions(+), 4 deletions(-) diff --git a/language/common_res.h b/language/common_res.h index 50628793b..380c2c367 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -667,6 +667,7 @@ #define IDS_LEX_NIM_SRC 63044 #define IDS_LEX_R_STAT 63045 #define IDS_LEX_RUST_SRC 63046 +#define IDS_LEX_AHKL 63047 #define IDS_LEX_STD_STYLE 63100 #define IDS_LEX_STD_MARGIN 63101 @@ -916,5 +917,10 @@ #define IDS_LEX_STR_63344 63344 #define IDS_LEX_STR_63345 63345 #define IDS_LEX_STR_63346 63346 +#define IDS_LEX_STR_63347 63347 +#define IDS_LEX_STR_63348 63348 +#define IDS_LEX_STR_63349 63349 +#define IDS_LEX_STR_63350 63350 +#define IDS_LEX_STR_63351 63351 #endif //_COMMON_RES_H_ diff --git a/language/np3_af_za/lexer_af_za.rc b/language/np3_af_za/lexer_af_za.rc index ef1349ecd226c7e52b08419f7dbb669914a3df77..3961710aa4d3620056dad07acd6ba2465acbc467 100644 GIT binary patch delta 179 zcmZ2Bfoa7QrVaaKCkOCIOr9Xg#^^KoA+O@(10r0L4@n9!$20g$7UUJ3yi3Y&vV#)G zW)Zn-X_LFWRhW$#OeSB<7v}V5NMguhNM%T#Tv)2lXfoNbT6nUZF56@k4=q-p8V1YB z8;yn8^BGDQyctp_D|+YxMNJtDK%&e*(aEwI=3o&+kcc!$T`&+AF=R62F{Cs2GZX-M TnGE?1d6VmTMK}Lw(PIVxoTD+0 delta 27 icmZ26g=yIYrVaaKCwqzbZEldemj-0;ZT{7!#|!|YB?~zK diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc index b638a9c6abd66b61ec352bdade20b00cb6f35881..8ab2de343bc20ac586bb0847bf8ad5545abd749f 100644 GIT binary patch delta 187 zcmZ2AfoaVYrVYnrC-XE&usbq%FnBZgOr9vHIr)U72y;A;ttcQmd4^Ze^J`U^#hV zh%je9LkZ9tn5Zd(0Z5b?C_34&#d7ka1fj_rLRf@Bs)B*Ih#`|9k0BjsdckDIT-nL< M*rhfrv~n>60CMj%5C8xG delta 35 tcmV+;0Nnqqlme=d0QfG delta 31 mcmex0h3UlvrVaOGCufQHZC)VvD-Foto4kWvYI8!n6f*$pt_>&v diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc index 854c09afeb28d9678111a6885a67d4f084fc4c62..bd86276f6693ec4aee69a423384fdf19aef5ea93 100644 GIT binary patch delta 150 zcmdn;opHr)#tjP6llY}3H;A)LR+5yNyg*!pIiA61@J0`G6hEBq<^0cm|)z3x!1|Yq$h$_LIAnHaVwA zW%7Y07HM+^1r(^n;Lni6kj0S7kUV*PsXn90WX2|8W^abn$%#UWlP{F=F`F=0PQGX; z%%0Cs!hkGp%3uHzX9kK-PHeGcHf1mb@r6O^f`Pb*A(J7GAsuLb!DPc++0ACHUd#Y) COfm@o delta 27 jcmZpg%G5BCX~Q4c$r0v3n-9s|N}GIwU1M`ly8$x*sJsh? diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc index ce7907c55356666963f2ff8603e74c41505e2088..86e7714ba5100d5edc0ea356f1244a18e01b31a2 100644 GIT binary patch delta 167 zcmZ26foatgrVYnrCkr%)usSk$FnCWk6w{u3L{fw~p225wqk!b*W3oo+lWmGrCQoQ$ znf$~=fLn>dpCO4Miy@UEd9tFFE?E3hqY$$$sP8A=$S;;hCD zrVIv?ALa`)14SnrwpcQoG8lsR!XQ<_KwQL-$&km84m7`DGGngnn8n-y9)m;q^p BGQ0o) delta 27 jcmZ2Ag=xhErVYnrH(SXWrBCMI;+s5&U23yZI|nlWl4c1U diff --git a/language/np3_ja_jp/lexer_ja_jp.rc b/language/np3_ja_jp/lexer_ja_jp.rc index 1acd99e1cd7bf5a4acc39f2133272bc3317e57a7..499c104a66bcb0b8711fa633fbf9292390a505bc 100644 GIT binary patch delta 181 zcmezOo$=3a#trjiCj0P9v3f9gGx$t46jz>nK#6Vg6$ugMcp!hHWc=g>vK*Vg$Xtt_ z{31(@(PZ+(Qekd?h9rh8hE#@RhLXvQ<@%E!6$!C=1NoI;-liNOZV!fhh7zEWAhD0x zx|5jUvd=^ z^HBv~e}lMrH#XYiTaC>cGuK!as+fgH=` zV>17eCdWjnFd9#8j1rzKpvA(T#E`|1%8)$yVWmE!$>fh&!jl(huuT@r)&i-C7M}b- zmxVc>p=2_Dwjr}IgXv_!Dsje=$$#rCnN1lCCtuVR76!^P1OssqLncEWLpp;$L&4;; Q>9UjWuuE-zQ?JJi0B`Lw%K!iX delta 31 ncmbQz#WbspX+wd` + diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters index 701ad07c7..50fadafa9 100644 --- a/scintilla/Scintilla.vcxproj.filters +++ b/scintilla/Scintilla.vcxproj.filters @@ -453,6 +453,9 @@ sciXlexers + + sciXlexers + diff --git a/scintilla/src/Catalogue.cxx b/scintilla/src/Catalogue.cxx index 12b2e3975..9dcedac4d 100644 --- a/scintilla/src/Catalogue.cxx +++ b/scintilla/src/Catalogue.cxx @@ -76,6 +76,7 @@ int Scintilla_LinkLexers() { //LINK_LEXER(lmAbaqus); //LINK_LEXER(lmAda); LINK_LEXER(lmAHK); + LINK_LEXER(lmAHKL); //LINK_LEXER(lmAPDL); //LINK_LEXER(lmAs); LINK_LEXER(lmAsm); diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj index 3abd8f226..18649a76d 100644 --- a/src/Notepad3.vcxproj +++ b/src/Notepad3.vcxproj @@ -375,6 +375,7 @@ + diff --git a/src/Notepad3.vcxproj.filters b/src/Notepad3.vcxproj.filters index dfed41470..8383e6a9c 100644 --- a/src/Notepad3.vcxproj.filters +++ b/src/Notepad3.vcxproj.filters @@ -243,6 +243,9 @@ StyleLexers + + StyleLexers + diff --git a/src/StyleLexers/EditLexer.h b/src/StyleLexers/EditLexer.h index 380fa37fa..a28b7bdc2 100644 --- a/src/StyleLexers/EditLexer.h +++ b/src/StyleLexers/EditLexer.h @@ -59,6 +59,7 @@ extern EDITLEXER lexANSI; // ANSI Files extern EDITLEXER lexCONF; // Apache Config Files extern EDITLEXER lexASM; // Assembly Script extern EDITLEXER lexAHK; // AutoHotkey Script +extern EDITLEXER lexAHKL; // AutoHotkey L Script extern EDITLEXER lexAU3; // AutoIt3 Script extern EDITLEXER lexAVS; // AviSynth Script extern EDITLEXER lexAwk; // Awk Script diff --git a/src/StyleLexers/styleLexAHK.c b/src/StyleLexers/styleLexAHK.c index ac3d81153..9ab79fb2b 100644 --- a/src/StyleLexers/styleLexAHK.c +++ b/src/StyleLexers/styleLexAHK.c @@ -108,7 +108,7 @@ KEYWORDLIST KeyWords_AHK = { EDITLEXER lexAHK = { -SCLEX_AHK, IDS_LEX_AHK, L"AutoHotkey Script", L"ahk; ia; scriptlet", L"", +SCLEX_AHK, IDS_LEX_AHK, L"AutoHotkey Script", L"", L"", &KeyWords_AHK, { { STYLE_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ SCE_AHK_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/Styles.c b/src/Styles.c index 34ed92055..39a7ee290 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -111,6 +111,7 @@ static PEDITLEXER g_pLexArray[NUMLEXERS] = &lexCONF, // Apache Config Files &lexASM, // Assembly Script &lexAHK, // AutoHotkey Script + &lexAHKL, // AutoHotkey L Script &lexAU3, // AutoIt3 Script &lexAVS, // AviSynth Script &lexAwk, // Awk Script diff --git a/src/Styles.h b/src/Styles.h index 7a4bc3382..a4ecc7c83 100644 --- a/src/Styles.h +++ b/src/Styles.h @@ -25,7 +25,7 @@ #define MARGIN_SCI_FOLDING 2 // Number of Lexers in pLexArray -#define NUMLEXERS 48 +#define NUMLEXERS 49 #define AVG_NUM_OF_STYLES_PER_LEXER 20 diff --git a/test/TestAhkNotepad3.ahk b/test/TestAhkNotepad3.ahk index f7c8cbbb6..2703b30f6 100644 --- a/test/TestAhkNotepad3.ahk +++ b/test/TestAhkNotepad3.ahk @@ -43,7 +43,7 @@ Goto LABEL_END ; ============================================================================= ; ============================================================================= -CHECK_NP3_STARTS: +CHECK_NP3_STARTS: ; check that NP3 starts up WinWait ahk_pid %v_Notepad3_PID%, , 3 v_ErrLevel = %ErrorLevel%