updated Npp files to 8.5.1

Author: chcg

NppPlugin/include/DockingDlgInterface.h

@@ -37,7 +37,7 @@ class DockingDlgInterface : public StaticDialog
 	virtual void init(HINSTANCE hInst, HWND parent) {
 		StaticDialog::init(hInst, parent);
 		TCHAR temp[MAX_PATH];
-		::GetModuleFileName(reinterpret_cast<HMODULE>(hInst), temp, MAX_PATH);
+		::GetModuleFileName(hInst, temp, MAX_PATH);
 		_moduleName = ::PathFindFileName(temp);
 	}
 

NppPlugin/include/Notepad_plus_msgs.h

@@ -33,7 +33,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
 			   L_CSOUND, L_ERLANG, L_ESCRIPT, L_FORTH, L_LATEX, \
 			   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_TYPESCRIPT, L_JSON5, L_MSSQL, L_GDSCRIPT,\
 			   // 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};

NppPlugin/include/SciLexer.h

@@ -558,7 +558,11 @@
 #define SCE_RB_STDIN 30
 #define SCE_RB_STDOUT 31
 #define SCE_RB_STDERR 40
-#define SCE_RB_UPPER_BOUND 41
+#define SCE_RB_STRING_W 41
+#define SCE_RB_STRING_I 42
+#define SCE_RB_STRING_QI 43
+#define SCE_RB_STRING_QS 44
+#define SCE_RB_UPPER_BOUND 45
 #define SCE_B_DEFAULT 0
 #define SCE_B_COMMENT 1
 #define SCE_B_NUMBER 2
@@ -2175,6 +2179,7 @@
 #define SCE_GD_STRINGEOL 13
 #define SCE_GD_WORD2 14
 #define SCE_GD_ANNOTATION 15
+#define SCE_GD_NODEPATH 16
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 #endif

NppPlugin/include/StaticDialog.h

@@ -49,7 +49,7 @@ public :
 
 	void redrawDlgItem(const int nIDDlgItem, bool forceUpdate = false) const;
 
-	void goToCenter();
+	void goToCenter(UINT swpFlags = SWP_SHOWWINDOW);
 
 	void display(bool toShow = true, bool enhancedPositioningCheckWhenShowing = false) const;
 

NppPlugin/include/menuCmdID.h

@@ -170,6 +170,7 @@
     #define    IDM_EDIT_INSERT_DATETIME_CUSTOMIZED              (IDM_EDIT + 86)
     #define    IDM_EDIT_COPY_ALL_NAMES                          (IDM_EDIT + 87)
     #define    IDM_EDIT_COPY_ALL_PATHS                          (IDM_EDIT + 88)
+    #define    IDM_EDIT_BEGINENDSELECT_COLUMNMODE               (IDM_EDIT + 89)
 
     #define    IDM_EDIT_AUTOCOMPLETE                            (50000 + 0)
     #define    IDM_EDIT_AUTOCOMPLETE_CURRENTFILE                (50000 + 1)
@@ -374,6 +375,8 @@
     #define    IDM_VIEW_TAB_COLOUR_4              (IDM_VIEW + 114)
     #define    IDM_VIEW_TAB_COLOUR_5              (IDM_VIEW + 115)
 
+    #define    IDM_VIEW_NPC                       (IDM_VIEW + 130)
+
     #define    IDM_VIEW_GOTO_ANOTHER_VIEW        10001
     #define    IDM_VIEW_CLONE_TO_ANOTHER_VIEW    10002
     #define    IDM_VIEW_GOTO_NEW_INSTANCE        10003
@@ -534,6 +537,9 @@
     #define    IDM_LANG_TXT2TAGS           (IDM_LANG + 82)
     #define    IDM_LANG_VISUALPROLOG       (IDM_LANG + 83)
     #define    IDM_LANG_TYPESCRIPT         (IDM_LANG + 84)
+    #define    IDM_LANG_JSON5              (IDM_LANG + 85)
+    #define    IDM_LANG_MSSQL              (IDM_LANG + 86)
+    #define    IDM_LANG_GDSCRIPT           (IDM_LANG + 87)
 
     #define    IDM_LANG_EXTERNAL           (IDM_LANG + 165)
     #define    IDM_LANG_EXTERNAL_LIMIT     (IDM_LANG + 179)

NppPlugin/src/StaticDialog.cpp

@@ -65,7 +65,7 @@ POINT StaticDialog::getTopPoint(HWND hwnd, bool isLeft) const
 	return p;
 }
 
-void StaticDialog::goToCenter()
+void StaticDialog::goToCenter(UINT swpFlags)
 {
 	RECT rc{};
 	::GetClientRect(_hParent, &rc);
@@ -77,7 +77,7 @@ void StaticDialog::goToCenter()
 	int x = center.x - (_rc.right - _rc.left)/2;
 	int y = center.y - (_rc.bottom - _rc.top)/2;
 
-	::SetWindowPos(_hSelf, HWND_TOP, x, y, _rc.right - _rc.left, _rc.bottom - _rc.top, SWP_SHOWWINDOW);
+	::SetWindowPos(_hSelf, HWND_TOP, x, y, _rc.right - _rc.left, _rc.bottom - _rc.top, swpFlags);
 }
 
 void StaticDialog::display(bool toShow, bool enhancedPositioningCheckWhenShowing) const

PythonScript/src/NotepadPython.cpp

@@ -214,7 +214,9 @@ void export_notepad()
 		.value("TXT2TAGS", L_TXT2TAGS)
 		.value("VISUALPROLOG", L_VISUALPROLOG)
 		.value("TYPESCRIPT", L_TYPESCRIPT)
-		.value("JSON5", L_JSON5);
+		.value("JSON5", L_JSON5)
+		.value("MSSQL", L_MSSQL)
+		.value("GDSCRIPT", L_GDSCRIPT);
 
 	boost::python::enum_<winVer>("WINVER")
 		.value("UNKNOWN", WV_UNKNOWN)