sync with 8df348a aka 3.0.21

chcg · chcg · commit c59092abd009 · 2025-01-04T18:41:06.000+01:00
diff --git a/PythonScript/python_tests/tests/SearchReplaceInvalidArgumentTestCase.py b/PythonScript/python_tests/tests/SearchReplaceInvalidArgumentTestCase.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+import unittest
+from Npp import notepad, editor
+
+class SearchReplaceInvalidArgumentTestCase(unittest.TestCase):
+    def setUp(self):
+        notepad.new()
+
+    def tearDown(self):
+        notepad.close()
+
+    def test_invalid_search_argument(self):
+        for invalid_arg in ["", None]:
+            for method in [editor.research, editor.search, editor.replace, editor.rereplace]:
+                self.assertRaises(TypeError, method, invalid_arg, None)
+
+    def test_invalid_replace_argument(self):
+        for method in [editor.replace, editor.rereplace]:
+            self.assertRaises(TypeError, method, "abc", None)
+
+
+suite = unittest.TestLoader().loadTestsFromTestCase(SearchReplaceInvalidArgumentTestCase)
diff --git a/PythonScript/res/PythonScript.rc b/PythonScript/res/PythonScript.rc
@@ -25,18 +25,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"
@@ -57,7 +57,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,143,168,50,14
     CTEXT           "Python Script",IDC_STATIC,144,7,49,8
-    CTEXT           "(C) 2010-2024 Dave Brotherstone",IDC_STATIC,92,30,154,8
+    CTEXT           "(C) 2010-2025 Dave Brotherstone",IDC_STATIC,92,30,154,8
     CONTROL         IDB_PYTHONPOWERED,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_REALSIZEIMAGE,122,42,93,34
     EDITTEXT        IDC_COPYRIGHT,7,84,324,74,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
     CTEXT           "1.0",IDC_VERSION,144,19,49,8
@@ -73,13 +73,13 @@ BEGIN
     COMBOBOX        IDC_COMBO1,25,156,125,50,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_SCRIPTCONFIG DIALOGEX 0, 0, 377, 412
+IDD_SCRIPTCONFIG DIALOGEX 0, 0, 377, 435
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Python Script Configuration"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,265,391,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,320,391,50,14
+    DEFPUSHBUTTON   "OK",IDOK,265,414,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,320,414,50,14
     CONTROL         "",IDC_FILETREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,14,31,343,105
     GROUPBOX        "Scripts",IDC_STATIC,7,7,363,136
     CONTROL         "Machine Scripts",IDC_RADMACHINE,"Button",BS_AUTORADIOBUTTON,19,18,65,10
@@ -106,8 +106,11 @@ BEGIN
     CONTROL         "Color output from run statements differently",IDC_CHECKCOLORIZEOUTPUT,
                     "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,370,157,10
     PUSHBUTTON      "Choose a color...",IDC_COLORCHOOSER,169,367,65,14
+    CONTROL         "Color console errors differently",IDC_CONSOLEERRORCOLOR,
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,382,117,10
+    PUSHBUTTON      "Choose a color...",IDC_COLORCHOOSER2,169,379,65,14
     CONTROL         "DISABLE another script is running popup warning",IDC_DISABLEPOPUPWARNING,
-                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,384,170,10
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,395,170,10
 END
 
 IDD_PROMPTDIALOG DIALOGEX 0, 0, 313, 105
@@ -151,7 +154,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 370
         TOPMARGIN, 7
-        BOTTOMMARGIN, 405
+        BOTTOMMARGIN, 428
     END
 
     IDD_PROMPTDIALOG, DIALOG
diff --git a/PythonScript/res/PythonScriptVersion.rc b/PythonScript/res/PythonScriptVersion.rc
diff --git a/PythonScript/res/resource.h b/PythonScript/res/resource.h
@@ -43,9 +43,11 @@
 #define IDC_CHECKCOLORIZEOUTPUT         1023
 #define IDC_COLORCHOOSER                1024
 #define IDC_DISABLEPOPUPWARNING         1025
+#define IDC_CONSOLEERRORCOLOR           1026
+#define IDC_COLORCHOOSER2               1027
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        122
diff --git a/PythonScript/src/ConfigFile.cpp b/PythonScript/src/ConfigFile.cpp
@@ -49,6 +49,7 @@ void ConfigFile::initSettings()
 	setSetting(_T("DISABLEPOPUPWARNING"), _T("0"));
 	setSetting(_T("PREFERINSTALLEDPYTHON"), _T("0"));
 	setSetting(_T("STARTUP"), _T("LAZY"));
+	setSetting(_T("CUSTOMCONSOLEERRORCOLOR"), _T("-1"));
 }
 
 void ConfigFile::readConfig()
diff --git a/PythonScript/src/ConsoleDialog.cpp b/PythonScript/src/ConsoleDialog.cpp
@@ -32,7 +32,9 @@ ConsoleDialog::ConsoleDialog() :
 	m_hContext(NULL),
 	m_nppData{0,0,0},
 	m_colorOutput(false),
-	m_user_color(-1)
+	m_user_color(-1),
+	m_customizeConsoleErrorColor(false),
+	m_customConsoleErrorColor(-1)
 {}
 
 
@@ -76,15 +78,22 @@ void ConsoleDialog::initDialog(HINSTANCE hInst, NppData& nppData, ConsoleInterfa
 {
 	DockingDlgInterface::init(hInst, nppData._nppHandle);
 
-	try
+	auto getColorSetting = [](const TCHAR* settingName, int& output)
 	{
-		m_user_color = stoi(ConfigFile::getInstance()->getSetting(_T("COLORIZEOUTPUT")));
-		m_colorOutput = m_user_color > -1;
-	}
-	catch (const std::exception&)
-	{
-		m_colorOutput = false;
-	}
+		try
+		{
+			output = stoi(ConfigFile::getInstance()->getSetting(settingName));
+			return true;
+		}
+		catch (const std::exception&)
+		{
+			return false;
+		}
+	};
+
+	m_colorOutput = getColorSetting(_T("COLORIZEOUTPUT"), m_user_color) && m_user_color > -1;
+	m_customizeConsoleErrorColor = getColorSetting(_T("CUSTOMCONSOLEERRORCOLOR"), m_customConsoleErrorColor) && m_customConsoleErrorColor > -1;
+
 	m_standardPrompt = ConfigFile::getInstance()->getSetting(_T("ADDEXTRALINETOOUTPUT")) == _T("1") ? m_standardPrompt.insert(0, "\n") : m_standardPrompt;
 	m_currentPrompt = m_standardPrompt;
 	//Window::init(hInst, nppData._nppHandle);
@@ -381,7 +390,8 @@ void ConsoleDialog::createOutputWindow(HWND hParentWindow)
 
 	// 1 is stderr, red text
 	callScintilla(SCI_STYLESETSIZE, 1 /* = style number */, 8 /* = size in points */);
-	callScintilla(SCI_STYLESETFORE, 1, RGB(250, 0, 0));
+	COLORREF consoleErrorColor = m_customizeConsoleErrorColor ? m_customConsoleErrorColor : RGB(250, 0, 0);
+	callScintilla(SCI_STYLESETFORE, 1, consoleErrorColor);
 
 	// 2 is stdout, black text, underline hotspot
 	callScintilla(SCI_STYLESETSIZE, 2 /* = style number */, 8 /* = size in points */);
diff --git a/PythonScript/src/ConsoleDialog.h b/PythonScript/src/ConsoleDialog.h
@@ -97,7 +97,8 @@ class ConsoleDialog : public DockingDlgInterface
 	HMENU m_hContext;
 	bool m_colorOutput;
 	int m_user_color;
-
+	bool m_customizeConsoleErrorColor;
+	int m_customConsoleErrorColor;
 };
 
 enum ErrorLevel
diff --git a/PythonScript/src/PythonHandler.cpp b/PythonScript/src/PythonHandler.cpp
@@ -94,7 +94,7 @@ void PythonHandler::initPython()
 	Py_NoSiteFlag = 1;
 
 	Py_Initialize();
-    // Initialise threading and create & acquire Global Interpreter Lock
+	// Initialise threading and create & acquire Global Interpreter Lock
 	PyEval_InitThreads();
 
 
@@ -110,30 +110,30 @@ void PythonHandler::initPython()
 
 
 	// Init paths
-	char initBuffer[1024];
-    char pathCommands[500];
+	char initBuffer[1024]{};
+	char pathCommands[500]{};
 
 	// If the user wants to use their installed python version, append the paths.
 	// If not (and they want to use the bundled python install), the default, then prepend the paths
-    if (ConfigFile::getInstance()->getSetting(_T("PREFERINSTALLEDPYTHON")) == _T("1")) {
-        strcpy_s<500>(pathCommands, "import sys\n"
-            "sys.path.append(r'%slib'%s)\n"
-            "sys.path.append(r'%slib'%s)\n"
-            "sys.path.append(r'%sscripts'%s)\n"
-            "sys.path.append(r'%sscripts'%s)\n"
+	if (ConfigFile::getInstance()->getSetting(_T("PREFERINSTALLEDPYTHON")) == _T("1")) {
+		strcpy_s<500>(pathCommands, "import sys\n"
+			"sys.path.append(r'%slib'%s)\n"
+			"sys.path.append(r'%slib'%s)\n"
+			"sys.path.append(r'%sscripts'%s)\n"
+			"sys.path.append(r'%sscripts'%s)\n"
 			"sys.path.append(r'%slib\\lib-tk'%s)\n" );
 	} else {
-        strcpy_s<500>(pathCommands, "import sys\n"
-            "sys.path.insert(0,r'%slib'%s)\n"
-            "sys.path.insert(1,r'%slib'%s)\n"
-            "sys.path.insert(2,r'%sscripts'%s)\n"
-            "sys.path.insert(3,r'%sscripts'%s)\n"
-            "sys.path.insert(4,r'%slib\\lib-tk'%s)\n"
+		strcpy_s<500>(pathCommands, "import sys\n"
+			"sys.path.insert(0,r'%slib'%s)\n"
+			"sys.path.insert(1,r'%slib'%s)\n"
+			"sys.path.insert(2,r'%sscripts'%s)\n"
+			"sys.path.insert(3,r'%sscripts'%s)\n"
+			"sys.path.insert(4,r'%slib\\lib-tk'%s)\n"
 			);
 		}
 
 	_snprintf_s(initBuffer, 1024, 1024,
-        pathCommands,
+		pathCommands,
 		smachineDir.c_str(),
 		machineIsUnicode ? ".decode('utf8')" : "",
 
diff --git a/PythonScript/src/Replacer.h b/PythonScript/src/Replacer.h
@@ -64,7 +64,7 @@ class BoostRegexMatch : public Match
 		m_text = rhs.m_text;
 		m_match = rhs.m_match;
 
-		/* We explicitely don't copy the list, as the allocatedGroupDetails will simply be destructed when this object gets destroyed.
+		/* We explicitly don't copy the list, as the allocatedGroupDetails will simply be destructed when this object gets destroyed.
 		 * In theory, this would be bad, as we would delete the allocated GroupDetail objects when this object is deleted,
 		 * even though the various groups may still be in use.
 		 * In practice however, these GroupDetails don't actually live as long as this object, as we've created a ReplaceEntry
diff --git a/PythonScript/src/ScintillaWrapper.cpp b/PythonScript/src/ScintillaWrapper.cpp
@@ -802,6 +802,15 @@ void ScintillaWrapper::replaceImpl(boost::python::object searchStr, boost::pytho
 	intptr_t currentDocumentCodePage = this->GetCodePage();
 
 	std::string searchChars = extractEncodedString(searchStr, currentDocumentCodePage);
+
+	if (searchStr.is_none() || searchChars.empty()) {
+		throw NppPythonScript::ArgumentException("search parameter must not be none or an empty string");
+	}
+
+	if (replaceStr.is_none()) {
+		throw NppPythonScript::ArgumentException("replace parameter must not be none");
+	}
+
 	std::string replaceChars;
 	bool isPythonReplaceFunction = true;
 
@@ -947,6 +956,11 @@ void ScintillaWrapper::searchImpl(boost::python::object searchStr,
 
 	std::string searchChars = extractEncodedString(searchStr, currentDocumentCodePage);
 
+	if (searchStr.is_none() || searchChars.empty())
+	{
+		throw NppPythonScript::ArgumentException("search parameter must not be none or an empty string");
+	}
+
 	if (!PyCallable_Check(matchFunction.ptr()))
 	{
 		throw NppPythonScript::ArgumentException("match parameter must be callable, i.e. either a function or a lambda expression");
@@ -1070,4 +1084,4 @@ std::string ScintillaWrapper::iso_latin_1_to_utf8(const std::string& ansi_input)
 	return output;
 }
 
-}
+}
diff --git a/PythonScript/src/ShortcutDlg.cpp b/PythonScript/src/ShortcutDlg.cpp
@@ -23,7 +23,8 @@ ShortcutDlg::ShortcutDlg(HINSTANCE hInst, NppData& nppData, const TCHAR *scriptD
 	  m_menuItemCount(0),
 	  m_toolbarColumnWidth(100),
 	  m_menuItemColumnWidth(100),
-	  m_currentScript(NULL)
+	  m_currentScript(NULL),
+	  m_hButtonConsoleErrorColor(NULL)
 {
 	Window::init(hInst, nppData._nppHandle);
 	TCHAR temp[MAX_PATH]{};
@@ -78,7 +79,10 @@ INT_PTR CALLBACK ShortcutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
 			switch (LOWORD(wParam))
 			{
 				case IDC_COLORCHOOSER:
-					ctrlOnClick();
+					ctrlOnClick(IDC_COLORCHOOSER);
+					break;
+				case IDC_COLORCHOOSER2:
+					ctrlOnClick(IDC_COLORCHOOSER2);
 					break;
 				case IDC_CHECKCOLORIZEOUTPUT:
 					if (HIWORD(wParam) == BN_CLICKED)
@@ -87,6 +91,13 @@ INT_PTR CALLBACK ShortcutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
 						EnableWindow(m_hButtonColor, (result == BST_CHECKED) ? true : false);
 					}
 					break;
+				case IDC_CONSOLEERRORCOLOR:
+					if (HIWORD(wParam) == BN_CLICKED)
+					{
+						size_t result = SendMessage(reinterpret_cast<HWND>(lParam), BM_GETCHECK, 0, 0);
+						EnableWindow(m_hButtonConsoleErrorColor, (result == BST_CHECKED) ? true : false);
+					}
+					break;
 			}
 			switch(wParam)
 			{
@@ -224,6 +235,7 @@ void ShortcutDlg::onInitDialog()
 	m_hListToolbarItems = ::GetDlgItem(_hSelf, IDC_TOOLBARITEMLIST2);
 	m_hComboInitialisation = ::GetDlgItem(_hSelf, IDC_COMBOINITIALISATION);
 	m_hButtonColor = ::GetDlgItem(_hSelf, IDC_COLORCHOOSER);
+	m_hButtonConsoleErrorColor = ::GetDlgItem(_hSelf, IDC_COLORCHOOSER2);
 	InitCommonControls();
 	HICON hIcon;           // handle to icon
 
@@ -533,6 +545,10 @@ void ShortcutDlg::populateCurrentItems()
 	bool disablePopupWarning = (configFile->getSetting(_T("DISABLEPOPUPWARNING")) == _T("1"));
 	CheckDlgButton(_hSelf, IDC_DISABLEPOPUPWARNING, disablePopupWarning ? BST_CHECKED : BST_UNCHECKED);
 
+	bool colorConsoleError = (configFile->getSetting(_T("CUSTOMCONSOLEERRORCOLOR")) >= _T("0"));
+	CheckDlgButton(_hSelf, IDC_CONSOLEERRORCOLOR, colorConsoleError ? BST_CHECKED : BST_UNCHECKED);
+	EnableWindow(m_hButtonConsoleErrorColor, colorConsoleError);
+
 }
 
 
@@ -573,6 +589,9 @@ void ShortcutDlg::saveConfig()
 	bool disablePopupWarning = (BST_CHECKED == IsDlgButtonChecked(_hSelf, IDC_DISABLEPOPUPWARNING));
 	configFile->setSetting(_T("DISABLEPOPUPWARNING"), disablePopupWarning ? _T("1") : _T("0"));
 
+	bool customizeConsoleErrorColor = (BST_CHECKED == IsDlgButtonChecked(_hSelf, IDC_CONSOLEERRORCOLOR));
+	configFile->setSetting(_T("CUSTOMCONSOLEERRORCOLOR"), customizeConsoleErrorColor ? ConfigFile::getInstance()->getSetting(_T("CUSTOMCONSOLEERRORCOLOR")) : _T("-1"));
+
 	configFile->save();
 }
 
@@ -625,16 +644,18 @@ void ShortcutDlg::toolbarSetIcon()
 	}
 }
 
-void ShortcutDlg::ctrlOnClick() const
+void ShortcutDlg::ctrlOnClick(WORD whichColorButton) const
 {
 	CHOOSECOLOR cc;
 	static COLORREF acrCustClr[16];
 	for (int i = 0; i < 16; i++)
 	{
 		acrCustClr[i] = RGB(255,255,255);
 	}
-	const tstring strRGBCurrent = ConfigFile::getInstance()->getSetting(_T("COLORIZEOUTPUT"));
-	static DWORD rgbCurrent = (strRGBCurrent == _T("-1")) ? RGB(135,214,18) : stoi(strRGBCurrent);
+	const TCHAR *colorSetting = whichColorButton == IDC_COLORCHOOSER ? _T("COLORIZEOUTPUT") : _T("CUSTOMCONSOLEERRORCOLOR");
+	COLORREF defaultColor = whichColorButton == IDC_COLORCHOOSER ? RGB(135, 214, 18) : RGB(255, 0, 0);
+	const tstring strRGBCurrent = ConfigFile::getInstance()->getSetting(colorSetting);
+	static DWORD rgbCurrent = (strRGBCurrent == _T("-1")) ? defaultColor : stoi(strRGBCurrent);
 
 	ZeroMemory(&cc, sizeof(cc));
 	cc.lStructSize = sizeof(cc);
@@ -646,7 +667,7 @@ void ShortcutDlg::ctrlOnClick() const
 	if (ChooseColor(&cc) == TRUE)
 	{
 		rgbCurrent = cc.rgbResult;
-		ConfigFile::getInstance()->setSetting(_T("COLORIZEOUTPUT"), std::to_wstring(rgbCurrent));
+		ConfigFile::getInstance()->setSetting(colorSetting, std::to_wstring(rgbCurrent));
 	}
 
 }
diff --git a/PythonScript/src/ShortcutDlg.h b/PythonScript/src/ShortcutDlg.h
@@ -45,7 +45,7 @@ class ShortcutDlg : public StaticDialog
 
 	void saveConfig();
 
-	void ctrlOnClick() const;
+	void ctrlOnClick(WORD whichColorButton) const;
 
 	HTREEITEM addTreeItem(HTREEITEM parent, HTREEITEM lastItem, TCHAR *fullPath, TCHAR *text, bool isDirectory);
 
@@ -56,6 +56,7 @@ class ShortcutDlg : public StaticDialog
 	HWND m_hListToolbarItems;
 	HWND m_hComboInitialisation;
 	HWND m_hButtonColor;
+	HWND m_hButtonConsoleErrorColor;
 
 	HIMAGELIST m_hImageList;
 	int m_hDefaultImageIndex;
diff --git a/docs/source/conf.py b/docs/source/conf.py
diff --git a/docs/source/scintilla.rst b/docs/source/scintilla.rst

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ void ConfigFile::initSettings()`
`49`	`49`	`setSetting(_T("DISABLEPOPUPWARNING"), _T("0"));`
`50`	`50`	`setSetting(_T("PREFERINSTALLEDPYTHON"), _T("0"));`
`51`	`51`	`setSetting(_T("STARTUP"), _T("LAZY"));`
	`52`	`+ setSetting(_T("CUSTOMCONSOLEERRORCOLOR"), _T("-1"));`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`void ConfigFile::readConfig()`