Fix for ModificationFlags in Enums

CreateWrapper.py is ever-more hacky.  Need to fix this.

Author: bruderstein

PythonScript/src/CreateWrapper.py

@@ -622,7 +622,21 @@ def writeEnumsWrapperFile(f, out):
 		if v.get('Values'):
 			out.write('\tboost::python::enum_<{0}>("{1}")'.format(name, name.upper()))
 			for val in v['Values']:
-				out.write('\n\t\t.value("{0}", PYSCR_{1})'.format(val[0][len(v['Value']):].upper(), val[0]))
+				takeEnumValueFromPosition = None
+				for prefix in v['Value'].split(' '):
+					if val[0][:len(prefix)] == prefix:
+						takeEnumValueFromPosition = len(prefix)
+						break
+
+				# Hack for ModificationFlags
+				# There's more than one prefix specified for ModificationFlags, separated with spaces.
+				# Unfortunately, some of the prefixes are the complete symbol, which means we patch that here to just remove the SC_
+				if val[0] in ['SC_STARTACTION', 'SC_MULTISTEPUNDOREDO', 'SC_LASTSTEPINUNDOREDO', 'SC_MULTILINEUNDOREDO', 'SC_MODEVENTMASKALL']:
+					takeEnumValueFromPosition = len('SC_')
+
+
+
+				out.write('\n\t\t.value("{0}", PYSCR_{1})'.format(val[0][takeEnumValueFromPosition:].upper(), val[0]))
 			out.write(';\n\n')
 
 	out.write('\tboost::python::enum_<ScintillaNotification>("SCINTILLANOTIFICATION")'.format(name, name.upper()))
@@ -687,13 +701,26 @@ def writeScintillaEnums(f, out):
 			out.write('{0}\n{1}\n\n.. _{0}:\n.. class:: {0}\n\n'.format(name.upper(), '-' * len(name)))
 
 			for val in v['Values']:
-				out.write('.. attribute:: {0}.{1}\n\n'.format(name.upper(), val[0][len(v['Value']):].upper()))
+				takeEnumValueFromPosition = None
+				for prefix in v['Value'].split(' '):
+					if val[0][:len(prefix)] == prefix:
+						takeEnumValueFromPosition = len(prefix)
+						break
+
+				# Hack for ModificationFlags
+				# There's more than one prefix specified for ModificationFlags, separated with spaces.
+				# Unfortunately, some of the prefixes are the complete symbol, which means we patch that here to just remove the SC_
+				if val[0] in ['SC_STARTACTION', 'SC_MULTISTEPUNDOREDO', 'SC_LASTSTEPINUNDOREDO', 'SC_MULTILINEUNDOREDO', 'SC_MODEVENTMASKALL']:
+					takeEnumValueFromPosition = len('SC_')
+					
+				out.write('.. attribute:: {0}.{1}\n\n'.format(name.upper(), val[0][takeEnumValueFromPosition:].upper()))
 
 def findEnum(f, name):
-	for e in f.enums:
-		l = len(f.enums[e]["Value"])
-		if f.enums[e]["Value"] == name[:l]:
-			return e
+	for enumName in f.enums:
+		for e in f.enums[enumName]["Value"].split(' '):
+			l = len(e)
+			if e == name[:l]:
+				return enumName
 	return None
 
 def findEnumValues(f):

PythonScript/src/Enums.h

@@ -579,6 +579,31 @@ enum FindOption
 	PYSCR_SCFIND_POSIX = SCFIND_POSIX
 };
 
+enum ModificationFlags
+{
+	PYSCR_SC_MOD_INSERTTEXT = SC_MOD_INSERTTEXT,
+	PYSCR_SC_MOD_DELETETEXT = SC_MOD_DELETETEXT,
+	PYSCR_SC_MOD_CHANGESTYLE = SC_MOD_CHANGESTYLE,
+	PYSCR_SC_MOD_CHANGEFOLD = SC_MOD_CHANGEFOLD,
+	PYSCR_SC_PERFORMED_USER = SC_PERFORMED_USER,
+	PYSCR_SC_PERFORMED_UNDO = SC_PERFORMED_UNDO,
+	PYSCR_SC_PERFORMED_REDO = SC_PERFORMED_REDO,
+	PYSCR_SC_MULTISTEPUNDOREDO = SC_MULTISTEPUNDOREDO,
+	PYSCR_SC_LASTSTEPINUNDOREDO = SC_LASTSTEPINUNDOREDO,
+	PYSCR_SC_MOD_CHANGEMARKER = SC_MOD_CHANGEMARKER,
+	PYSCR_SC_MOD_BEFOREINSERT = SC_MOD_BEFOREINSERT,
+	PYSCR_SC_MOD_BEFOREDELETE = SC_MOD_BEFOREDELETE,
+	PYSCR_SC_MULTILINEUNDOREDO = SC_MULTILINEUNDOREDO,
+	PYSCR_SC_STARTACTION = SC_STARTACTION,
+	PYSCR_SC_MOD_CHANGEINDICATOR = SC_MOD_CHANGEINDICATOR,
+	PYSCR_SC_MOD_CHANGELINESTATE = SC_MOD_CHANGELINESTATE,
+	PYSCR_SC_MOD_CHANGEMARGIN = SC_MOD_CHANGEMARGIN,
+	PYSCR_SC_MOD_CHANGEANNOTATION = SC_MOD_CHANGEANNOTATION,
+	PYSCR_SC_MOD_CONTAINER = SC_MOD_CONTAINER,
+	PYSCR_SC_MOD_LEXERSTATE = SC_MOD_LEXERSTATE,
+	PYSCR_SC_MODEVENTMASKALL = SC_MODEVENTMASKALL
+};
+
 enum LineEndType
 {
 	PYSCR_SC_LINE_END_TYPE_DEFAULT = SC_LINE_END_TYPE_DEFAULT,
@@ -721,11 +746,11 @@ enum EndOfLine
 
 
 /* The following is the enum of events/notifications. 
-		   * Note that the PYSCN_XXX constants are NOT automatically generated (in ScintillaNotifications.h).
-		   * This is very deliberate. 
-		   * An error here indicates that a new notification has been added,
-		   * and hence handler code should be added to the ScintillaWrapper::notify() function
-		   */
+           * Note that the PYSCN_XXX constants are NOT automatically generated (in ScintillaNotifications.h).
+           * This is very deliberate. 
+           * An error here indicates that a new notification has been added,
+           * and hence handler code should be added to the ScintillaWrapper::notify() function
+           */
 enum ScintillaMessage
 {
 	PYSCR_SCI_ADDTEXT = SCI_ADDTEXT,

PythonScript/src/EnumsWrapper.cpp

@@ -527,6 +527,29 @@ void export_enums()
 		.value("REGEXP", PYSCR_SCFIND_REGEXP)
 		.value("POSIX", PYSCR_SCFIND_POSIX);
 
+	boost::python::enum_<ModificationFlags>("MODIFICATIONFLAGS")
+		.value("INSERTTEXT", PYSCR_SC_MOD_INSERTTEXT)
+		.value("DELETETEXT", PYSCR_SC_MOD_DELETETEXT)
+		.value("CHANGESTYLE", PYSCR_SC_MOD_CHANGESTYLE)
+		.value("CHANGEFOLD", PYSCR_SC_MOD_CHANGEFOLD)
+		.value("USER", PYSCR_SC_PERFORMED_USER)
+		.value("UNDO", PYSCR_SC_PERFORMED_UNDO)
+		.value("REDO", PYSCR_SC_PERFORMED_REDO)
+		.value("MULTISTEPUNDOREDO", PYSCR_SC_MULTISTEPUNDOREDO)
+		.value("LASTSTEPINUNDOREDO", PYSCR_SC_LASTSTEPINUNDOREDO)
+		.value("CHANGEMARKER", PYSCR_SC_MOD_CHANGEMARKER)
+		.value("BEFOREINSERT", PYSCR_SC_MOD_BEFOREINSERT)
+		.value("BEFOREDELETE", PYSCR_SC_MOD_BEFOREDELETE)
+		.value("MULTILINEUNDOREDO", PYSCR_SC_MULTILINEUNDOREDO)
+		.value("STARTACTION", PYSCR_SC_STARTACTION)
+		.value("CHANGEINDICATOR", PYSCR_SC_MOD_CHANGEINDICATOR)
+		.value("CHANGELINESTATE", PYSCR_SC_MOD_CHANGELINESTATE)
+		.value("CHANGEMARGIN", PYSCR_SC_MOD_CHANGEMARGIN)
+		.value("CHANGEANNOTATION", PYSCR_SC_MOD_CHANGEANNOTATION)
+		.value("CONTAINER", PYSCR_SC_MOD_CONTAINER)
+		.value("LEXERSTATE", PYSCR_SC_MOD_LEXERSTATE)
+		.value("MODEVENTMASKALL", PYSCR_SC_MODEVENTMASKALL);
+
 	boost::python::enum_<LineEndType>("LINEENDTYPE")
 		.value("DEFAULT", PYSCR_SC_LINE_END_TYPE_DEFAULT)
 		.value("UNICODE", PYSCR_SC_LINE_END_TYPE_UNICODE);

docs/source/enums.rst

@@ -1678,6 +1678,54 @@ MARKERSYMBOL
 
 .. attribute:: MARKERSYMBOL.CHARACTER
 
+MODIFICATIONFLAGS
+-----------------
+
+.. _MODIFICATIONFLAGS:
+.. class:: MODIFICATIONFLAGS
+
+.. attribute:: MODIFICATIONFLAGS.INSERTTEXT
+
+.. attribute:: MODIFICATIONFLAGS.DELETETEXT
+
+.. attribute:: MODIFICATIONFLAGS.CHANGESTYLE
+
+.. attribute:: MODIFICATIONFLAGS.CHANGEFOLD
+
+.. attribute:: MODIFICATIONFLAGS.USER
+
+.. attribute:: MODIFICATIONFLAGS.UNDO
+
+.. attribute:: MODIFICATIONFLAGS.REDO
+
+.. attribute:: MODIFICATIONFLAGS.MULTISTEPUNDOREDO
+
+.. attribute:: MODIFICATIONFLAGS.LASTSTEPINUNDOREDO
+
+.. attribute:: MODIFICATIONFLAGS.CHANGEMARKER
+
+.. attribute:: MODIFICATIONFLAGS.BEFOREINSERT
+
+.. attribute:: MODIFICATIONFLAGS.BEFOREDELETE
+
+.. attribute:: MODIFICATIONFLAGS.MULTILINEUNDOREDO
+
+.. attribute:: MODIFICATIONFLAGS.STARTACTION
+
+.. attribute:: MODIFICATIONFLAGS.CHANGEINDICATOR
+
+.. attribute:: MODIFICATIONFLAGS.CHANGELINESTATE
+
+.. attribute:: MODIFICATIONFLAGS.CHANGEMARGIN
+
+.. attribute:: MODIFICATIONFLAGS.CHANGEANNOTATION
+
+.. attribute:: MODIFICATIONFLAGS.CONTAINER
+
+.. attribute:: MODIFICATIONFLAGS.LEXERSTATE
+
+.. attribute:: MODIFICATIONFLAGS.MODEVENTMASKALL
+
 MULTIPASTE
 ----------