- update to N++ interfaces for 8.4.1 with scintilla 5.2.2 and lexilla 5.1.6

- fix issue with ConsoleDialog lexer usage of SCLEX_CONTAINER, issue: Console Lexer broken in Notepad 8.3.3 / Scintilla 5+ bruderstein#234
  open issue: how to use setILexer from python, needed for sample script ColumnLexer.py
- adapted CreateWrapper.py to also read LexicalStyles.iface
  open issue: handling of colouralpha and related calls, currently just handled like colour, so alpha info is missing

Author: chcg

NppPlugin/include/Common.h

@@ -22,6 +22,7 @@
 #include <cstdint>
 #include <unordered_set>
 #include <algorithm>
+#include <tchar.h>
 
 
 const bool dirUp = true;
@@ -159,10 +160,6 @@ class WcharMbcsConvertor final
 };
 
 
-
-#define MACRO_RECORDING_IN_PROGRESS 1
-#define MACRO_RECORDING_HAS_STOPPED 2
-
 #define REBARBAND_SIZE sizeof(REBARBANDINFO)
 
 generic_string PathRemoveFileSpec(generic_string & path);
@@ -235,3 +232,57 @@ int nbDigitsFromNbLines(size_t nbLines);
 generic_string getDateTimeStrFrom(const generic_string& dateTimeFormat, const SYSTEMTIME& st);
 
 HFONT createFont(const TCHAR* fontName, int fontSize, bool isBold, HWND hDestParent);
+
+class Version final
+{
+public:
+	Version() = default;
+	Version(const generic_string& versionStr);
+
+	void setVersionFrom(const generic_string& filePath);
+	generic_string toString();
+	bool isNumber(const generic_string& s) const {
+		return !s.empty() &&
+			find_if(s.begin(), s.end(), [](TCHAR c) { return !_istdigit(c); }) == s.end();
+	};
+
+	int compareTo(const Version& v2c) const;
+
+	bool operator < (const Version& v2c) const {
+		return compareTo(v2c) == -1;
+	};
+
+	bool operator <= (const Version& v2c) const {
+		int r = compareTo(v2c);
+		return r == -1 || r == 0;
+	};
+
+	bool operator > (const Version& v2c) const {
+		return compareTo(v2c) == 1;
+	};
+
+	bool operator >= (const Version& v2c) const {
+		int r = compareTo(v2c);
+		return r == 1 || r == 0;
+	};
+
+	bool operator == (const Version& v2c) const {
+		return compareTo(v2c) == 0;
+	};
+
+	bool operator != (const Version& v2c) const {
+		return compareTo(v2c) != 0;
+	};
+
+	bool empty() const {
+		return _major == 0 && _minor == 0 && _patch == 0 && _build == 0;
+	}
+
+	bool isCompatibleTo(const Version& from, const Version& to) const;
+
+private:
+	unsigned long _major = 0;
+	unsigned long _minor = 0;
+	unsigned long _patch = 0;
+	unsigned long _build = 0;
+};

NppPlugin/include/Docking.h

@@ -57,15 +57,15 @@ struct tTbData {
 	const TCHAR* pszAddInfo = nullptr;     // for plugin to display additional informations
 
 	// internal data, do not use !!!
-	RECT rcFloat = {0};                    // floating position
+	RECT rcFloat = {};                    // floating position
 	int iPrevCont = 0;                     // stores the privious container (toggling between float and dock)
 	const TCHAR* pszModuleName = nullptr;  // it's the plugin file name. It's used to identify the plugin
 };
 
 
 struct tDockMgr {
 	HWND hWnd = nullptr;                   // the docking manager wnd
-	RECT rcRegion[DOCKCONT_MAX] = {{0}};   // position of docked dialogs
+	RECT rcRegion[DOCKCONT_MAX] = {{}};   // position of docked dialogs
 };
 
 

NppPlugin/include/DockingDlgInterface.h

@@ -104,7 +104,7 @@ protected :
 					break;
 				}
 
-				RECT rc = { 0 };
+				RECT rc = {};
 				getClientRect(rc);
 				::FillRect(reinterpret_cast<HDC>(wParam), &rc, NppDarkMode::getDarkerBackgroundBrush());
 				return TRUE;

NppPlugin/include/Notepad_plus_msgs.h

@@ -36,8 +36,10 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
 			   // Don't use L_JS, use L_JAVASCRIPT instead
 			   // The end of enumated language type, so it should be always at the end
 			   L_EXTERNAL};
+enum class ExternalLexerAutoIndentMode { Standard, C_Like, Custom };
+enum class MacroStatus { Idle, RecordInProgress, RecordingStopped, PlayingBack };
 
-enum winVer{ WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8, WV_WIN81, WV_WIN10 };
+enum winVer { WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8, WV_WIN81, WV_WIN10 };
 enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 
 
@@ -454,6 +456,63 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 		HICON	hToolbarIconDarkMode;
 	};
 
+	#define NPPM_GETEXTERNALLEXERAUTOINDENTMODE  (NPPMSG + 103)
+	// BOOL NPPM_GETEXTERNALLEXERAUTOINDENTMODE(const TCHAR *languageName, ExternalLexerAutoIndentMode &autoIndentMode)
+	// Get ExternalLexerAutoIndentMode for an installed external programming language.
+	// - Standard means Notepad++ will keep the same TAB indentation between lines;
+	// - C_Like means Notepad++ will perform a C-Language style indentation for the selected external language;
+	// - Custom means a Plugin will be controlling auto-indentation for the current language.
+	// returned values: TRUE for successful searches, otherwise FALSE.
+
+	#define NPPM_SETEXTERNALLEXERAUTOINDENTMODE  (NPPMSG + 104)
+	// BOOL NPPM_SETEXTERNALLEXERAUTOINDENTMODE(const TCHAR *languageName, ExternalLexerAutoIndentMode autoIndentMode)
+	// Set ExternalLexerAutoIndentMode for an installed external programming language.
+	// - Standard means Notepad++ will keep the same TAB indentation between lines;
+	// - C_Like means Notepad++ will perform a C-Language style indentation for the selected external language;
+	// - Custom means a Plugin will be controlling auto-indentation for the current language.
+	// returned value: TRUE if function call was successful, otherwise FALSE.
+
+	#define NPPM_ISAUTOINDENTON  (NPPMSG + 105)
+	// BOOL NPPM_ISAUTOINDENTON(0, 0)
+	// Returns the current Use Auto-Indentation setting in Notepad++ Preferences.
+
+	#define NPPM_GETCURRENTMACROSTATUS (NPPMSG + 106)
+	// MacroStatus NPPM_GETCURRENTMACROSTATUS(0, 0)
+	// Gets current enum class MacroStatus { Idle - means macro is not in use and it's empty, RecordInProgress, RecordingStopped, PlayingBack }
+
+	#define NPPM_ISDARKMODEENABLED (NPPMSG + 107)
+	// bool NPPM_ISDARKMODEENABLED(0, 0)
+	// Returns true when Notepad++ Dark Mode is enable, false when it is not.
+
+	#define NPPM_GETDARKMODECOLORS (NPPMSG + 108)
+	// bool NPPM_GETDARKMODECOLORS (size_t cbSize, NppDarkMode::Colors* returnColors)
+	// - cbSize must be filled with sizeof(NppDarkMode::Colors).
+	// - returnColors must be a pre-allocated NppDarkMode::Colors struct.
+	// Returns true when successful, false otherwise.
+	// You need to uncomment the following code to use NppDarkMode::Colors structure:
+	//
+	// namespace NppDarkMode
+	// {
+	//	struct Colors
+	//	{
+	//		COLORREF background = 0;
+	//		COLORREF softerBackground = 0;
+	//		COLORREF hotBackground = 0;
+	//		COLORREF pureBackground = 0;
+	//		COLORREF errorBackground = 0;
+	//		COLORREF text = 0;
+	//		COLORREF darkerText = 0;
+	//		COLORREF disabledText = 0;
+	//		COLORREF linkText = 0;
+	//		COLORREF edge = 0;
+	//		COLORREF hotEdge = 0;
+	//	};
+	// }
+	//
+	// Note: in the case of calling failure ("false" is returned), you may need to change NppDarkMode::Colors structure to:
+	// https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/src/NppDarkMode.h#L32
+
+
 #define VAR_NOT_RECOGNIZED 0
 #define FULL_CURRENT_PATH 1
 #define CURRENT_DIRECTORY 2
@@ -466,6 +525,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 #define CURRENT_COLUMN 9
 #define NPP_FULL_FILE_PATH 10
 #define GETFILENAMEATCURSOR 11
+#define CURRENT_LINESTR 12
 
 #define	RUNCOMMAND_USER    (WM_USER + 3000)
 	#define NPPM_GETFULLCURRENTPATH		(RUNCOMMAND_USER + FULL_CURRENT_PATH)
@@ -476,6 +536,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 	#define NPPM_GETCURRENTWORD			(RUNCOMMAND_USER + CURRENT_WORD)
 	#define NPPM_GETNPPDIRECTORY		(RUNCOMMAND_USER + NPP_DIRECTORY)
 	#define NPPM_GETFILENAMEATCURSOR	(RUNCOMMAND_USER + GETFILENAMEATCURSOR)
+	#define NPPM_GETCURRENTLINESTR      (RUNCOMMAND_USER + CURRENT_LINESTR)
 	// BOOL NPPM_GETXXXXXXXXXXXXXXXX(size_t strLen, TCHAR *str)
 	// where str is the allocated TCHAR array,
 	//	     strLen is the allocated array size
@@ -636,3 +697,9 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 	//scnNotification->nmhdr.code = NPPN_FILEDELETED;
 	//scnNotification->nmhdr.hwndFrom = hwndNpp;
 	//scnNotification->nmhdr.idFrom = BufferID;
+
+	#define NPPN_DARKMODECHANGED (NPPN_FIRST + 27) // To notify plugins that Dark Mode was enabled/disabled
+	//scnNotification->nmhdr.code = NPPN_DARKMODECHANGED;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	//scnNotification->nmhdr.idFrom = 0;
+

NppPlugin/include/NppDarkMode.h

@@ -41,6 +41,7 @@ namespace NppDarkMode
 		COLORREF disabledText = 0;
 		COLORREF linkText = 0;
 		COLORREF edge = 0;
+		COLORREF hotEdge = 0;
 	};
 
 	struct Options
@@ -103,15 +104,20 @@ namespace NppDarkMode
 	COLORREF getLinkTextColor();
 
 	COLORREF getEdgeColor();
+	COLORREF getHotEdgeColor();
 
 	HBRUSH getBackgroundBrush();
 	HBRUSH getDarkerBackgroundBrush();
 	HBRUSH getSofterBackgroundBrush();
 	HBRUSH getHotBackgroundBrush();
 	HBRUSH getErrorBackgroundBrush();
 
+	HBRUSH getEdgeBrush();
+	HBRUSH getHotEdgeBrush();
+
 	HPEN getDarkerTextPen();
 	HPEN getEdgePen();
+	HPEN getHotEdgePen();
 
 	void setBackgroundColor(COLORREF c);
 	void setSofterBackgroundColor(COLORREF c);
@@ -153,6 +159,8 @@ namespace NppDarkMode
 	void autoSubclassAndThemeChildControls(HWND hwndParent, bool subclass = true, bool theme = true);
 	void autoThemeChildControls(HWND hwndParent);
 
+	void autoSubclassAndThemeTabUpDownControl(HWND hwndParent, HWND hwndUpdown);
+
 	void setDarkTitleBar(HWND hwnd);
 	void setDarkExplorerTheme(HWND hwnd);
 	void setDarkScrollBar(HWND hwnd);
@@ -165,8 +173,12 @@ namespace NppDarkMode
 	void setTreeViewStyle(HWND hwnd);
 	void setBorder(HWND hwnd, bool border = true);
 
+	BOOL CALLBACK enumAutocompleteProc(HWND hwnd, LPARAM lParam);
+	void setDarkAutoCompletion();
+
 	LRESULT onCtlColor(HDC hdc);
 	LRESULT onCtlColorSofter(HDC hdc);
 	LRESULT onCtlColorDarker(HDC hdc);
 	LRESULT onCtlColorError(HDC hdc);
+	LRESULT onCtlColorDarkerBGStaticText(HDC hdc, bool isTextEnabled);
 }

NppPlugin/include/SciLexer.h

@@ -144,6 +144,10 @@
 #define SCLEX_DATAFLEX 129
 #define SCLEX_HOLLYWOOD 130
 #define SCLEX_RAKU 131
+#define SCLEX_FSHARP 132
+#define SCLEX_JULIA 133
+#define SCLEX_ASCIIDOC 134
+#define SCLEX_GDSCRIPT 135
 #define SCLEX_SEARCHRESULT 150
 #define SCLEX_OBJC 151
 #define SCLEX_USER 152
@@ -280,6 +284,7 @@
 #define SCE_P_FCHARACTER 17
 #define SCE_P_FTRIPLE 18
 #define SCE_P_FTRIPLEDOUBLE 19
+#define SCE_P_ATTRIBUTE 20
 #define SCE_C_DEFAULT 0
 #define SCE_C_COMMENT 1
 #define SCE_C_COMMENTLINE 2
@@ -889,7 +894,7 @@
 #define SCE_CSS_EXTENDED_IDENTIFIER 19
 #define SCE_CSS_EXTENDED_PSEUDOCLASS 20
 #define SCE_CSS_EXTENDED_PSEUDOELEMENT 21
-#define SCE_CSS_MEDIA 22
+#define SCE_CSS_GROUP_RULE 22
 #define SCE_CSS_VARIABLE 23
 #define SCE_POV_DEFAULT 0
 #define SCE_POV_COMMENT 1
@@ -1057,6 +1062,28 @@
 #define SCE_ERLANG_MODULES 23
 #define SCE_ERLANG_MODULES_ATT 24
 #define SCE_ERLANG_UNKNOWN 31
+#define SCE_JULIA_DEFAULT 0
+#define SCE_JULIA_COMMENT 1
+#define SCE_JULIA_NUMBER 2
+#define SCE_JULIA_KEYWORD1 3
+#define SCE_JULIA_KEYWORD2 4
+#define SCE_JULIA_KEYWORD3 5
+#define SCE_JULIA_CHAR 6
+#define SCE_JULIA_OPERATOR 7
+#define SCE_JULIA_BRACKET 8
+#define SCE_JULIA_IDENTIFIER 9
+#define SCE_JULIA_STRING 10
+#define SCE_JULIA_SYMBOL 11
+#define SCE_JULIA_MACRO 12
+#define SCE_JULIA_STRINGINTERP 13
+#define SCE_JULIA_DOCSTRING 14
+#define SCE_JULIA_STRINGLITERAL 15
+#define SCE_JULIA_COMMAND 16
+#define SCE_JULIA_COMMANDLITERAL 17
+#define SCE_JULIA_TYPEANNOT 18
+#define SCE_JULIA_LEXERROR 19
+#define SCE_JULIA_KEYWORD4 20
+#define SCE_JULIA_TYPEOPERATOR 21
 #define SCE_MSSQL_DEFAULT 0
 #define SCE_MSSQL_COMMENT 1
 #define SCE_MSSQL_LINE_COMMENT 2
@@ -2084,6 +2111,66 @@
 #define SCE_RAKU_CALLABLE 26
 #define SCE_RAKU_GRAMMAR 27
 #define SCE_RAKU_CLASS 28
+#define SCE_FSHARP_DEFAULT 0
+#define SCE_FSHARP_KEYWORD 1
+#define SCE_FSHARP_KEYWORD2 2
+#define SCE_FSHARP_KEYWORD3 3
+#define SCE_FSHARP_KEYWORD4 4
+#define SCE_FSHARP_KEYWORD5 5
+#define SCE_FSHARP_IDENTIFIER 6
+#define SCE_FSHARP_QUOT_IDENTIFIER 7
+#define SCE_FSHARP_COMMENT 8
+#define SCE_FSHARP_COMMENTLINE 9
+#define SCE_FSHARP_PREPROCESSOR 10
+#define SCE_FSHARP_LINENUM 11
+#define SCE_FSHARP_OPERATOR 12
+#define SCE_FSHARP_NUMBER 13
+#define SCE_FSHARP_CHARACTER 14
+#define SCE_FSHARP_STRING 15
+#define SCE_FSHARP_VERBATIM 16
+#define SCE_FSHARP_QUOTATION 17
+#define SCE_FSHARP_ATTRIBUTE 18
+#define SCE_FSHARP_FORMAT_SPEC 19
+#define SCE_ASCIIDOC_DEFAULT 0
+#define SCE_ASCIIDOC_STRONG1 1
+#define SCE_ASCIIDOC_STRONG2 2
+#define SCE_ASCIIDOC_EM1 3
+#define SCE_ASCIIDOC_EM2 4
+#define SCE_ASCIIDOC_HEADER1 5
+#define SCE_ASCIIDOC_HEADER2 6
+#define SCE_ASCIIDOC_HEADER3 7
+#define SCE_ASCIIDOC_HEADER4 8
+#define SCE_ASCIIDOC_HEADER5 9
+#define SCE_ASCIIDOC_HEADER6 10
+#define SCE_ASCIIDOC_ULIST_ITEM 11
+#define SCE_ASCIIDOC_OLIST_ITEM 12
+#define SCE_ASCIIDOC_BLOCKQUOTE 13
+#define SCE_ASCIIDOC_LINK 14
+#define SCE_ASCIIDOC_CODEBK 15
+#define SCE_ASCIIDOC_PASSBK 16
+#define SCE_ASCIIDOC_COMMENT 17
+#define SCE_ASCIIDOC_COMMENTBK 18
+#define SCE_ASCIIDOC_LITERAL 19
+#define SCE_ASCIIDOC_LITERALBK 20
+#define SCE_ASCIIDOC_ATTRIB 21
+#define SCE_ASCIIDOC_ATTRIBVAL 22
+#define SCE_ASCIIDOC_MACRO 23
+#define SCE_GD_DEFAULT 0
+#define SCE_GD_COMMENTLINE 1
+#define SCE_GD_NUMBER 2
+#define SCE_GD_STRING 3
+#define SCE_GD_CHARACTER 4
+#define SCE_GD_WORD 5
+#define SCE_GD_TRIPLE 6
+#define SCE_GD_TRIPLEDOUBLE 7
+#define SCE_GD_CLASSNAME 8
+#define SCE_GD_FUNCNAME 9
+#define SCE_GD_OPERATOR 10
+#define SCE_GD_IDENTIFIER 11
+#define SCE_GD_COMMENTBLOCK 12
+#define SCE_GD_STRINGEOL 13
+#define SCE_GD_WORD2 14
+#define SCE_GD_ANNOTATION 15
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 #endif

NppPlugin/include/Sci_Position.h

@@ -15,10 +15,8 @@
 typedef ptrdiff_t Sci_Position;
 
 // Unsigned variant used for ILexer::Lex and ILexer::Fold
-// Definitions of common types
 typedef size_t Sci_PositionU;
 
-
 // For Sci_CharacterRange  which is defined as long to be compatible with Win32 CHARRANGE
 typedef intptr_t Sci_PositionCR;