+ chg: new AHK(_L) Lexer by RaptorX (https://github.com/RaptorX/LexAHKL/) (keeping old Lexer for comparison until obsolete)

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_

sciXlexers/SciXLexer.h

@@ -1,8 +1,11 @@
 #ifndef SCIXLEXER_H
 #define SCIXLEXER_H
 
-#define SCLEX_AHK 200
+#define SCLEX_AHK   200
+#define SCLEX_AHKL  201
 
+// -----------------------------------------------------------------------------
+// !!!!! ADD  Lexer Linkage in:  Notepad3\scintilla\src\Catalogue.cxx  !!!!!
 // -----------------------------------------------------------------------------
 
 #define SCE_AHK_DEFAULT 0
@@ -27,4 +30,36 @@
 #define SCE_AHK_VARREFKW 19
 #define SCE_AHK_ERROR 20
 
+#define SCE_AHKL_NEUTRAL 0
+#define SCE_AHKL_IDENTIFIER 1
+#define SCE_AHKL_COMMENTDOC 2
+#define SCE_AHKL_COMMENTLINE 3
+#define SCE_AHKL_COMMENTBLOCK 4
+#define SCE_AHKL_COMMENTKEYWORD 5
+#define SCE_AHKL_STRING 6
+#define SCE_AHKL_STRINGOPTS 7
+#define SCE_AHKL_STRINGBLOCK 8
+#define SCE_AHKL_STRINGCOMMENT 9
+#define SCE_AHKL_LABEL 10
+#define SCE_AHKL_HOTKEY 11
+#define SCE_AHKL_HOTSTRING 12
+#define SCE_AHKL_HOTSTRINGOPT 13
+#define SCE_AHKL_HEXNUMBER 14
+#define SCE_AHKL_DECNUMBER 15
+#define SCE_AHKL_VAR 16
+#define SCE_AHKL_VARREF 17
+#define SCE_AHKL_OBJECT 18
+#define SCE_AHKL_USERFUNCTION 19
+#define SCE_AHKL_DIRECTIVE 20
+#define SCE_AHKL_COMMAND 21
+#define SCE_AHKL_PARAM 22
+#define SCE_AHKL_CONTROLFLOW 23
+#define SCE_AHKL_BUILTINFUNCTION 24
+#define SCE_AHKL_BUILTINVAR 25
+#define SCE_AHKL_KEY 26
+#define SCE_AHKL_USERDEFINED1 27
+#define SCE_AHKL_USERDEFINED2 28
+#define SCE_AHKL_ESCAPESEQ 30
+#define SCE_AHKL_ERROR 31
+
 #endif

scintilla/Scintilla.vcxproj

@@ -265,6 +265,7 @@
     <ClCompile Include="..\onigmo\st.c" />
     <ClCompile Include="..\scionigmo\OnigmoRegExEngine.cxx" />
     <ClCompile Include="..\sciXlexers\LexAHK.cxx" />
+    <ClCompile Include="..\sciXlexers\LexAHKL.cxx" />
     <ClCompile Include="lexers\LexAsm.cxx" />
     <ClCompile Include="lexers\LexAU3.cxx" />
     <ClCompile Include="lexers\LexAVS.cxx" />

scintilla/Scintilla.vcxproj.filters

@@ -453,6 +453,9 @@
     <ClCompile Include="..\sciXlexers\LexAHK.cxx">
       <Filter>sciXlexers</Filter>
     </ClCompile>
+    <ClCompile Include="..\sciXlexers\LexAHKL.cxx">
+      <Filter>sciXlexers</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\ILexer.h">

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);

src/Notepad3.vcxproj

@@ -375,6 +375,7 @@
     <ClCompile Include="Notepad3.c" />
     <ClCompile Include="Print.cpp" />
     <ClCompile Include="StyleLexers\styleLexAHK.c" />
+    <ClCompile Include="StyleLexers\styleLexAHKL.c" />
     <ClCompile Include="StyleLexers\styleLexASM.c" />
     <ClCompile Include="StyleLexers\styleLexAU3.c" />
     <ClCompile Include="StyleLexers\styleLexAVS.c" />

src/Notepad3.vcxproj.filters

@@ -243,6 +243,9 @@
     <ClCompile Include="StyleLexers\styleLexYAML.c">
       <Filter>StyleLexers</Filter>
     </ClCompile>
+    <ClCompile Include="StyleLexers\styleLexAHKL.c">
+      <Filter>StyleLexers</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Dialogs.h">

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

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"" },

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

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
 
 

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%