Feature [feature-requests:#1297] 7: Add value aliases for PascalCase constants.

For example, FolderEnd instead of Folderend.
Could also be used for a snake_case option if desired.

2 files changed, 170 insertions, 1 deletions

diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index e3092d59c..02174e3b5 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -10,7 +10,7 @@
 ## A line starting with # followed by a space is a documentation comment and refers
 ## to the next feature definition.
 
-## Each feature is defined by a line starting with fun, get, set, val or evt.
+## Each feature is defined by a line starting with fun, get, set, val, evt, enu, lex, or ali.
 ##     cat -> start a category
 ##     fun -> a function
 ##     get -> a property get function
@@ -19,6 +19,7 @@
 ##     evt -> an event
 ##     enu -> associate an enumeration with a set of vals with a prefix
 ##     lex -> associate a lexer with the lexical classes it produces
+##     ali -> add an alias for a val, commonly adding '_' to separate words
 ##
 ## All other feature names should be ignored. They may be defined in the future.
 ## A property may have a set function, a get function or both. Each will have
@@ -164,6 +165,10 @@ val SCWS_VISIBLEALWAYS=1
 val SCWS_VISIBLEAFTERINDENT=2
 val SCWS_VISIBLEONLYININDENT=3
 
+ali SCWS_VISIBLEALWAYS=VISIBLE_ALWAYS
+ali SCWS_VISIBLEAFTERINDENT=VISIBLE_AFTER_INDENT
+ali SCWS_VISIBLEONLYININDENT=VISIBLE_ONLY_IN_INDENT
+
 # Are white space characters currently visible?
 # Returns one of SCWS_* constants.
 get WhiteSpace GetViewWS=2020(,)
@@ -175,6 +180,9 @@ enu TabDrawMode=SCTD_
 val SCTD_LONGARROW=0
 val SCTD_STRIKEOUT=1
 
+ali SCTD_LONGARROW=LONG_ARROW
+ali SCTD_STRIKEOUT=STRIKE_OUT
+
 # Retrieve the current tab draw mode.
 # Returns one of SCTD_* constants.
 get TabDrawMode GetTabDrawMode=2698(,)
@@ -212,6 +220,8 @@ val SC_EOL_CRLF=0
 val SC_EOL_CR=1
 val SC_EOL_LF=2
 
+ali SC_EOL_CRLF=CR_LF
+
 # Convert all line endings in the document to one mode.
 fun void ConvertEOLs=2029(EndOfLine eolMode,)
 
@@ -311,6 +321,29 @@ val SC_MARK_VERTICALBOOKMARK=32
 
 val SC_MARK_CHARACTER=10000
 
+ali SC_MARK_ROUNDRECT=ROUND_RECT
+ali SC_MARK_SMALLRECT=SMALL_RECT
+ali SC_MARK_SHORTARROW=SHORT_ARROW
+ali SC_MARK_ARROWDOWN=ARROW_DOWN
+ali SC_MARK_VLINE=V_LINE
+ali SC_MARK_LCORNER=L_CORNER
+ali SC_MARK_TCORNER=T_CORNER
+ali SC_MARK_BOXPLUS=BOX_PLUS
+ali SC_MARK_BOXPLUSCONNECTED=BOX_PLUS_CONNECTED
+ali SC_MARK_BOXMINUS=BOX_MINUS
+ali SC_MARK_BOXMINUSCONNECTED=BOX_MINUS_CONNECTED
+ali SC_MARK_LCORNERCURVE=L_CORNER_CURVE
+ali SC_MARK_TCORNERCURVE=T_CORNER_CURVE
+ali SC_MARK_CIRCLEPLUS=CIRCLE_PLUS
+ali SC_MARK_CIRCLEPLUSCONNECTED=CIRCLE_PLUS_CONNECTED
+ali SC_MARK_CIRCLEMINUS=CIRCLE_MINUS
+ali SC_MARK_CIRCLEMINUSCONNECTED=CIRCLE_MINUS_CONNECTED
+ali SC_MARK_DOTDOTDOT=DOT_DOT_DOT
+ali SC_MARK_FULLRECT=FULL_RECT
+ali SC_MARK_LEFTRECT=LEFT_RECT
+ali SC_MARK_RGBAIMAGE=R_G_B_A_IMAGE
+ali SC_MARK_VERTICALBOOKMARK=VERTICAL_BOOKMARK
+
 enu MarkerOutline=SC_MARKNUM_
 # Markers used for outlining column.
 val SC_MARKNUM_FOLDEREND=25
@@ -321,6 +354,13 @@ val SC_MARKNUM_FOLDERSUB=29
 val SC_MARKNUM_FOLDER=30
 val SC_MARKNUM_FOLDEROPEN=31
 
+ali SC_MARKNUM_FOLDEREND=FOLDER_END
+ali SC_MARKNUM_FOLDEROPENMID=FOLDER_OPEN_MID
+ali SC_MARKNUM_FOLDERMIDTAIL=FOLDER_MID_TAIL
+ali SC_MARKNUM_FOLDERTAIL=FOLDER_TAIL
+ali SC_MARKNUM_FOLDERSUB=FOLDER_SUB
+ali SC_MARKNUM_FOLDEROPEN=FOLDER_OPEN
+
 # SC_MASK_FOLDERS doesn't go in an enumeration as larger than max 32-bit positive integer
 val SC_MASK_FOLDERS=0xFE000000
 
@@ -378,6 +418,8 @@ val SC_MARGIN_TEXT=4
 val SC_MARGIN_RTEXT=5
 val SC_MARGIN_COLOUR=6
 
+ali SC_MARGIN_RTEXT=R_TEXT
+
 # Set a margin to be either numeric or symbolic.
 set void SetMarginTypeN=2240(int margin, int marginType)
 
@@ -433,6 +475,15 @@ val STYLE_FOLDDISPLAYTEXT=39
 val STYLE_LASTPREDEFINED=39
 val STYLE_MAX=255
 
+ali STYLE_LINENUMBER=LINE_NUMBER
+ali STYLE_BRACELIGHT=BRACE_LIGHT
+ali STYLE_BRACEBAD=BRACE_BAD
+ali STYLE_CONTROLCHAR=CONTROL_CHAR
+ali STYLE_INDENTGUIDE=INDENT_GUIDE
+ali STYLE_CALLTIP=CALL_TIP
+ali STYLE_FOLDDISPLAYTEXT=FOLD_DISPLAY_TEXT
+ali STYLE_LASTPREDEFINED=LAST_PREDEFINED
+
 # Character set identifiers are used in StyleSetCharacterSet.
 # The values are the same as the Windows *_CHARSET values.
 enu CharacterSet=SC_CHARSET_
@@ -459,6 +510,14 @@ val SC_CHARSET_VIETNAMESE=163
 val SC_CHARSET_THAI=222
 val SC_CHARSET_8859_15=1000
 
+ali SC_CHARSET_CHINESEBIG5=CHINESE_BIG5
+ali SC_CHARSET_EASTEUROPE=EAST_EUROPE
+ali SC_CHARSET_GB2312=G_B_2312
+ali SC_CHARSET_OEM=O_E_M
+ali SC_CHARSET_OEM866=O_E_M_866
+ali SC_CHARSET_SHIFTJIS=SHIFT_J_I_S
+ali SC_CHARSET_8859_15=I_S_O_8859_15
+
 # Clear all the styles and make equivalent to the global default style.
 fun void StyleClearAll=2050(,)
 
@@ -553,6 +612,8 @@ val SC_WEIGHT_NORMAL=400
 val SC_WEIGHT_SEMIBOLD=600
 val SC_WEIGHT_BOLD=700
 
+ali SC_WEIGHT_SEMIBOLD=SEMI_BOLD
+
 # Set the weight of characters of a style.
 set void StyleSetWeight=2063(int style, FontWeight weight)
 
@@ -667,6 +728,19 @@ val INDICATOR_IME=32
 val INDICATOR_IME_MAX=35
 val INDICATOR_MAX=35
 
+ali INDIC_TT=T_T
+ali INDIC_ROUNDBOX=ROUND_BOX
+ali INDIC_STRAIGHTBOX=STRAIGHT_BOX
+ali INDIC_SQUIGGLELOW=SQUIGGLE_LOW
+ali INDIC_DOTBOX=DOT_BOX
+ali INDIC_SQUIGGLEPIXMAP=SQUIGGLE_PIXMAP
+ali INDIC_COMPOSITIONTHICK=COMPOSITION_THICK
+ali INDIC_COMPOSITIONTHIN=COMPOSITION_THIN
+ali INDIC_FULLBOX=FULL_BOX
+ali INDIC_TEXTFORE=TEXT_FORE
+ali INDIC_POINTCHARACTER=POINT_CHARACTER
+ali INDIC_GRADIENTCENTRE=GRADIENT_CENTRE
+
 # Set an indicator to plain, squiggle or TT.
 set void IndicSetStyle=2080(int indicator, IndicatorStyle indicatorStyle)
 
@@ -704,6 +778,8 @@ val SC_INDICVALUEMASK=0xFFFFFF
 enu IndicFlag=SC_INDICFLAG_
 val SC_INDICFLAG_VALUEFORE=1
 
+ali SC_INDICFLAG_VALUEFORE=VALUE_FORE
+
 # Set the attributes of an indicator.
 set void IndicSetFlags=2684(int indicator, IndicFlag flags)
 
@@ -894,6 +970,9 @@ val SC_IV_REAL=1
 val SC_IV_LOOKFORWARD=2
 val SC_IV_LOOKBOTH=3
 
+ali SC_IV_LOOKFORWARD=LOOK_FORWARD
+ali SC_IV_LOOKBOTH=LOOK_BOTH
+
 # Show or hide indentation guides.
 set void SetIndentationGuides=2132(IndentView indentView,)
 
@@ -958,6 +1037,12 @@ val SC_PRINT_COLOURONWHITEDEFAULTBG=4
 # PrintColourMode - use same colours as screen, including line number margins.
 val SC_PRINT_SCREENCOLOURS=5
 
+ali SC_PRINT_INVERTLIGHT=INVERT_LIGHT
+ali SC_PRINT_BLACKONWHITE=BLACK_ON_WHITE
+ali SC_PRINT_COLOURONWHITE=COLOUR_ON_WHITE
+ali SC_PRINT_COLOURONWHITEDEFAULTBG=COLOUR_ON_WHITE_DEFAULT_B_G
+ali SC_PRINT_SCREENCOLOURS=SCREEN_COLOURS
+
 # Modify colours when printing for clearer printed text.
 set void SetPrintColourMode=2148(PrintOption mode,)
 
@@ -973,6 +1058,13 @@ val SCFIND_REGEXP=0x00200000
 val SCFIND_POSIX=0x00400000
 val SCFIND_CXX11REGEX=0x00800000
 
+ali SCFIND_WHOLEWORD=WHOLE_WORD
+ali SCFIND_MATCHCASE=MATCH_CASE
+ali SCFIND_WORDSTART=WORD_START
+ali SCFIND_REGEXP=REG_EXP
+ali SCFIND_POSIX=P_O_S_I_X
+ali SCFIND_CXX11REGEX=C_X_X_11_REG_EX
+
 # Find some text in the document.
 fun position FindText=2150(FindOption searchFlags, findtext ft)
 
@@ -1203,6 +1295,10 @@ val SC_FOLDLEVELWHITEFLAG=0x1000
 val SC_FOLDLEVELHEADERFLAG=0x2000
 val SC_FOLDLEVELNUMBERMASK=0x0FFF
 
+ali SC_FOLDLEVELWHITEFLAG=WHITE_FLAG
+ali SC_FOLDLEVELHEADERFLAG=HEADER_FLAG
+ali SC_FOLDLEVELNUMBERMASK=NUMBER_MASK
+
 # Set the fold level of a line.
 # This encodes an integer level along with flags indicating whether the
 # line is a header and whether it is effectively white space.
@@ -1297,6 +1393,13 @@ val SC_FOLDFLAG_LINEAFTER_CONTRACTED=0x0010
 val SC_FOLDFLAG_LEVELNUMBERS=0x0040
 val SC_FOLDFLAG_LINESTATE=0x0080
 
+ali SC_FOLDFLAG_LINEBEFORE_EXPANDED=LINE_BEFORE_EXPANDED
+ali SC_FOLDFLAG_LINEBEFORE_CONTRACTED=LINE_BEFORE_CONTRACTED
+ali SC_FOLDFLAG_LINEAFTER_EXPANDED=LINE_AFTER_EXPANDED
+ali SC_FOLDFLAG_LINEAFTER_CONTRACTED=LINE_AFTER_CONTRACTED
+ali SC_FOLDFLAG_LEVELNUMBERS=LEVEL_NUMBERS
+ali SC_FOLDFLAG_LINESTATE=LINE_STATE
+
 # Set some style options for folding.
 set void SetFoldFlags=2233(FoldFlag flags,)
 
@@ -1339,6 +1442,9 @@ val SC_IDLESTYLING_TOVISIBLE=1
 val SC_IDLESTYLING_AFTERVISIBLE=2
 val SC_IDLESTYLING_ALL=3
 
+ali SC_IDLESTYLING_TOVISIBLE=TO_VISIBLE
+ali SC_IDLESTYLING_AFTERVISIBLE=AFTER_VISIBLE
+
 # Sets limits to idle styling.
 set void SetIdleStyling=2692(IdleStyling idleStyling,)
 
@@ -1351,6 +1457,8 @@ val SC_WRAP_WORD=1
 val SC_WRAP_CHAR=2
 val SC_WRAP_WHITESPACE=3
 
+ali SC_WRAP_WHITESPACE=WHITE_SPACE
+
 # Sets whether text is word wrapped.
 set void SetWrapMode=2268(Wrap wrapMode,)
 
@@ -1392,6 +1500,8 @@ val SC_WRAPINDENT_SAME=1
 val SC_WRAPINDENT_INDENT=2
 val SC_WRAPINDENT_DEEPINDENT=3
 
+ali SC_WRAPINDENT_DEEPINDENT=DEEP_INDENT
+
 # Sets how wrapped sublines are placed. Default is fixed.
 set void SetWrapIndentMode=2472(WrapIndentMode wrapIndentMode,)
 
@@ -1750,6 +1860,8 @@ val EDGE_LINE=1
 val EDGE_BACKGROUND=2
 val EDGE_MULTILINE=3
 
+ali EDGE_MULTILINE=MULTI_LINE
+
 # Retrieve the column number which text should be kept within.
 get position GetEdgeColumn=2360(,)
 
@@ -1845,6 +1957,9 @@ val SC_STATUS_BADALLOC=2
 val SC_STATUS_WARN_START=1000
 val SC_STATUS_WARN_REGEX=1001
 
+ali SC_STATUS_BADALLOC=BAD_ALLOC
+ali SC_STATUS_WARN_REGEX=REG_EX
+
 # Change error status - 0 = OK.
 set void SetStatus=2382(Status status,)
 # Get error status.
@@ -1865,6 +1980,9 @@ val SC_CURSORNORMAL=-1
 val SC_CURSORARROW=2
 val SC_CURSORWAIT=4
 val SC_CURSORREVERSEARROW=7
+
+ali SC_CURSORREVERSEARROW=REVERSE_ARROW
+
 # Sets the cursor to one of the SC_CURSOR* values.
 set void SetCursor=2386(CursorShape cursorType,)
 # Get cursor type.
@@ -2114,6 +2232,9 @@ enu CaseInsensitiveBehaviour=SC_CASEINSENSITIVEBEHAVIOUR_
 val SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=0
 val SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE=1
 
+ali SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=RESPECT_CASE
+ali SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE=IGNORE_CASE
+
 # Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference.
 set void AutoCSetCaseInsensitiveBehaviour=2634(CaseInsensitiveBehaviour behaviour,)
 
@@ -2135,6 +2256,9 @@ val SC_ORDER_PRESORTED=0
 val SC_ORDER_PERFORMSORT=1
 val SC_ORDER_CUSTOM=2
 
+ali SC_ORDER_PRESORTED=PRE_SORTED
+ali SC_ORDER_PERFORMSORT=PERFORM_SORT
+
 # Set the way autocompletion lists are ordered.
 set void AutoCSetOrder=2660(Ordering order,)
 
@@ -2172,6 +2296,8 @@ val SC_CARETSTICKY_OFF=0
 val SC_CARETSTICKY_ON=1
 val SC_CARETSTICKY_WHITESPACE=2
 
+ali SC_CARETSTICKY_WHITESPACE=WHITE_SPACE
+
 # Switch between sticky and non-sticky: meant to be bound to a key.
 fun void ToggleCaretSticky=2459(,)
 
@@ -2189,6 +2315,8 @@ val SC_ALPHA_TRANSPARENT=0
 val SC_ALPHA_OPAQUE=255
 val SC_ALPHA_NOALPHA=256
 
+ali SC_ALPHA_NOALPHA=NO_ALPHA
+
 # Set background alpha of the caret line.
 set void SetCaretLineBackAlpha=2470(Alpha alpha,)
 
@@ -2319,6 +2447,8 @@ enu MarginOption=SC_MARGINOPTION_
 val SC_MARGINOPTION_NONE=0
 val SC_MARGINOPTION_SUBLINESELECT=1
 
+ali SC_MARGINOPTION_SUBLINESELECT=SUB_LINE_SELECT
+
 # Set the margin options.
 set void SetMarginOptions=2539(MarginOption marginOptions,)
 
@@ -2493,6 +2623,10 @@ val SCVS_RECTANGULARSELECTION=1
 val SCVS_USERACCESSIBLE=2
 val SCVS_NOWRAPLINESTART=4
 
+ali SCVS_RECTANGULARSELECTION=RECTANGULAR_SELECTION
+ali SCVS_USERACCESSIBLE=USER_ACCESSIBLE
+ali SCVS_NOWRAPLINESTART=NO_WRAP_LINE_START
+
 # Set options for virtual space behaviour.
 set void SetVirtualSpaceOptions=2596(VirtualSpace virtualSpaceOptions,)
 # Return options for virtual space behaviour.
@@ -2594,6 +2728,10 @@ val SC_TECHNOLOGY_DIRECTWRITE=1
 val SC_TECHNOLOGY_DIRECTWRITERETAIN=2
 val SC_TECHNOLOGY_DIRECTWRITEDC=3
 
+ali SC_TECHNOLOGY_DIRECTWRITE=DIRECT_WRITE
+ali SC_TECHNOLOGY_DIRECTWRITERETAIN=DIRECT_WRITE_RETAIN
+ali SC_TECHNOLOGY_DIRECTWRITEDC=DIRECT_WRITE_D_C
+
 # Set the technology used.
 set void SetTechnology=2630(Technology technology,)
 
@@ -2800,6 +2938,26 @@ val SC_MOD_INSERTCHECK=0x100000
 val SC_MOD_CHANGETABSTOPS=0x200000
 val SC_MODEVENTMASKALL=0x3FFFFF
 
+ali SC_MOD_INSERTTEXT=INSERT_TEXT
+ali SC_MOD_DELETETEXT=DELETE_TEXT
+ali SC_MOD_CHANGESTYLE=CHANGE_STYLE
+ali SC_MOD_CHANGEFOLD=CHANGE_FOLD
+ali SC_MULTISTEPUNDOREDO=MULTI_STEP_UNDO_REDO
+ali SC_LASTSTEPINUNDOREDO=LAST_STEP_IN_UNDO_REDO
+ali SC_MOD_CHANGEMARKER=CHANGE_MARKER
+ali SC_MOD_BEFOREINSERT=BEFORE_INSERT
+ali SC_MOD_BEFOREDELETE=BEFORE_DELETE
+ali SC_MULTILINEUNDOREDO=MULTILINE_UNDO_REDO
+ali SC_STARTACTION=START_ACTION
+ali SC_MOD_CHANGEINDICATOR=CHANGE_INDICATOR
+ali SC_MOD_CHANGELINESTATE=CHANGE_LINE_STATE
+ali SC_MOD_CHANGEMARGIN=CHANGE_MARGIN
+ali SC_MOD_CHANGEANNOTATION=CHANGE_ANNOTATION
+ali SC_MOD_LEXERSTATE=LEXER_STATE
+ali SC_MOD_INSERTCHECK=INSERT_CHECK
+ali SC_MOD_CHANGETABSTOPS=CHANGE_TAB_STOPS
+ali SC_MODEVENTMASKALL=EVENT_MASK_ALL
+
 enu Update=SC_UPDATE_
 val SC_UPDATE_CONTENT=0x1
 val SC_UPDATE_SELECTION=0x2
@@ -2840,6 +2998,8 @@ val SCK_WIN=313
 val SCK_RWIN=314
 val SCK_MENU=315
 
+ali SCK_RWIN=R_WIN
+
 enu KeyMod=SCMOD_
 val SCMOD_NORM=0
 val SCMOD_SHIFT=1
@@ -2855,6 +3015,9 @@ val SC_AC_TAB=3
 val SC_AC_NEWLINE=4
 val SC_AC_COMMAND=5
 
+ali SC_AC_FILLUP=FILL_UP
+ali SC_AC_DOUBLECLICK=DOUBLE_CLICK
+
 ################################################
 # For SciLexer.h
 enu Lexer=SCLEX_
diff --git a/scripts/Face.py b/scripts/Face.py
index 22c2943e6..c340dcbab 100644
--- a/scripts/Face.py
+++ b/scripts/Face.py
@@ -47,6 +47,7 @@ class Face:
 		self.features = {}
 		self.values = {}
 		self.events = {}
+		self.aliases = {}
 
 	def ReadFromFile(self, name):
 		currentCategory = ""
@@ -120,4 +121,9 @@ class Face:
 							"Comment": currentComment }
 						self.order.append(name)
 						currentComment = []
+					elif featureType == "ali":
+						# Enumeration alias
+						name, value = featureVal.split("=", 1)
+						self.aliases[name] = value
+						currentComment = []