merge with master c680830

NppPlugin/include/Common.h

@@ -167,7 +167,7 @@ int OrdinalIgnoreCaseCompareStrings(LPCTSTR sz1, LPCTSTR sz2);
 
 bool str2Clipboard(const generic_string &str2cpy, HWND hwnd);
 class Buffer;
-bool buf2Clipborad(const std::vector<Buffer*>& buffers, bool isFullPath, HWND hwnd);
+bool buf2Clipboard(const std::vector<Buffer*>& buffers, bool isFullPath, HWND hwnd);
 
 generic_string GetLastErrorAsString(DWORD errorCode = 0);
 

NppPlugin/include/Docking.h

@@ -1,5 +1,5 @@
 // This file is part of Notepad++ project
-// Copyright (C)2021 Don HO <don.h@free.fr>
+// Copyright (C)2024 Don HO <don.h@free.fr>
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -58,14 +58,14 @@ struct tTbData {
 	const TCHAR* pszAddInfo = nullptr;     // for plugin to display additional informations
 
 	// internal data, do not use !!!
-	RECT rcFloat = {};                    // 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
+	HWND hWnd = nullptr;                  // the docking manager wnd
 	RECT rcRegion[DOCKCONT_MAX] = {{}};   // position of docked dialogs
 };
 

NppPlugin/include/PluginInterface.h

@@ -1,5 +1,5 @@
 // This file is part of Notepad++ project
-// Copyright (C)2021 Don HO <don.h@free.fr>
+// Copyright (C)2024 Don HO <don.h@free.fr>
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -15,12 +15,15 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
+
+// For more comprehensive information on plugin communication, please refer to the following resource:
+// https://npp-user-manual.org/docs/plugin-communication/
+
 #pragma once
 
 #include "Scintilla.h"
 #include "Notepad_plus_msgs.h"
 
-const int nbChar = 64;
 
 typedef const TCHAR * (__cdecl * PFUNCGETNAME)();
 
@@ -45,9 +48,11 @@ struct ShortcutKey
 	UCHAR _key = 0;
 };
 
+const int menuItemSize = 64;
+
 struct FuncItem
 {
-	TCHAR _itemName[nbChar] = { '\0' };
+	TCHAR _itemName[menuItemSize] = { '\0' };
 	PFUNCPLUGINCMD _pFunc = nullptr;
 	int _cmdID = 0;
 	bool _init2Check = false;

NppPlugin/include/Scintilla.h

@@ -339,6 +339,20 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SCI_GETCHARACTERCATEGORYOPTIMIZATION 2721
 #define SCI_BEGINUNDOACTION 2078
 #define SCI_ENDUNDOACTION 2079
+#define SCI_GETUNDOACTIONS 2790
+#define SCI_SETUNDOSAVEPOINT 2791
+#define SCI_GETUNDOSAVEPOINT 2792
+#define SCI_SETUNDODETACH 2793
+#define SCI_GETUNDODETACH 2794
+#define SCI_SETUNDOTENTATIVE 2795
+#define SCI_GETUNDOTENTATIVE 2796
+#define SCI_SETUNDOCURRENT 2797
+#define SCI_GETUNDOCURRENT 2798
+#define SCI_PUSHUNDOACTIONTYPE 2800
+#define SCI_CHANGELASTUNDOACTIONTEXT 2801
+#define SCI_GETUNDOACTIONTYPE 2802
+#define SCI_GETUNDOACTIONPOSITION 2803
+#define SCI_GETUNDOACTIONTEXT 2804
 #define INDIC_PLAIN 0
 #define INDIC_SQUIGGLE 1
 #define INDIC_TT 2
@@ -432,6 +446,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SCI_AUTOCGETAUTOHIDE 2119
 #define SC_AUTOCOMPLETE_NORMAL 0
 #define SC_AUTOCOMPLETE_FIXED_SIZE 1
+#define SC_AUTOCOMPLETE_SELECT_FIRST_ITEM 2
 #define SCI_AUTOCSETOPTIONS 2638
 #define SCI_AUTOCGETOPTIONS 2639
 #define SCI_AUTOCSETDROPRESTOFWORD 2270
@@ -875,7 +890,9 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SC_SEL_LINES 2
 #define SC_SEL_THIN 3
 #define SCI_SETSELECTIONMODE 2422
+#define SCI_CHANGESELECTIONMODE 2659
 #define SCI_GETSELECTIONMODE 2423
+#define SCI_SETMOVEEXTENDSSELECTION 2719
 #define SCI_GETMOVEEXTENDSSELECTION 2706
 #define SCI_GETLINESELSTARTPOSITION 2424
 #define SCI_GETLINESELENDPOSITION 2425
@@ -1021,6 +1038,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SCI_CLEARSELECTIONS 2571
 #define SCI_SETSELECTION 2572
 #define SCI_ADDSELECTION 2573
+#define SCI_SELECTIONFROMPOINT 2474
 #define SCI_DROPSELECTIONN 2671
 #define SCI_SETMAINSELECTION 2574
 #define SCI_GETMAINSELECTION 2575

NppPlugin/include/StaticDialog.h

@@ -1,5 +1,5 @@
 // This file is part of Notepad++ project
-// Copyright (C)2021 Don HO <don.h@free.fr>
+// Copyright (C)2024 Don HO <don.h@free.fr>
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

NppPlugin/include/Window.h

@@ -1,5 +1,5 @@
 // This file is part of Notepad++ project
-// Copyright (C)2021 Don HO <don.h@free.fr>
+// Copyright (C)2024 Don HO <don.h@free.fr>
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

NppPlugin/include/menuCmdID.h

@@ -1,5 +1,5 @@
 // This file is part of Notepad++ project
-// Copyright (C)2021 Don HO <don.h@free.fr>
+// Copyright (C)2024 Don HO <don.h@free.fr>
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -388,6 +388,8 @@
     #define    IDM_VIEW_TAB_COLOUR_3              (IDM_VIEW + 113)
     #define    IDM_VIEW_TAB_COLOUR_4              (IDM_VIEW + 114)
     #define    IDM_VIEW_TAB_COLOUR_5              (IDM_VIEW + 115)
+    #define    IDM_VIEW_TAB_START                 (IDM_VIEW + 116)
+    #define    IDM_VIEW_TAB_END                   (IDM_VIEW + 117)
 
     #define    IDM_VIEW_NPC                       (IDM_VIEW + 130)
     #define    IDM_VIEW_NPC_CCUNIEOL              (IDM_VIEW + 131)
@@ -396,7 +398,8 @@
     #define    IDM_VIEW_CLONE_TO_ANOTHER_VIEW    10002
     #define    IDM_VIEW_GOTO_NEW_INSTANCE        10003
     #define    IDM_VIEW_LOAD_IN_NEW_INSTANCE     10004
-
+    #define    IDM_VIEW_GOTO_START               10005
+    #define    IDM_VIEW_GOTO_END                 10006
 
 #define    IDM_FORMAT    (IDM + 5000)
     #define    IDM_FORMAT_TODOS             (IDM_FORMAT + 1)
@@ -589,7 +592,7 @@
 //    #define    IDM_SETTING_HISTORY_SIZE             (IDM_SETTING + 3)
 //    #define    IDM_SETTING_EDGE_SIZE                (IDM_SETTING + 4)
     #define    IDM_SETTING_IMPORTPLUGIN             (IDM_SETTING + 5)
-    #define    IDM_SETTING_IMPORTSTYLETHEMS         (IDM_SETTING + 6)
+    #define    IDM_SETTING_IMPORTSTYLETHEMES        (IDM_SETTING + 6)
     #define    IDM_SETTING_TRAYICON                 (IDM_SETTING + 8)
     #define    IDM_SETTING_SHORTCUT_MAPPER          (IDM_SETTING + 9)
     #define    IDM_SETTING_REMEMBER_LAST_SESSION    (IDM_SETTING + 10)

NppPlugin/src/StaticDialog.cpp

@@ -1,5 +1,5 @@
 // This file is part of Notepad++ project
-// Copyright (C)2021 Don HO <don.h@free.fr>
+// Copyright (C)2024 Don HO <don.h@free.fr>
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -80,10 +80,15 @@ void StaticDialog::goToCenter(UINT swpFlags)
 {
 	RECT rc{};
 	::GetClientRect(_hParent, &rc);
+	if ((rc.left == rc.right) || (rc.top == rc.bottom))
+		swpFlags |= SWP_NOSIZE; // sizing has no sense here
+
 	POINT center{};
 	center.x = rc.left + (rc.right - rc.left)/2;
 	center.y = rc.top + (rc.bottom - rc.top)/2;
 	::ClientToScreen(_hParent, &center);
+	if ((center.x == -32000) && (center.y == -32000)) // https://devblogs.microsoft.com/oldnewthing/20041028-00/?p=37453
+		swpFlags |= SWP_NOMOVE; // moving has no sense here (owner wnd is minimized)
 
 	int x = center.x - (_rc.right - _rc.left)/2;
 	int y = center.y - (_rc.bottom - _rc.top)/2;

PythonScript/src/ConfigFile.cpp

@@ -122,7 +122,7 @@ void ConfigFile::clearItems()
 	m_toolbarItems.erase(m_toolbarItems.begin(), m_toolbarItems.end());
 }
 
-tstring ConfigFile::expandPathIfNeeded(char *userPath)
+tstring ConfigFile::expandPathIfNeeded(char *userPath) const
 {
 	tstring fullPath = L"";
 	if (userPath)

PythonScript/src/ConfigFile.h

@@ -32,7 +32,7 @@ class ConfigFile
 	void refresh() { clearItems(); readConfig(); };
 
 	std::string shortenPathIfPossible(tstring userPath);
-	tstring expandPathIfNeeded(char *userPath);
+	tstring expandPathIfNeeded(char *userPath) const;
 
 	const tstring& getMachineScriptsDir() { return m_machineScriptsDir; };
 	const tstring& getUserScriptsDir() { return m_userScriptsDir; };

PythonScript/src/ConsoleDialog.cpp

@@ -40,7 +40,7 @@ ConsoleDialog::~ConsoleDialog()
 {
 	if (m_scintilla)
 	{
-		::SendMessage(_hParent, NPPM_DESTROYSCINTILLAHANDLE, 0, reinterpret_cast<LPARAM>(m_scintilla));
+		::SendMessage(_hParent, NPPM_DESTROYSCINTILLAHANDLE_DEPRECATED, 0, reinterpret_cast<LPARAM>(m_scintilla));
 		m_scintilla = NULL;
 	}
 

PythonScript/src/Enums.h

@@ -465,7 +465,8 @@ enum IndicFlag
 enum AutoCompleteOption
 {
 	PYSCR_SC_AUTOCOMPLETE_NORMAL = SC_AUTOCOMPLETE_NORMAL,
-	PYSCR_SC_AUTOCOMPLETE_FIXED_SIZE = SC_AUTOCOMPLETE_FIXED_SIZE
+	PYSCR_SC_AUTOCOMPLETE_FIXED_SIZE = SC_AUTOCOMPLETE_FIXED_SIZE,
+	PYSCR_SC_AUTOCOMPLETE_SELECT_FIRST_ITEM = SC_AUTOCOMPLETE_SELECT_FIRST_ITEM
 };
 
 enum IndentView
@@ -1209,6 +1210,20 @@ enum ScintillaMessage
 	PYSCR_SCI_GETCHARACTERCATEGORYOPTIMIZATION = SCI_GETCHARACTERCATEGORYOPTIMIZATION,
 	PYSCR_SCI_BEGINUNDOACTION = SCI_BEGINUNDOACTION,
 	PYSCR_SCI_ENDUNDOACTION = SCI_ENDUNDOACTION,
+	PYSCR_SCI_GETUNDOACTIONS = SCI_GETUNDOACTIONS,
+	PYSCR_SCI_SETUNDOSAVEPOINT = SCI_SETUNDOSAVEPOINT,
+	PYSCR_SCI_GETUNDOSAVEPOINT = SCI_GETUNDOSAVEPOINT,
+	PYSCR_SCI_SETUNDODETACH = SCI_SETUNDODETACH,
+	PYSCR_SCI_GETUNDODETACH = SCI_GETUNDODETACH,
+	PYSCR_SCI_SETUNDOTENTATIVE = SCI_SETUNDOTENTATIVE,
+	PYSCR_SCI_GETUNDOTENTATIVE = SCI_GETUNDOTENTATIVE,
+	PYSCR_SCI_SETUNDOCURRENT = SCI_SETUNDOCURRENT,
+	PYSCR_SCI_GETUNDOCURRENT = SCI_GETUNDOCURRENT,
+	PYSCR_SCI_PUSHUNDOACTIONTYPE = SCI_PUSHUNDOACTIONTYPE,
+	PYSCR_SCI_CHANGELASTUNDOACTIONTEXT = SCI_CHANGELASTUNDOACTIONTEXT,
+	PYSCR_SCI_GETUNDOACTIONTYPE = SCI_GETUNDOACTIONTYPE,
+	PYSCR_SCI_GETUNDOACTIONPOSITION = SCI_GETUNDOACTIONPOSITION,
+	PYSCR_SCI_GETUNDOACTIONTEXT = SCI_GETUNDOACTIONTEXT,
 	PYSCR_SCI_INDICSETSTYLE = SCI_INDICSETSTYLE,
 	PYSCR_SCI_INDICGETSTYLE = SCI_INDICGETSTYLE,
 	PYSCR_SCI_INDICSETFORE = SCI_INDICSETFORE,
@@ -1594,7 +1609,9 @@ enum ScintillaMessage
 	PYSCR_SCI_COPYRANGE = SCI_COPYRANGE,
 	PYSCR_SCI_COPYTEXT = SCI_COPYTEXT,
 	PYSCR_SCI_SETSELECTIONMODE = SCI_SETSELECTIONMODE,
+	PYSCR_SCI_CHANGESELECTIONMODE = SCI_CHANGESELECTIONMODE,
 	PYSCR_SCI_GETSELECTIONMODE = SCI_GETSELECTIONMODE,
+	PYSCR_SCI_SETMOVEEXTENDSSELECTION = SCI_SETMOVEEXTENDSSELECTION,
 	PYSCR_SCI_GETMOVEEXTENDSSELECTION = SCI_GETMOVEEXTENDSSELECTION,
 	PYSCR_SCI_GETLINESELSTARTPOSITION = SCI_GETLINESELSTARTPOSITION,
 	PYSCR_SCI_GETLINESELENDPOSITION = SCI_GETLINESELENDPOSITION,
@@ -1714,6 +1731,7 @@ enum ScintillaMessage
 	PYSCR_SCI_CLEARSELECTIONS = SCI_CLEARSELECTIONS,
 	PYSCR_SCI_SETSELECTION = SCI_SETSELECTION,
 	PYSCR_SCI_ADDSELECTION = SCI_ADDSELECTION,
+	PYSCR_SCI_SELECTIONFROMPOINT = SCI_SELECTIONFROMPOINT,
 	PYSCR_SCI_DROPSELECTIONN = SCI_DROPSELECTIONN,
 	PYSCR_SCI_SETMAINSELECTION = SCI_SETMAINSELECTION,
 	PYSCR_SCI_GETMAINSELECTION = SCI_GETMAINSELECTION,

PythonScript/src/EnumsWrapper.cpp

@@ -422,7 +422,8 @@ void export_enums()
 
 	boost::python::enum_<AutoCompleteOption>("AUTOCOMPLETEOPTION")
 		.value("NORMAL", PYSCR_SC_AUTOCOMPLETE_NORMAL)
-		.value("FIXED_SIZE", PYSCR_SC_AUTOCOMPLETE_FIXED_SIZE);
+		.value("FIXED_SIZE", PYSCR_SC_AUTOCOMPLETE_FIXED_SIZE)
+		.value("SELECT_FIRST_ITEM", PYSCR_SC_AUTOCOMPLETE_SELECT_FIRST_ITEM);
 
 	boost::python::enum_<IndentView>("INDENTVIEW")
 		.value("NONE", PYSCR_SC_IV_NONE)
@@ -1089,6 +1090,20 @@ void export_enums()
 		.value("SCI_GETCHARACTERCATEGORYOPTIMIZATION", PYSCR_SCI_GETCHARACTERCATEGORYOPTIMIZATION)
 		.value("SCI_BEGINUNDOACTION", PYSCR_SCI_BEGINUNDOACTION)
 		.value("SCI_ENDUNDOACTION", PYSCR_SCI_ENDUNDOACTION)
+		.value("SCI_GETUNDOACTIONS", PYSCR_SCI_GETUNDOACTIONS)
+		.value("SCI_SETUNDOSAVEPOINT", PYSCR_SCI_SETUNDOSAVEPOINT)
+		.value("SCI_GETUNDOSAVEPOINT", PYSCR_SCI_GETUNDOSAVEPOINT)
+		.value("SCI_SETUNDODETACH", PYSCR_SCI_SETUNDODETACH)
+		.value("SCI_GETUNDODETACH", PYSCR_SCI_GETUNDODETACH)
+		.value("SCI_SETUNDOTENTATIVE", PYSCR_SCI_SETUNDOTENTATIVE)
+		.value("SCI_GETUNDOTENTATIVE", PYSCR_SCI_GETUNDOTENTATIVE)
+		.value("SCI_SETUNDOCURRENT", PYSCR_SCI_SETUNDOCURRENT)
+		.value("SCI_GETUNDOCURRENT", PYSCR_SCI_GETUNDOCURRENT)
+		.value("SCI_PUSHUNDOACTIONTYPE", PYSCR_SCI_PUSHUNDOACTIONTYPE)
+		.value("SCI_CHANGELASTUNDOACTIONTEXT", PYSCR_SCI_CHANGELASTUNDOACTIONTEXT)
+		.value("SCI_GETUNDOACTIONTYPE", PYSCR_SCI_GETUNDOACTIONTYPE)
+		.value("SCI_GETUNDOACTIONPOSITION", PYSCR_SCI_GETUNDOACTIONPOSITION)
+		.value("SCI_GETUNDOACTIONTEXT", PYSCR_SCI_GETUNDOACTIONTEXT)
 		.value("SCI_INDICSETSTYLE", PYSCR_SCI_INDICSETSTYLE)
 		.value("SCI_INDICGETSTYLE", PYSCR_SCI_INDICGETSTYLE)
 		.value("SCI_INDICSETFORE", PYSCR_SCI_INDICSETFORE)
@@ -1474,7 +1489,9 @@ void export_enums()
 		.value("SCI_COPYRANGE", PYSCR_SCI_COPYRANGE)
 		.value("SCI_COPYTEXT", PYSCR_SCI_COPYTEXT)
 		.value("SCI_SETSELECTIONMODE", PYSCR_SCI_SETSELECTIONMODE)
+		.value("SCI_CHANGESELECTIONMODE", PYSCR_SCI_CHANGESELECTIONMODE)
 		.value("SCI_GETSELECTIONMODE", PYSCR_SCI_GETSELECTIONMODE)
+		.value("SCI_SETMOVEEXTENDSSELECTION", PYSCR_SCI_SETMOVEEXTENDSSELECTION)
 		.value("SCI_GETMOVEEXTENDSSELECTION", PYSCR_SCI_GETMOVEEXTENDSSELECTION)
 		.value("SCI_GETLINESELSTARTPOSITION", PYSCR_SCI_GETLINESELSTARTPOSITION)
 		.value("SCI_GETLINESELENDPOSITION", PYSCR_SCI_GETLINESELENDPOSITION)
@@ -1594,6 +1611,7 @@ void export_enums()
 		.value("SCI_CLEARSELECTIONS", PYSCR_SCI_CLEARSELECTIONS)
 		.value("SCI_SETSELECTION", PYSCR_SCI_SETSELECTION)
 		.value("SCI_ADDSELECTION", PYSCR_SCI_ADDSELECTION)
+		.value("SCI_SELECTIONFROMPOINT", PYSCR_SCI_SELECTIONFROMPOINT)
 		.value("SCI_DROPSELECTIONN", PYSCR_SCI_DROPSELECTIONN)
 		.value("SCI_SETMAINSELECTION", PYSCR_SCI_SETMAINSELECTION)
 		.value("SCI_GETMAINSELECTION", PYSCR_SCI_GETMAINSELECTION)

PythonScript/src/Match.cpp

@@ -33,11 +33,11 @@ boost::python::str Match::py_group_name(boost::python::str pyGroupName)
 
 boost::python::str Match::getGroup(boost::python::object groupIdentifier)
 {
-	if (PyInt_Check(groupIdentifier.ptr()))
+	if (PyLong_Check(groupIdentifier.ptr()))
 	{
 		return py_group_number(boost::python::extract<int>(groupIdentifier));
 	}
-	else if (PyString_Check(groupIdentifier.ptr()))
+	else if (PyUnicode_Check(groupIdentifier.ptr()))
 	{
 		return py_group_name(boost::python::extract<boost::python::str>(groupIdentifier));
 	}

PythonScript/src/MenuManager.cpp

@@ -1090,7 +1090,7 @@ void MenuManager::idsInitialised()
 		return;
 	}
 
-	if (::SendMessage(m_hNotepad, NPPM_ALLOCATESUPPORTED, 0, 0) == TRUE)
+	if (::SendMessage(m_hNotepad, NPPM_ALLOCATESUPPORTED_DEPRECATED, 0, 0) == TRUE)
 	{
 		m_idAllocator = new NppAllocator(m_hNotepad);
 	}

PythonScript/src/NotepadPlusWrapper.cpp

@@ -403,7 +403,7 @@ void NotepadPlusWrapper::destroyScintilla(boost::shared_ptr<ScintillaWrapper> bu
 	if (buffer)
 	{
 		notAllowedInScintillaCallback("destroyScintilla() is not allowed in a synchronous editor callback.  Use an asynchronous callback, or avoid calling destroyScintilla() in the callback handler.");
-		callNotepad(NPPM_DESTROYSCINTILLAHANDLE, 0, reinterpret_cast<LPARAM>(buffer->getHandle()));
+		callNotepad(NPPM_DESTROYSCINTILLAHANDLE_DEPRECATED, 0, reinterpret_cast<LPARAM>(buffer->getHandle()));
 		buffer->invalidateHandle();
 	}
 }
@@ -858,7 +858,7 @@ boost::python::str NotepadPlusWrapper::getCommandLine()
 
 bool NotepadPlusWrapper::allocateSupported()
 {
-	return static_cast<bool>(callNotepad(NPPM_ALLOCATESUPPORTED));
+	return static_cast<bool>(callNotepad(NPPM_ALLOCATESUPPORTED_DEPRECATED));
 }
 
 boost::python::object NotepadPlusWrapper::allocateCmdID(int quantity)

PythonScript/src/NotepadPlusWrapper.h

@@ -78,7 +78,8 @@ enum Notification
 	NPPNOTIF_FILEDELETED = NPPN_FILEDELETED,
 	NPPNOTIF_DARKMODECHANGED = NPPN_DARKMODECHANGED,
 	NPPNOTIF_CMDLINEPLUGINMSG = NPPN_CMDLINEPLUGINMSG,
-	NPPNOTIF_EXTERNALLEXERBUFFER = NPPN_EXTERNALLEXERBUFFER
+	NPPNOTIF_EXTERNALLEXERBUFFER = NPPN_EXTERNALLEXERBUFFER,
+	NPPNOTIF_GLOBALMODIFIED = NPPN_GLOBALMODIFIED
 };
 
 //lint -e849 Symbol 'MessageBoxFlags::NPPMB_OKCANCEL' has same enumerator value '1' as enumerator 'NPPMB_RESULTOK'
@@ -431,12 +432,16 @@ enum MenuCommands
 	NPPIDM_VIEW_TAB_COLOUR_3 = IDM_VIEW_TAB_COLOUR_3,
 	NPPIDM_VIEW_TAB_COLOUR_4 = IDM_VIEW_TAB_COLOUR_4,
 	NPPIDM_VIEW_TAB_COLOUR_5 = IDM_VIEW_TAB_COLOUR_5,
+	NPPIDM_VIEW_TAB_START = IDM_VIEW_TAB_START,
+	NPPIDM_VIEW_TAB_END = IDM_VIEW_TAB_END,
 	NPPIDM_VIEW_NPC = IDM_VIEW_NPC,
 	NPPIDM_VIEW_NPC_CCUNIEOL = IDM_VIEW_NPC_CCUNIEOL,
 	NPPIDM_VIEW_GOTO_ANOTHER_VIEW = IDM_VIEW_GOTO_ANOTHER_VIEW,
 	NPPIDM_VIEW_CLONE_TO_ANOTHER_VIEW = IDM_VIEW_CLONE_TO_ANOTHER_VIEW,
 	NPPIDM_VIEW_GOTO_NEW_INSTANCE = IDM_VIEW_GOTO_NEW_INSTANCE,
 	NPPIDM_VIEW_LOAD_IN_NEW_INSTANCE = IDM_VIEW_LOAD_IN_NEW_INSTANCE,
+	NPPIDM_VIEW_GOTO_START = IDM_VIEW_GOTO_START,
+	NPPIDM_VIEW_GOTO_END = IDM_VIEW_GOTO_END,
 	NPPIDM_FORMAT = IDM_FORMAT,
 	NPPIDM_FORMAT_TODOS = IDM_FORMAT_TODOS,
 	NPPIDM_FORMAT_TOUNIX = IDM_FORMAT_TOUNIX,
@@ -607,7 +612,7 @@ enum MenuCommands
 	NPPIDM_DEBUGINFO = IDM_DEBUGINFO,
 	NPPIDM_SETTING = IDM_SETTING,
 	NPPIDM_SETTING_IMPORTPLUGIN = IDM_SETTING_IMPORTPLUGIN,
-	NPPIDM_SETTING_IMPORTSTYLETHEMS = IDM_SETTING_IMPORTSTYLETHEMS,
+	NPPIDM_SETTING_IMPORTSTYLETHEMES = IDM_SETTING_IMPORTSTYLETHEMES,
 	NPPIDM_SETTING_TRAYICON = IDM_SETTING_TRAYICON,
 	NPPIDM_SETTING_SHORTCUT_MAPPER = IDM_SETTING_SHORTCUT_MAPPER,
 	NPPIDM_SETTING_REMEMBER_LAST_SESSION = IDM_SETTING_REMEMBER_LAST_SESSION,