editor.getWord() and editor.getCurrentWord() added

 - editor.getWord([position[, useOnlyWordChars]])
 - editor.getCurrentWord()

Author: bruderstein

PythonScript/src/ScintillaPython.cpp

@@ -57,6 +57,10 @@ BOOST_PYTHON_MODULE(Npp)
 		.def("pymlsearch", &ScintillaWrapper::pymlsearchNoFlags, "Python multiline regular expression search, calling a function for each match found.  The function gets called with the (zero indexed) line number, and the match object. \nNote that this runs the search on the entire text, and therefore makes at least 2 copies of the entire document, therefore it may not be suitable for large documents.\n  pymlsearch(expression, function[, flags[, startPosition[, endPosition]]])")
 		.def("pymlsearch", &ScintillaWrapper::pymlsearchNoStartEnd, "Python multiline regular expression search, calling a function for each match found.  The function gets called with the (zero indexed) line number, and the match object. \nNote that this runs the search on the entire text, and therefore makes at least 2 copies of the entire document, therefore it may not be suitable for large documents.\n  pymlsearch(expression, function[, flags[, startPosition[, endPosition]]])")
 		.def("pymlsearch", &ScintillaWrapper::pymlsearchNoEnd, "Python multiline regular expression search, calling a function for each match found.  The function gets called with the (zero indexed) line number, and the match object. \nNote that this runs the search on the entire text, and therefore makes at least 2 copies of the entire document, therefore it may not be suitable for large documents.\n  pymlsearch(expression, function[, flags[, startPosition[, endPosition]]])")
+		.def("getWord", &ScintillaWrapper::getWord, "getWord([position[, useOnlyWordChars]])\nGets the word at position.  If position is not given or None, the current caret position is used.\nuseOnlyWordChars is a bool that is passed to Scintilla - see Scintilla rules on what is match. If not given or None, it is assumed to be true.")
+		.def("getWord", &ScintillaWrapper::getWordNoFlags, "getWord([position[, useOnlyWordChars]])\nGets the word at position.  If position is not given or None, the current caret position is used.\nuseOnlyWordChars is a bool that is passed to Scintilla - see Scintilla rules on what is match. If not given or None, it is assumed to be true.")
+		.def("getWord", &ScintillaWrapper::getCurrentWord, "getWord([position[, useOnlyWordChars]])\nGets the word at position.  If position is not given or None, the current caret position is used.\nuseOnlyWordChars is a bool that is passed to Scintilla - see Scintilla rules on what is match. If not given or None, it is assumed to be true.")
+		.def("getCurrentWord", &ScintillaWrapper::getCurrentWord, "getCurrentWord()\nAlias for getWord(), that gets the current word at the cursor.")
 		/* Between the autogenerated comments is, surprise, autogenerated
 		 * Do not edit the contents between these comments, 
 		 * edit "CreateWrapper.py" instead, which does the generation 

PythonScript/src/ScintillaWrapper.cpp

@@ -953,3 +953,39 @@ void ScintillaWrapper::pymlsearch(boost::python::object searchExp, boost::python
 
 
 }
+
+
+
+str ScintillaWrapper::getWord(object position, object useOnlyWordChars /* = true */)
+{
+	int pos;
+	if (position.is_none())
+	{
+		pos = callScintilla(SCI_GETCURRENTPOS);
+	}
+	else
+	{
+		pos = extract<int>(position);
+	}
+
+	bool wordChars;
+	if (useOnlyWordChars.is_none())
+	{
+		wordChars = true;
+	}
+	else
+	{
+		wordChars = extract<bool>(useOnlyWordChars);
+	}
+
+	int startPos = callScintilla(SCI_WORDSTARTPOSITION, pos, wordChars);
+	int endPos = callScintilla(SCI_WORDENDPOSITION, pos, wordChars);
+	Sci_TextRange tr;
+	tr.chrg.cpMin = startPos;
+	tr.chrg.cpMax = endPos;
+	tr.lpstrText = new char[(endPos - startPos) + 1];
+	callScintilla(SCI_GETTEXTRANGE, 0, reinterpret_cast<LPARAM>(&tr));
+	str retVal(const_cast<const char *>(tr.lpstrText));
+	delete[] tr.lpstrText;
+	return retVal;
+}

PythonScript/src/ScintillaWrapper.h

@@ -107,6 +107,14 @@ class ScintillaWrapper : public NppPythonScript::PyProducerConsumer<CallbackExec
 					{	pymlsearch(searchExp, callback, flags, object(), object()); };
 	void pymlsearchNoEnd(boost::python::object searchExp, boost::python::object callback, boost::python::object flags, boost::python::object startPosition)
 					{	pymlsearch(searchExp, callback, flags, startPosition, object()); };
+	
+	boost::python::str ScintillaWrapper::getWord(boost::python::object position, boost::python::object useOnlyWordChars);
+	boost::python::str ScintillaWrapper::getWordNoFlags(boost::python::object position)
+					{ return getWord(position, boost::python::object(true)); };
+	boost::python::str ScintillaWrapper::getCurrentWord()
+					{ return getWord(object(), boost::python::object(true)); };
+	
+	
 
 	/* ++Autogenerated ---------------------------------------------------- */
 	/** Add text to the document at current position.