update to N++ notepad-plus-plus/notepad-plus-plus@ff734af

8.7.8 + scintilla 5.5.5 & Lexilla 5.4.3

Author: chcg

NppPlugin/include/Common.h

@@ -287,4 +287,10 @@ BOOL getFileAttributesExWithTimeout(const wchar_t* filePath, WIN32_FILE_ATTRIBUT
 
 bool doesFileExist(const wchar_t* filePath, DWORD milliSec2wait = 0, bool* isTimeoutReached = nullptr);
 bool doesDirectoryExist(const wchar_t* dirPath, DWORD milliSec2wait = 0, bool* isTimeoutReached = nullptr);
-bool doesPathExist(const wchar_t* path, DWORD milliSec2wait = 0, bool* isTimeoutReached = nullptr);
+bool doesPathExist(const wchar_t* path, DWORD milliSec2wait = 0, bool* isTimeoutReached = nullptr);
+
+
+// check if the window rectangle intersects with any currently active monitor's working area
+bool isWindowVisibleOnAnyMonitor(const RECT& rectWndIn);
+
+bool isCoreWindows();

NppPlugin/include/Notepad_plus_msgs.h

@@ -39,7 +39,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
 			   L_MMIXAL, L_NIM, L_NNCRONTAB, L_OSCRIPT, L_REBOL, \
 			   L_REGISTRY, L_RUST, L_SPICE, L_TXT2TAGS, L_VISUALPROLOG,\
 			   L_TYPESCRIPT, L_JSON5, L_MSSQL, L_GDSCRIPT, L_HOLLYWOOD,\
-			   L_GOLANG, L_RAKU, L_TOML,\
+			   L_GOLANG, L_RAKU, L_TOML, L_SAS,\
 			   // 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};
@@ -111,7 +111,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 	// return value: The number of files in XML session file
 
 	#define NPPM_GETSESSIONFILES (NPPMSG + 14)
-	// NPPM_GETSESSIONFILES (wchar_t** sessionFileArray, wchar_t* sessionFileName)
+	// BOOL NPPM_GETSESSIONFILES (wchar_t** sessionFileArray, wchar_t* sessionFileName)
 	// the files' full path name from a session file.
 	// wParam[out]: sessionFileArray is the array in which the files' full path of the same group are written. To allocate the array with the proper size, send message NPPM_GETNBSESSIONFILES.
 	// lParam[in]: sessionFileName is XML session full path
@@ -974,7 +974,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 	// Note: there's no symetric command NPPM_SETTABCOLORID. Plugins can use NPPM_MENUCOMMAND to set current tab color with the desired tab color ID.
 
 	#define NPPM_SETUNTITLEDNAME (NPPMSG + 115)
-	// int NPPM_SETUNTITLEDNAME(BufferID id, const wchar_t* newName)
+	// BOOL NPPM_SETUNTITLEDNAME(BufferID id, const wchar_t* newName)
 	// Rename the tab name for an untitled tab.
 	// wParam[in]: id - BufferID of the tab. -1 for currently active tab
 	// lParam[in]: newName - the desired new name of the tab
@@ -1018,6 +1018,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 	//  	...
 	//  }
 
+
 	// For RUNCOMMAND_USER
 	#define VAR_NOT_RECOGNIZED 0
 	#define FULL_CURRENT_PATH 1

NppPlugin/include/SciLexer.h

@@ -152,6 +152,7 @@
 #define SCLEX_TROFF 137
 #define SCLEX_DART 138
 #define SCLEX_ZIG 139
+#define SCLEX_NIX 140
 #define SCLEX_SEARCHRESULT 150
 #define SCLEX_OBJC 151
 #define SCLEX_USER 152
@@ -205,6 +206,19 @@
 #define SCE_C_USERLITERAL 25
 #define SCE_C_TASKMARKER 26
 #define SCE_C_ESCAPESEQUENCE 27
+#define SCE_COBOL_DEFAULT 0
+#define SCE_COBOL_COMMENT 1
+#define SCE_COBOL_COMMENTLINE 2
+#define SCE_COBOL_COMMENTDOC 3
+#define SCE_COBOL_NUMBER 4
+#define SCE_COBOL_WORD 5
+#define SCE_COBOL_STRING 6
+#define SCE_COBOL_CHARACTER 7
+#define SCE_COBOL_WORD3 8
+#define SCE_COBOL_PREPROCESSOR 9
+#define SCE_COBOL_OPERATOR 10
+#define SCE_COBOL_IDENTIFIER 11
+#define SCE_COBOL_WORD2 16
 #define SCE_D_DEFAULT 0
 #define SCE_D_COMMENT 1
 #define SCE_D_COMMENTLINE 2
@@ -1799,6 +1813,8 @@
 #define SCE_RUST_BYTESTRING 21
 #define SCE_RUST_BYTESTRINGR 22
 #define SCE_RUST_BYTECHARACTER 23
+#define SCE_RUST_CSTRING 24
+#define SCE_RUST_CSTRINGR 25
 #define SCE_DMAP_DEFAULT 0
 #define SCE_DMAP_COMMENT 1
 #define SCE_DMAP_NUMBER 2
@@ -2154,6 +2170,23 @@
 #define SCE_ZIG_KW_SECONDARY 14
 #define SCE_ZIG_KW_TERTIARY 15
 #define SCE_ZIG_KW_TYPE 16
+#define SCE_ZIG_IDENTIFIER_STRING 17
+#define SCE_NIX_DEFAULT 0
+#define SCE_NIX_COMMENTLINE 1
+#define SCE_NIX_COMMENTBLOCK 2
+#define SCE_NIX_STRING 3
+#define SCE_NIX_STRING_MULTILINE 4
+#define SCE_NIX_ESCAPECHAR 5
+#define SCE_NIX_IDENTIFIER 6
+#define SCE_NIX_OPERATOR 7
+#define SCE_NIX_OPERATOR_STRING 8
+#define SCE_NIX_NUMBER 9
+#define SCE_NIX_KEY 10
+#define SCE_NIX_PATH 11
+#define SCE_NIX_KEYWORD1 12
+#define SCE_NIX_KEYWORD2 13
+#define SCE_NIX_KEYWORD3 14
+#define SCE_NIX_KEYWORD4 15
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 

NppPlugin/include/Scintilla.h

@@ -533,6 +533,12 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SC_CHANGE_HISTORY_INDICATORS 4
 #define SCI_SETCHANGEHISTORY 2780
 #define SCI_GETCHANGEHISTORY 2781
+#define SC_UNDO_SELECTION_HISTORY_DISABLED 0
+#define SC_UNDO_SELECTION_HISTORY_ENABLED 1
+#define SCI_SETUNDOSELECTIONHISTORY 2782
+#define SCI_GETUNDOSELECTIONHISTORY 2783
+#define SCI_SETSELECTIONSERIALIZED 2784
+#define SCI_GETSELECTIONSERIALIZED 2785
 #define SCI_GETFIRSTVISIBLELINE 2152
 #define SCI_GETLINE 2153
 #define SCI_GETLINECOUNT 2154
@@ -1122,6 +1128,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SC_TECHNOLOGY_DIRECTWRITE 1
 #define SC_TECHNOLOGY_DIRECTWRITERETAIN 2
 #define SC_TECHNOLOGY_DIRECTWRITEDC 3
+#define SC_TECHNOLOGY_DIRECT_WRITE_1 4
 #define SCI_SETTECHNOLOGY 2630
 #define SCI_GETTECHNOLOGY 2631
 #define SCI_CREATELOADER 2632
@@ -1399,7 +1406,7 @@ struct Sci_RangeToFormatFull {
 
 #ifndef __cplusplus
 /* For the GTK+ platform, g-ir-scanner needs to have these typedefs. This
- * is not required in C++ code and actually seems to break ScintillaEditPy */
+ * is not required in C++ code and has caused problems in the past. */
 typedef struct Sci_NotifyHeader Sci_NotifyHeader;
 typedef struct SCNotification SCNotification;
 #endif

NppPlugin/include/menuCmdID.h

@@ -563,6 +563,7 @@
     #define    IDM_LANG_GOLANG             (IDM_LANG + 89)
     #define    IDM_LANG_RAKU               (IDM_LANG + 90)
     #define    IDM_LANG_TOML               (IDM_LANG + 91)
+    #define    IDM_LANG_SAS                (IDM_LANG + 92)
 
     #define    IDM_LANG_EXTERNAL           (IDM_LANG + 165)
     #define    IDM_LANG_EXTERNAL_LIMIT     (IDM_LANG + 179)
@@ -582,7 +583,7 @@
     #define    IDM_FORUM            (IDM_ABOUT  + 4)
     //#define    IDM_PLUGINSHOME      (IDM_ABOUT  + 5)
     #define    IDM_UPDATE_NPP       (IDM_ABOUT  + 6)
-    #define    IDM_WIKIFAQ          (IDM_ABOUT  + 7)
+    //#define    IDM_WIKIFAQ          (IDM_ABOUT  + 7)
     //#define    IDM_HELP             (IDM_ABOUT  + 8)
     #define    IDM_CONFUPDATERPROXY (IDM_ABOUT  + 9)
     #define    IDM_CMDLINEARGUMENTS (IDM_ABOUT  + 10)

NppPlugin/src/dpiManagerV2.cpp

@@ -19,15 +19,6 @@
 
 #include <commctrl.h>
 
-
-#if defined(__GNUC__) && __GNUC__ > 8
-#define WINAPI_LAMBDA_RETURN(return_t) -> return_t WINAPI
-#elif defined(__GNUC__)
-#define WINAPI_LAMBDA_RETURN(return_t) WINAPI -> return_t
-#else
-#define WINAPI_LAMBDA_RETURN(return_t) -> return_t
-#endif
-
 template <typename P>
 bool ptrFn(HMODULE handle, P& pointer, const char* name)
 {

PythonScript/src/CreateWrapper.py

@@ -108,6 +108,7 @@
 	'Supports'	: 'int',
 	'Element'	: 'int',
 	'ChangeHistoryOption'	: 'int',
+	'UndoSelectionHistoryOption'	: 'int',
 }
 
 castsL = {

PythonScript/src/Enums.h

@@ -521,6 +521,12 @@ enum ChangeHistoryOption
 	PYSCR_SC_CHANGE_HISTORY_INDICATORS = SC_CHANGE_HISTORY_INDICATORS
 };
 
+enum UndoSelectionHistoryOption
+{
+	PYSCR_SC_UNDO_SELECTION_HISTORY_DISABLED = SC_UNDO_SELECTION_HISTORY_DISABLED,
+	PYSCR_SC_UNDO_SELECTION_HISTORY_ENABLED = SC_UNDO_SELECTION_HISTORY_ENABLED
+};
+
 enum FoldLevel
 {
 	PYSCR_SC_FOLDLEVELNONE = SC_FOLDLEVELNONE,
@@ -763,7 +769,8 @@ enum Technology
 	PYSCR_SC_TECHNOLOGY_DEFAULT = SC_TECHNOLOGY_DEFAULT,
 	PYSCR_SC_TECHNOLOGY_DIRECTWRITE = SC_TECHNOLOGY_DIRECTWRITE,
 	PYSCR_SC_TECHNOLOGY_DIRECTWRITERETAIN = SC_TECHNOLOGY_DIRECTWRITERETAIN,
-	PYSCR_SC_TECHNOLOGY_DIRECTWRITEDC = SC_TECHNOLOGY_DIRECTWRITEDC
+	PYSCR_SC_TECHNOLOGY_DIRECTWRITEDC = SC_TECHNOLOGY_DIRECTWRITEDC,
+	PYSCR_SC_TECHNOLOGY_DIRECT_WRITE_1 = SC_TECHNOLOGY_DIRECT_WRITE_1
 };
 
 enum LineEndType
@@ -1062,6 +1069,7 @@ enum Lexer
 	PYSCR_SCLEX_TROFF = SCLEX_TROFF,
 	PYSCR_SCLEX_DART = SCLEX_DART,
 	PYSCR_SCLEX_ZIG = SCLEX_ZIG,
+	PYSCR_SCLEX_NIX = SCLEX_NIX,
 	PYSCR_SCLEX_SEARCHRESULT = SCLEX_SEARCHRESULT,
 	PYSCR_SCLEX_OBJC = SCLEX_OBJC,
 	PYSCR_SCLEX_USER = SCLEX_USER,
@@ -1346,6 +1354,10 @@ enum ScintillaMessage
 	PYSCR_SCI_FORMATRANGEFULL = SCI_FORMATRANGEFULL,
 	PYSCR_SCI_SETCHANGEHISTORY = SCI_SETCHANGEHISTORY,
 	PYSCR_SCI_GETCHANGEHISTORY = SCI_GETCHANGEHISTORY,
+	PYSCR_SCI_SETUNDOSELECTIONHISTORY = SCI_SETUNDOSELECTIONHISTORY,
+	PYSCR_SCI_GETUNDOSELECTIONHISTORY = SCI_GETUNDOSELECTIONHISTORY,
+	PYSCR_SCI_SETSELECTIONSERIALIZED = SCI_SETSELECTIONSERIALIZED,
+	PYSCR_SCI_GETSELECTIONSERIALIZED = SCI_GETSELECTIONSERIALIZED,
 	PYSCR_SCI_GETFIRSTVISIBLELINE = SCI_GETFIRSTVISIBLELINE,
 	PYSCR_SCI_GETLINE = SCI_GETLINE,
 	PYSCR_SCI_GETLINECOUNT = SCI_GETLINECOUNT,

PythonScript/src/EnumsWrapper.cpp

@@ -467,6 +467,10 @@ void export_enums()
 		.value("MARKERS", PYSCR_SC_CHANGE_HISTORY_MARKERS)
 		.value("INDICATORS", PYSCR_SC_CHANGE_HISTORY_INDICATORS);
 
+	boost::python::enum_<UndoSelectionHistoryOption>("UNDOSELECTIONHISTORYOPTION")
+		.value("DISABLED", PYSCR_SC_UNDO_SELECTION_HISTORY_DISABLED)
+		.value("ENABLED", PYSCR_SC_UNDO_SELECTION_HISTORY_ENABLED);
+
 	boost::python::enum_<FoldLevel>("FOLDLEVEL")
 		.value("NONE", PYSCR_SC_FOLDLEVELNONE)
 		.value("BASE", PYSCR_SC_FOLDLEVELBASE)
@@ -646,7 +650,8 @@ void export_enums()
 		.value("DEFAULT", PYSCR_SC_TECHNOLOGY_DEFAULT)
 		.value("DIRECTWRITE", PYSCR_SC_TECHNOLOGY_DIRECTWRITE)
 		.value("DIRECTWRITERETAIN", PYSCR_SC_TECHNOLOGY_DIRECTWRITERETAIN)
-		.value("DIRECTWRITEDC", PYSCR_SC_TECHNOLOGY_DIRECTWRITEDC);
+		.value("DIRECTWRITEDC", PYSCR_SC_TECHNOLOGY_DIRECTWRITEDC)
+		.value("DIRECT_WRITE_1", PYSCR_SC_TECHNOLOGY_DIRECT_WRITE_1);
 
 	boost::python::enum_<LineEndType>("LINEENDTYPE")
 		.value("DEFAULT", PYSCR_SC_LINE_END_TYPE_DEFAULT)
@@ -915,6 +920,7 @@ void export_enums()
 		.value("TROFF", PYSCR_SCLEX_TROFF)
 		.value("DART", PYSCR_SCLEX_DART)
 		.value("ZIG", PYSCR_SCLEX_ZIG)
+		.value("NIX", PYSCR_SCLEX_NIX)
 		.value("SEARCHRESULT", PYSCR_SCLEX_SEARCHRESULT)
 		.value("OBJC", PYSCR_SCLEX_OBJC)
 		.value("USER", PYSCR_SCLEX_USER)
@@ -1224,6 +1230,10 @@ void export_enums()
 		.value("SCI_FORMATRANGEFULL", PYSCR_SCI_FORMATRANGEFULL)
 		.value("SCI_SETCHANGEHISTORY", PYSCR_SCI_SETCHANGEHISTORY)
 		.value("SCI_GETCHANGEHISTORY", PYSCR_SCI_GETCHANGEHISTORY)
+		.value("SCI_SETUNDOSELECTIONHISTORY", PYSCR_SCI_SETUNDOSELECTIONHISTORY)
+		.value("SCI_GETUNDOSELECTIONHISTORY", PYSCR_SCI_GETUNDOSELECTIONHISTORY)
+		.value("SCI_SETSELECTIONSERIALIZED", PYSCR_SCI_SETSELECTIONSERIALIZED)
+		.value("SCI_GETSELECTIONSERIALIZED", PYSCR_SCI_GETSELECTIONSERIALIZED)
 		.value("SCI_GETFIRSTVISIBLELINE", PYSCR_SCI_GETFIRSTVISIBLELINE)
 		.value("SCI_GETLINE", PYSCR_SCI_GETLINE)
 		.value("SCI_GETLINECOUNT", PYSCR_SCI_GETLINECOUNT)

PythonScript/src/LexicalStyles.iface

@@ -148,6 +148,7 @@ val SCLEX_TOML=136
 val SCLEX_TROFF=137
 val SCLEX_DART=138
 val SCLEX_ZIG=139
+val SCLEX_NIX=140
 # manually added N++ lexer
 val SCLEX_SEARCHRESULT=150
 val SCLEX_OBJC=151
@@ -182,12 +183,10 @@ val SCE_P_FTRIPLEDOUBLE=19
 val SCE_P_ATTRIBUTE=20
 # Lexical states for SCLEX_CPP
 # Lexical states for SCLEX_BULLANT
-# Lexical states for SCLEX_COBOL
 # Lexical states for SCLEX_TACL
 # Lexical states for SCLEX_TAL
 lex Cpp=SCLEX_CPP SCE_C_
 lex BullAnt=SCLEX_BULLANT SCE_C_
-lex COBOL=SCLEX_COBOL SCE_C_
 lex TACL=SCLEX_TACL SCE_C_
 lex TAL=SCLEX_TAL SCE_C_
 val SCE_C_DEFAULT=0
@@ -218,6 +217,21 @@ val SCE_C_PREPROCESSORCOMMENTDOC=24
 val SCE_C_USERLITERAL=25
 val SCE_C_TASKMARKER=26
 val SCE_C_ESCAPESEQUENCE=27
+# Lexical states for SCLEX_COBOL
+lex COBOL=SCLEX_COBOL SCE_COBOL_
+val SCE_COBOL_DEFAULT=0
+val SCE_COBOL_COMMENT=1
+val SCE_COBOL_COMMENTLINE=2
+val SCE_COBOL_COMMENTDOC=3
+val SCE_COBOL_NUMBER=4
+val SCE_COBOL_WORD=5
+val SCE_COBOL_STRING=6
+val SCE_COBOL_CHARACTER=7
+val SCE_COBOL_WORD3=8
+val SCE_COBOL_PREPROCESSOR=9
+val SCE_COBOL_OPERATOR=10
+val SCE_COBOL_IDENTIFIER=11
+val SCE_COBOL_WORD2=16
 # Lexical states for SCLEX_D
 lex D=SCLEX_D SCE_D_
 val SCE_D_DEFAULT=0
@@ -2013,6 +2027,8 @@ val SCE_RUST_LEXERROR=20
 val SCE_RUST_BYTESTRING=21
 val SCE_RUST_BYTESTRINGR=22
 val SCE_RUST_BYTECHARACTER=23
+val SCE_RUST_CSTRING=24
+val SCE_RUST_CSTRINGR=25
 # Lexical states for SCLEX_DMAP
 lex DMAP=SCLEX_DMAP SCE_DMAP_
 val SCE_DMAP_DEFAULT=0
@@ -2415,3 +2431,22 @@ val SCE_ZIG_KW_PRIMARY=13
 val SCE_ZIG_KW_SECONDARY=14
 val SCE_ZIG_KW_TERTIARY=15
 val SCE_ZIG_KW_TYPE=16
+val SCE_ZIG_IDENTIFIER_STRING=17
+# Lexical states for SCLEX_NIX
+lex Nix=SCLEX_NIX SCE_NIX_
+val SCE_NIX_DEFAULT=0
+val SCE_NIX_COMMENTLINE=1
+val SCE_NIX_COMMENTBLOCK=2
+val SCE_NIX_STRING=3
+val SCE_NIX_STRING_MULTILINE=4
+val SCE_NIX_ESCAPECHAR=5
+val SCE_NIX_IDENTIFIER=6
+val SCE_NIX_OPERATOR=7
+val SCE_NIX_OPERATOR_STRING=8
+val SCE_NIX_NUMBER=9
+val SCE_NIX_KEY=10
+val SCE_NIX_PATH=11
+val SCE_NIX_KEYWORD1=12
+val SCE_NIX_KEYWORD2=13
+val SCE_NIX_KEYWORD3=14
+val SCE_NIX_KEYWORD4=15