From abdc76cba26e0fa748e63d7ee50e1bb5f42b7f88 Mon Sep 17 00:00:00 2001 From: dail8859 Date: Mon, 15 Mar 2021 19:56:20 -0400 Subject: [PATCH 1/7] Update Scintilla version to v4.4.6 --- README.md | 2 +- appveyor.yml | 6 +- scripts/Scintilla.iface | 201 ++++++++++++++++++++++++++++++++++------ src/Lua.vcxproj | 10 +- src/LuaScript.vcxproj | 10 +- src/SciIFaceTable.cpp | 94 ++++++++++++++++++- src/SciTE/IFaceTable.h | 1 + 7 files changed, 276 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index 0d1d7f6..12f886a 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Scripts can also register functions to be called when certain events occur, such The full API documentation can be found [here](http://dail8859.github.io/LuaScript/). Also be sure to check out the [examples](/examples/) directory. ## Development -The code has been developed using Visual Studio 2017. To compile the code: +The code has been developed using Visual Studio 2019. To compile the code: 1. Open the `LuaScript.sln` file 1. Press `F7` and that's it! diff --git a/appveyor.yml b/appveyor.yml index 2d5f53b..e437cc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ -version: 0.9.0.{build} -image: Visual Studio 2017 +version: 0.10.1.{build} +image: Visual Studio 2019 platform: - x64 @@ -16,7 +16,7 @@ install: - if "%platform%"=="Win32" set archi=x86 - if "%platform%"=="Win32" set build_platform=Win32 - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% + - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% build: parallel: true diff --git a/scripts/Scintilla.iface b/scripts/Scintilla.iface index 8107ae4..2c044d1 100644 --- a/scripts/Scintilla.iface +++ b/scripts/Scintilla.iface @@ -151,11 +151,17 @@ fun position GetStyledText=2015(, textrange tr) fun bool CanRedo=2016(,) # Retrieve the line number at which a particular marker is located. -fun int MarkerLineFromHandle=2017(int markerHandle,) +fun line MarkerLineFromHandle=2017(int markerHandle,) # Delete a marker. fun void MarkerDeleteHandle=2018(int markerHandle,) +# Retrieve marker handles of a line +fun int MarkerHandleFromLine=2732(line line, int which) + +# Retrieve marker number of a marker handle +fun int MarkerNumberFromLine=2733(line line, int which) + # Is undo history being collected? get bool GetUndoCollection=2019(,) @@ -252,6 +258,12 @@ set void SetTabWidth=2036(int tabWidth,) # Retrieve the visible size of a tab. get int GetTabWidth=2121(,) +# Set the minimum visual width of a tab. +set void SetTabMinimumWidth=2724(int pixels,) + +# Get the minimum visual width of a tab. +get int GetTabMinimumWidth=2725(,) + # Clear explicit tabstops on a line. fun void ClearTabStops=2675(line line,) @@ -276,9 +288,24 @@ val SC_IME_INLINE=1 # Is the IME displayed in a window or inline? get IMEInteraction GetIMEInteraction=2678(,) -# Choose to display the the IME in a winow or inline. +# Choose to display the IME in a window or inline. set void SetIMEInteraction=2679(IMEInteraction imeInteraction,) +enu Alpha=SC_ALPHA_ +val SC_ALPHA_TRANSPARENT=0 +val SC_ALPHA_OPAQUE=255 +val SC_ALPHA_NOALPHA=256 + +ali SC_ALPHA_NOALPHA=NO_ALPHA + +enu CursorShape=SC_CURSOR +val SC_CURSORNORMAL=-1 +val SC_CURSORARROW=2 +val SC_CURSORWAIT=4 +val SC_CURSORREVERSEARROW=7 + +ali SC_CURSORREVERSEARROW=REVERSE_ARROW + enu MarkerSymbol=SC_MARK_ val MARKER_MAX=31 val SC_MARK_CIRCLE=0 @@ -376,7 +403,7 @@ set void MarkerSetBack=2042(int markerNumber, colour back) # Set the background colour used for a particular marker number when its folding block is selected. set void MarkerSetBackSelected=2292(int markerNumber, colour back) -# Enable/disable highlight for current folding bloc (smallest one that contains the caret) +# Enable/disable highlight for current folding block (smallest one that contains the caret) fun void MarkerEnableHighlight=2293(bool enabled,) # Add a marker to a line, returning an ID which can be used to find or delete the marker. @@ -1202,6 +1229,12 @@ set void SetTargetStart=2190(position start,) # Get the position that starts the target. get position GetTargetStart=2191(,) +# Sets the virtual space of the target start +set void SetTargetStartVirtualSpace=2728(position space,) + +# Get the virtual space of the target start +get position GetTargetStartVirtualSpace=2729(,) + # Sets the position that ends the target which is used for updating the # document without affecting the scroll position. set void SetTargetEnd=2192(position end,) @@ -1209,6 +1242,12 @@ set void SetTargetEnd=2192(position end,) # Get the position that ends the target. get position GetTargetEnd=2193(,) +# Sets the virtual space of the target end +set void SetTargetEndVirtualSpace=2730(position space,) + +# Get the virtual space of the target end +get position GetTargetEndVirtualSpace=2731(,) + # Sets both the start and end of the target in one call. fun void SetTargetRange=2686(position start, position end) @@ -1261,7 +1300,7 @@ fun position CallTipPosStart=2203(,) set void CallTipSetPosStart=2214(position posStart,) # Highlight a segment of the definition. -fun void CallTipSetHlt=2204(int highlightStart, int highlightEnd) +fun void CallTipSetHlt=2204(position highlightStart, position highlightEnd) # Set the background colour for the call tip. set void CallTipSetBack=2205(colour back,) @@ -1837,6 +1876,9 @@ fun void BraceBadLightIndicator=2499(bool useSetting, int indicator) # The maxReStyle must be 0 for now. It may be defined in a future release. fun position BraceMatch=2353(position pos, int maxReStyle) +# Similar to BraceMatch, but matching starts at the explicit start position. +fun position BraceMatchNext=2369(position pos, position startPos) + # Are the end of line characters visible? get bool GetViewEOL=2355(,) @@ -1886,6 +1928,9 @@ fun void MultiEdgeAddLine=2694(position column, colour edgeColour) # Clear all vertical edges. fun void MultiEdgeClearAll=2695(,) +# Get multi edge positions. +get position GetMultiEdgeColumn=2749(int which,) + # Sets the current caret position to be the search anchor. fun void SearchAnchor=2366(,) @@ -1973,14 +2018,6 @@ set void SetMouseWheelCaptures=2696(bool captures,) # Get whether mouse wheel can be active outside the window. get bool GetMouseWheelCaptures=2697(,) -enu CursorShape=SC_CURSOR -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. @@ -2007,6 +2044,7 @@ fun void WordPartRightExtend=2393(,) enu VisiblePolicy=VISIBLE_ val VISIBLE_SLOP=0x01 val VISIBLE_STRICT=0x04 + # Set the way the display area is determined when a particular line # is to be moved to by Find, FindNext, GotoLine, etc. fun void SetVisiblePolicy=2394(VisiblePolicy visiblePolicy, int visibleSlop) @@ -2093,10 +2131,13 @@ get bool GetHotspotSingleLine=2497(,) # Move caret down one paragraph (delimited by empty lines). fun void ParaDown=2413(,) + # Extend selection down one paragraph (delimited by empty lines). fun void ParaDownExtend=2414(,) + # Move caret up one paragraph (delimited by empty lines). fun void ParaUp=2415(,) + # Extend selection up one paragraph (delimited by empty lines). fun void ParaUpExtend=2416(,) @@ -2283,12 +2324,6 @@ fun position EncodedFromUTF8=2449(string utf8, stringresult encoded) # multi-byte characters. If beyond end of line, return line end position. fun position FindColumn=2456(line line, position column) -# Can the caret preferred x position only be changed by explicit movement commands? -get CaretSticky GetCaretSticky=2457(,) - -# Stop the caret preferred x position changing when the user types. -set void SetCaretSticky=2458(CaretSticky useCaretStickyBehaviour,) - enu CaretSticky=SC_CARETSTICKY_ val SC_CARETSTICKY_OFF=0 val SC_CARETSTICKY_ON=1 @@ -2296,6 +2331,12 @@ val SC_CARETSTICKY_WHITESPACE=2 ali SC_CARETSTICKY_WHITESPACE=WHITE_SPACE +# Can the caret preferred x position only be changed by explicit movement commands? +get CaretSticky GetCaretSticky=2457(,) + +# Stop the caret preferred x position changing when the user types. +set void SetCaretSticky=2458(CaretSticky useCaretStickyBehaviour,) + # Switch between sticky and non-sticky: meant to be bound to a key. fun void ToggleCaretSticky=2459(,) @@ -2308,13 +2349,6 @@ get bool GetPasteConvertEndings=2468(,) # Duplicate the selection. If selection empty duplicate the line containing the caret. fun void SelectionDuplicate=2469(,) -enu Alpha=SC_ALPHA_ -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,) @@ -2361,10 +2395,10 @@ fun int IndicatorAllOnFor=2506(position pos,) fun int IndicatorValueAt=2507(int indicator, position pos) # Where does a particular indicator start? -fun int IndicatorStart=2508(int indicator, position pos) +fun position IndicatorStart=2508(int indicator, position pos) # Where does a particular indicator end? -fun int IndicatorEnd=2509(int indicator, position pos) +fun position IndicatorEnd=2509(int indicator, position pos) # Set number of entries in position cache set void SetPositionCache=2514(int size,) @@ -2572,18 +2606,25 @@ get int GetMainSelection=2575(,) # Set the caret position of the nth selection. set void SetSelectionNCaret=2576(int selection, position caret) + # Return the caret position of the nth selection. get position GetSelectionNCaret=2577(int selection,) + # Set the anchor position of the nth selection. set void SetSelectionNAnchor=2578(int selection, position anchor) + # Return the anchor position of the nth selection. get position GetSelectionNAnchor=2579(int selection,) + # Set the virtual space of the caret of the nth selection. set void SetSelectionNCaretVirtualSpace=2580(int selection, position space) + # Return the virtual space of the caret of the nth selection. get position GetSelectionNCaretVirtualSpace=2581(int selection,) + # Set the virtual space of the anchor of the nth selection. set void SetSelectionNAnchorVirtualSpace=2582(int selection, position space) + # Return the virtual space of the anchor of the nth selection. get position GetSelectionNAnchorVirtualSpace=2583(int selection,) @@ -2593,26 +2634,39 @@ set void SetSelectionNStart=2584(int selection, position anchor) # Returns the position at the start of the selection. get position GetSelectionNStart=2585(int selection,) +# Returns the virtual space at the start of the selection. +get position GetSelectionNStartVirtualSpace=2726(int selection,) + # Sets the position that ends the selection - this becomes the currentPosition. set void SetSelectionNEnd=2586(int selection, position caret) +# Returns the virtual space at the end of the selection. +get position GetSelectionNEndVirtualSpace=2727(int selection,) + # Returns the position at the end of the selection. get position GetSelectionNEnd=2587(int selection,) # Set the caret position of the rectangular selection. set void SetRectangularSelectionCaret=2588(position caret,) + # Return the caret position of the rectangular selection. get position GetRectangularSelectionCaret=2589(,) + # Set the anchor position of the rectangular selection. set void SetRectangularSelectionAnchor=2590(position anchor,) + # Return the anchor position of the rectangular selection. get position GetRectangularSelectionAnchor=2591(,) + # Set the virtual space of the caret of the rectangular selection. set void SetRectangularSelectionCaretVirtualSpace=2592(position space,) + # Return the virtual space of the caret of the rectangular selection. get position GetRectangularSelectionCaretVirtualSpace=2593(,) + # Set the virtual space of the anchor of the rectangular selection. set void SetRectangularSelectionAnchorVirtualSpace=2594(position space,) + # Return the virtual space of the anchor of the rectangular selection. get position GetRectangularSelectionAnchorVirtualSpace=2595(,) @@ -2628,6 +2682,7 @@ 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. get VirtualSpace GetVirtualSpaceOptions=2597(,) @@ -2788,6 +2843,38 @@ get int GetRepresentation=2666(string encodedCharacter, stringresult representat # Remove a character representation. fun void ClearRepresentation=2667(string encodedCharacter,) +# Set the end of line annotation text for a line +set void EOLAnnotationSetText=2740(line line, string text) + +# Get the end of line annotation text for a line +get int EOLAnnotationGetText=2741(line line, stringresult text) + +# Set the style number for the end of line annotations for a line +set void EOLAnnotationSetStyle=2742(line line, int style) + +# Get the style number for the end of line annotations for a line +get int EOLAnnotationGetStyle=2743(line line,) + +# Clear the end of annotations from all lines +fun void EOLAnnotationClearAll=2744(,) + +enu EOLAnnotationVisible=EOLANNOTATION_ +val EOLANNOTATION_HIDDEN=0 +val EOLANNOTATION_STANDARD=1 +val EOLANNOTATION_BOXED=2 + +# Set the visibility for the end of line annotations for a view +set void EOLAnnotationSetVisible=2745(EOLAnnotationVisible visible,) + +# Get the visibility for the end of line annotations for a view +get EOLAnnotationVisible EOLAnnotationGetVisible=2746(,) + +# Get the start of the range of style numbers used for end of line annotations +set void EOLAnnotationSetStyleOffset=2747(int style,) + +# Get the start of the range of style numbers used for end of line annotations +get int EOLAnnotationGetStyleOffset=2748(,) + # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) @@ -2907,6 +2994,9 @@ fun int TagsOfStyle=4031(int style, stringresult tags) # Result is NUL-terminated. fun int DescriptionOfStyle=4032(int style, stringresult description) +# Set the lexer from an ILexer*. +set void SetILexer=4033(, pointer ilexer) + # Notifications # Type of modification and the action which caused the modification. # These are defined as a bit mask to make it easy to specify which notifications are wanted. @@ -2935,7 +3025,8 @@ val SC_MOD_CONTAINER=0x40000 val SC_MOD_LEXERSTATE=0x80000 val SC_MOD_INSERTCHECK=0x100000 val SC_MOD_CHANGETABSTOPS=0x200000 -val SC_MODEVENTMASKALL=0x3FFFFF +val SC_MOD_CHANGEEOLANNOTATION=0x400000 +val SC_MODEVENTMASKALL=0x7FFFFF ali SC_MOD_INSERTTEXT=INSERT_TEXT ali SC_MOD_DELETETEXT=DELETE_TEXT @@ -2955,6 +3046,7 @@ 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_MOD_CHANGEEOLANNOTATION=CHANGE_E_O_L_ANNOTATION ali SC_MODEVENTMASKALL=EVENT_MASK_ALL enu Update=SC_UPDATE_ @@ -3157,6 +3249,8 @@ val SCLEX_NIM=126 val SCLEX_CIL=127 val SCLEX_X12=128 val SCLEX_DATAFLEX=129 +val SCLEX_HOLLYWOOD=130 +val SCLEX_RAKU=131 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -3583,6 +3677,7 @@ val SCE_ERR_VALUE=21 val SCE_ERR_GCC_INCLUDED_FROM=22 val SCE_ERR_ESCSEQ=23 val SCE_ERR_ESCSEQ_UNKNOWN=24 +val SCE_ERR_GCC_EXCERPT=25 val SCE_ERR_ES_BLACK=40 val SCE_ERR_ES_RED=41 val SCE_ERR_ES_GREEN=42 @@ -5110,7 +5205,7 @@ val SCE_SAS_MACRO_KEYWORD=12 val SCE_SAS_BLOCK_KEYWORD=13 val SCE_SAS_MACRO_FUNCTION=14 val SCE_SAS_STATEMENT=15 -# Lexical states for SCLEX_NIM +# Lexical states for SCLEX_NIM lex Nim=SCLEX_NIM SCE_NIM_ val SCE_NIM_DEFAULT=0 val SCE_NIM_COMMENT=1 @@ -5170,6 +5265,54 @@ val SCE_DF_STRINGEOL=11 val SCE_DF_SCOPEWORD=12 val SCE_DF_OPERATOR=13 val SCE_DF_ICODE=14 +# Lexical states for SCLEX_HOLLYWOOD +lex Hollywood=SCLEX_HOLLYWOOD SCE_HOLLYWOOD_ +val SCE_HOLLYWOOD_DEFAULT=0 +val SCE_HOLLYWOOD_COMMENT=1 +val SCE_HOLLYWOOD_COMMENTBLOCK=2 +val SCE_HOLLYWOOD_NUMBER=3 +val SCE_HOLLYWOOD_KEYWORD=4 +val SCE_HOLLYWOOD_STDAPI=5 +val SCE_HOLLYWOOD_PLUGINAPI=6 +val SCE_HOLLYWOOD_PLUGINMETHOD=7 +val SCE_HOLLYWOOD_STRING=8 +val SCE_HOLLYWOOD_STRINGBLOCK=9 +val SCE_HOLLYWOOD_PREPROCESSOR=10 +val SCE_HOLLYWOOD_OPERATOR=11 +val SCE_HOLLYWOOD_IDENTIFIER=12 +val SCE_HOLLYWOOD_CONSTANT=13 +val SCE_HOLLYWOOD_HEXNUMBER=14 +# Lexical states for SCLEX_RAKU +lex Raku=SCLEX_RAKU SCE_RAKU_ +val SCE_RAKU_DEFAULT=0 +val SCE_RAKU_ERROR=1 +val SCE_RAKU_COMMENTLINE=2 +val SCE_RAKU_COMMENTEMBED=3 +val SCE_RAKU_POD=4 +val SCE_RAKU_CHARACTER=5 +val SCE_RAKU_HEREDOC_Q=6 +val SCE_RAKU_HEREDOC_QQ=7 +val SCE_RAKU_STRING=8 +val SCE_RAKU_STRING_Q=9 +val SCE_RAKU_STRING_QQ=10 +val SCE_RAKU_STRING_Q_LANG=11 +val SCE_RAKU_STRING_VAR=12 +val SCE_RAKU_REGEX=13 +val SCE_RAKU_REGEX_VAR=14 +val SCE_RAKU_ADVERB=15 +val SCE_RAKU_NUMBER=16 +val SCE_RAKU_PREPROCESSOR=17 +val SCE_RAKU_OPERATOR=18 +val SCE_RAKU_WORD=19 +val SCE_RAKU_FUNCTION=20 +val SCE_RAKU_IDENTIFIER=21 +val SCE_RAKU_TYPEDEF=22 +val SCE_RAKU_MU=23 +val SCE_RAKU_POSITIONAL=24 +val SCE_RAKU_ASSOCIATIVE=25 +val SCE_RAKU_CALLABLE=26 +val SCE_RAKU_GRAMMAR=27 +val SCE_RAKU_CLASS=28 # Events diff --git a/src/Lua.vcxproj b/src/Lua.vcxproj index 314946b..e965e5f 100644 --- a/src/Lua.vcxproj +++ b/src/Lua.vcxproj @@ -22,29 +22,29 @@ {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A} LuaScript Win32Proj - 10.0.17763.0 + 10.0 DynamicLibrary Unicode - v141 + v142 DynamicLibrary Unicode - v141 + v142 DynamicLibrary Unicode - v141 + v142 true DynamicLibrary Unicode - v141 + v142 true diff --git a/src/LuaScript.vcxproj b/src/LuaScript.vcxproj index 48ca9ab..b99e090 100644 --- a/src/LuaScript.vcxproj +++ b/src/LuaScript.vcxproj @@ -22,29 +22,29 @@ {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D} LuaScript Win32Proj - 10.0.17763.0 + 10.0 DynamicLibrary Unicode - v141 + v142 DynamicLibrary Unicode - v141 + v142 DynamicLibrary Unicode - v141 + v142 true DynamicLibrary Unicode - v141 + v142 true diff --git a/src/SciIFaceTable.cpp b/src/SciIFaceTable.cpp index 339a557..07bedd4 100644 --- a/src/SciIFaceTable.cpp +++ b/src/SciIFaceTable.cpp @@ -41,6 +41,9 @@ static std::vector ifaceConstants = { { "EDGE_LINE", 1 }, { "EDGE_MULTILINE", 3 }, { "EDGE_NONE", 0 }, + { "EOLANNOTATION_BOXED", 2 }, + { "EOLANNOTATION_HIDDEN", 0 }, + { "EOLANNOTATION_STANDARD", 1 }, { "INDICATOR_CONTAINER", 8 }, { "INDICATOR_IME", 32 }, { "INDICATOR_IME_MAX", 35 }, @@ -630,6 +633,7 @@ static std::vector ifaceConstants = { { "SCE_ERR_ES_WHITE", 55 }, { "SCE_ERR_ES_YELLOW", 51 }, { "SCE_ERR_GCC", 2 }, + { "SCE_ERR_GCC_EXCERPT", 25 }, { "SCE_ERR_GCC_INCLUDED_FROM", 22 }, { "SCE_ERR_IFC", 16 }, { "SCE_ERR_IFORT", 17 }, @@ -819,6 +823,21 @@ static std::vector ifaceConstants = { { "SCE_HJ_STRINGEOL", 51 }, { "SCE_HJ_SYMBOLS", 50 }, { "SCE_HJ_WORD", 46 }, + { "SCE_HOLLYWOOD_COMMENT", 1 }, + { "SCE_HOLLYWOOD_COMMENTBLOCK", 2 }, + { "SCE_HOLLYWOOD_CONSTANT", 13 }, + { "SCE_HOLLYWOOD_DEFAULT", 0 }, + { "SCE_HOLLYWOOD_HEXNUMBER", 14 }, + { "SCE_HOLLYWOOD_IDENTIFIER", 12 }, + { "SCE_HOLLYWOOD_KEYWORD", 4 }, + { "SCE_HOLLYWOOD_NUMBER", 3 }, + { "SCE_HOLLYWOOD_OPERATOR", 11 }, + { "SCE_HOLLYWOOD_PLUGINAPI", 6 }, + { "SCE_HOLLYWOOD_PLUGINMETHOD", 7 }, + { "SCE_HOLLYWOOD_PREPROCESSOR", 10 }, + { "SCE_HOLLYWOOD_STDAPI", 5 }, + { "SCE_HOLLYWOOD_STRING", 8 }, + { "SCE_HOLLYWOOD_STRINGBLOCK", 9 }, { "SCE_HPA_CHARACTER", 110 }, { "SCE_HPA_CLASSNAME", 114 }, { "SCE_HPA_COMMENTLINE", 107 }, @@ -1403,6 +1422,35 @@ static std::vector ifaceConstants = { { "SCE_P_TRIPLEDOUBLE", 7 }, { "SCE_P_WORD", 5 }, { "SCE_P_WORD2", 14 }, + { "SCE_RAKU_ADVERB", 15 }, + { "SCE_RAKU_ASSOCIATIVE", 25 }, + { "SCE_RAKU_CALLABLE", 26 }, + { "SCE_RAKU_CHARACTER", 5 }, + { "SCE_RAKU_CLASS", 28 }, + { "SCE_RAKU_COMMENTEMBED", 3 }, + { "SCE_RAKU_COMMENTLINE", 2 }, + { "SCE_RAKU_DEFAULT", 0 }, + { "SCE_RAKU_ERROR", 1 }, + { "SCE_RAKU_FUNCTION", 20 }, + { "SCE_RAKU_GRAMMAR", 27 }, + { "SCE_RAKU_HEREDOC_Q", 6 }, + { "SCE_RAKU_HEREDOC_QQ", 7 }, + { "SCE_RAKU_IDENTIFIER", 21 }, + { "SCE_RAKU_MU", 23 }, + { "SCE_RAKU_NUMBER", 16 }, + { "SCE_RAKU_OPERATOR", 18 }, + { "SCE_RAKU_POD", 4 }, + { "SCE_RAKU_POSITIONAL", 24 }, + { "SCE_RAKU_PREPROCESSOR", 17 }, + { "SCE_RAKU_REGEX", 13 }, + { "SCE_RAKU_REGEX_VAR", 14 }, + { "SCE_RAKU_STRING", 8 }, + { "SCE_RAKU_STRING_Q", 9 }, + { "SCE_RAKU_STRING_QQ", 10 }, + { "SCE_RAKU_STRING_Q_LANG", 11 }, + { "SCE_RAKU_STRING_VAR", 12 }, + { "SCE_RAKU_TYPEDEF", 22 }, + { "SCE_RAKU_WORD", 19 }, { "SCE_RB_BACKTICKS", 18 }, { "SCE_RB_CHARACTER", 7 }, { "SCE_RB_CLASSNAME", 8 }, @@ -1897,6 +1945,14 @@ static std::vector ifaceConstants = { { "SCI_CALLTIPSETPOSSTART", 2214 }, { "SCI_CALLTIPUSESTYLE", 2212 }, { "SCI_DISTANCETOSECONDARYSTYLES", 4025 }, + { "SCI_EOLANNOTATIONGETSTYLE", 2743 }, + { "SCI_EOLANNOTATIONGETSTYLEOFFSET", 2748 }, + { "SCI_EOLANNOTATIONGETTEXT", 2741 }, + { "SCI_EOLANNOTATIONGETVISIBLE", 2746 }, + { "SCI_EOLANNOTATIONSETSTYLE", 2742 }, + { "SCI_EOLANNOTATIONSETSTYLEOFFSET", 2747 }, + { "SCI_EOLANNOTATIONSETTEXT", 2740 }, + { "SCI_EOLANNOTATIONSETVISIBLE", 2745 }, { "SCI_FOLDDISPLAYTEXTGETSTYLE", 2707 }, { "SCI_FOLDDISPLAYTEXTSETSTYLE", 2701 }, { "SCI_GETACCESSIBILITY", 2703 }, @@ -1993,6 +2049,7 @@ static std::vector ifaceConstants = { { "SCI_GETMOUSESELECTIONRECTANGULARSWITCH", 2669 }, { "SCI_GETMOUSEWHEELCAPTURES", 2697 }, { "SCI_GETMOVEEXTENDSSELECTION", 2706 }, + { "SCI_GETMULTIEDGECOLUMN", 2749 }, { "SCI_GETMULTIPASTE", 2615 }, { "SCI_GETMULTIPLESELECTION", 2564 }, { "SCI_GETNAMEDSTYLES", 4029 }, @@ -2026,7 +2083,9 @@ static std::vector ifaceConstants = { { "SCI_GETSELECTIONNCARET", 2577 }, { "SCI_GETSELECTIONNCARETVIRTUALSPACE", 2581 }, { "SCI_GETSELECTIONNEND", 2587 }, + { "SCI_GETSELECTIONNENDVIRTUALSPACE", 2727 }, { "SCI_GETSELECTIONNSTART", 2585 }, + { "SCI_GETSELECTIONNSTARTVIRTUALSPACE", 2726 }, { "SCI_GETSELECTIONS", 2570 }, { "SCI_GETSELECTIONSTART", 2143 }, { "SCI_GETSELEOLFILLED", 2479 }, @@ -2038,10 +2097,13 @@ static std::vector ifaceConstants = { { "SCI_GETSUBSTYLESSTART", 4021 }, { "SCI_GETTABDRAWMODE", 2698 }, { "SCI_GETTABINDENTS", 2261 }, + { "SCI_GETTABMINIMUMWIDTH", 2725 }, { "SCI_GETTABWIDTH", 2121 }, { "SCI_GETTAG", 2616 }, { "SCI_GETTARGETEND", 2193 }, + { "SCI_GETTARGETENDVIRTUALSPACE", 2731 }, { "SCI_GETTARGETSTART", 2191 }, + { "SCI_GETTARGETSTARTVIRTUALSPACE", 2729 }, { "SCI_GETTARGETTEXT", 2687 }, { "SCI_GETTECHNOLOGY", 2631 }, { "SCI_GETTEXTLENGTH", 2183 }, @@ -2146,6 +2208,7 @@ static std::vector ifaceConstants = { { "SCI_SETIDENTIFIER", 2622 }, { "SCI_SETIDENTIFIERS", 4024 }, { "SCI_SETIDLESTYLING", 2692 }, + { "SCI_SETILEXER", 4033 }, { "SCI_SETIMEINTERACTION", 2679 }, { "SCI_SETINDENT", 2122 }, { "SCI_SETINDENTATIONGUIDES", 2132 }, @@ -2209,9 +2272,12 @@ static std::vector ifaceConstants = { { "SCI_SETSTATUS", 2382 }, { "SCI_SETTABDRAWMODE", 2699 }, { "SCI_SETTABINDENTS", 2260 }, + { "SCI_SETTABMINIMUMWIDTH", 2724 }, { "SCI_SETTABWIDTH", 2036 }, { "SCI_SETTARGETEND", 2192 }, + { "SCI_SETTARGETENDVIRTUALSPACE", 2730 }, { "SCI_SETTARGETSTART", 2190 }, + { "SCI_SETTARGETSTARTVIRTUALSPACE", 2728 }, { "SCI_SETTECHNOLOGY", 2630 }, { "SCI_SETUNDOCOLLECTION", 2012 }, { "SCI_SETUSETABS", 2124 }, @@ -2331,6 +2397,7 @@ static std::vector ifaceConstants = { { "SCLEX_GAP", 81 }, { "SCLEX_GUI4CLI", 58 }, { "SCLEX_HASKELL", 68 }, + { "SCLEX_HOLLYWOOD", 130 }, { "SCLEX_HTML", 4 }, { "SCLEX_IHEX", 118 }, { "SCLEX_INDENT", 122 }, @@ -2377,6 +2444,7 @@ static std::vector ifaceConstants = { { "SCLEX_PUREBASIC", 67 }, { "SCLEX_PYTHON", 2 }, { "SCLEX_R", 86 }, + { "SCLEX_RAKU", 131 }, { "SCLEX_REBOL", 71 }, { "SCLEX_REGISTRY", 115 }, { "SCLEX_RUBY", 22 }, @@ -2583,10 +2651,11 @@ static std::vector ifaceConstants = { { "SC_MARK_VLINE", 9 }, { "SC_MASK_FOLDERS", static_cast(0xFE000000) }, { "SC_MAX_MARGIN", 4 }, - { "SC_MODEVENTMASKALL", 0x3FFFFF }, + { "SC_MODEVENTMASKALL", 0x7FFFFF }, { "SC_MOD_BEFOREDELETE", 0x800 }, { "SC_MOD_BEFOREINSERT", 0x400 }, { "SC_MOD_CHANGEANNOTATION", 0x20000 }, + { "SC_MOD_CHANGEEOLANNOTATION", 0x400000 }, { "SC_MOD_CHANGEFOLD", 0x8 }, { "SC_MOD_CHANGEINDICATOR", 0x4000 }, { "SC_MOD_CHANGELINESTATE", 0x8000 }, @@ -2708,10 +2777,11 @@ static std::vector ifaceFunctions = { { "BraceHighlight", 2351, iface_void, { iface_position, iface_position } }, { "BraceHighlightIndicator", 2498, iface_void, { iface_bool, iface_int } }, { "BraceMatch", 2353, iface_position, { iface_position, iface_int } }, + { "BraceMatchNext", 2369, iface_position, { iface_position, iface_position } }, { "CallTipActive", 2202, iface_bool, { iface_void, iface_void } }, { "CallTipCancel", 2201, iface_void, { iface_void, iface_void } }, { "CallTipPosStart", 2203, iface_position, { iface_void, iface_void } }, - { "CallTipSetHlt", 2204, iface_void, { iface_int, iface_int } }, + { "CallTipSetHlt", 2204, iface_void, { iface_position, iface_position } }, { "CallTipShow", 2200, iface_void, { iface_position, iface_string } }, { "CanPaste", 2173, iface_bool, { iface_void, iface_void } }, { "CanRedo", 2016, iface_bool, { iface_void, iface_void } }, @@ -2766,6 +2836,7 @@ static std::vector ifaceFunctions = { { "DocumentStart", 2316, iface_void, { iface_void, iface_void } }, { "DocumentStartExtend", 2317, iface_void, { iface_void, iface_void } }, { "DropSelectionN", 2671, iface_void, { iface_int, iface_void } }, + { "EOLAnnotationClearAll", 2744, iface_void, { iface_void, iface_void } }, { "EditToggleOvertype", 2324, iface_void, { iface_void, iface_void } }, { "EmptyUndoBuffer", 2175, iface_void, { iface_void, iface_void } }, { "EncodedFromUTF8", 2449, iface_position, { iface_string, iface_stringresult } }, @@ -2814,9 +2885,9 @@ static std::vector ifaceFunctions = { { "IndexPositionFromLine", 2714, iface_position, { iface_line, iface_int } }, { "IndicatorAllOnFor", 2506, iface_int, { iface_position, iface_void } }, { "IndicatorClearRange", 2505, iface_void, { iface_position, iface_position } }, - { "IndicatorEnd", 2509, iface_int, { iface_int, iface_position } }, + { "IndicatorEnd", 2509, iface_position, { iface_int, iface_position } }, { "IndicatorFillRange", 2504, iface_void, { iface_position, iface_position } }, - { "IndicatorStart", 2508, iface_int, { iface_int, iface_position } }, + { "IndicatorStart", 2508, iface_position, { iface_int, iface_position } }, { "IndicatorValueAt", 2507, iface_int, { iface_int, iface_position } }, { "InsertText", 2003, iface_void, { iface_position, iface_string } }, { "IsRangeWord", 2691, iface_bool, { iface_position, iface_position } }, @@ -2860,8 +2931,10 @@ static std::vector ifaceFunctions = { { "MarkerDeleteHandle", 2018, iface_void, { iface_int, iface_void } }, { "MarkerEnableHighlight", 2293, iface_void, { iface_bool, iface_void } }, { "MarkerGet", 2046, iface_int, { iface_line, iface_void } }, - { "MarkerLineFromHandle", 2017, iface_int, { iface_int, iface_void } }, + { "MarkerHandleFromLine", 2732, iface_int, { iface_line, iface_int } }, + { "MarkerLineFromHandle", 2017, iface_line, { iface_int, iface_void } }, { "MarkerNext", 2047, iface_line, { iface_line, iface_int } }, + { "MarkerNumberFromLine", 2733, iface_int, { iface_line, iface_int } }, { "MarkerPrevious", 2048, iface_line, { iface_line, iface_int } }, { "MarkerSymbolDefined", 2529, iface_int, { iface_int, iface_void } }, { "MoveCaretInsideView", 2401, iface_void, { iface_void, iface_void } }, @@ -3058,6 +3131,10 @@ static std::vector ifaceProperties = { { "DistanceToSecondaryStyles", 4025, 0, iface_int, iface_void }, { "DocPointer", 2357, 2358, iface_pointer, iface_void }, { "DocumentOptions", 2379, 0, iface_int, iface_void }, + { "EOLAnnotationStyle", 2743, 2742, iface_int, iface_line }, + { "EOLAnnotationStyleOffset", 2748, 2747, iface_int, iface_void }, + { "EOLAnnotationText", 2741, 2740, iface_stringresult, iface_line }, + { "EOLAnnotationVisible", 2746, 2745, iface_int, iface_void }, { "EOLMode", 2030, 2031, iface_int, iface_void }, { "EdgeColour", 2364, 2365, iface_colour, iface_void }, { "EdgeColumn", 2360, 2361, iface_position, iface_void }, @@ -3079,6 +3156,7 @@ static std::vector ifaceProperties = { { "HighlightGuide", 2135, 2134, iface_position, iface_void }, { "HotspotActiveUnderline", 2496, 2412, iface_bool, iface_void }, { "HotspotSingleLine", 2497, 2421, iface_bool, iface_void }, + { "ILexer", 0, 4033, iface_pointer, iface_void }, { "IMEInteraction", 2678, 2679, iface_int, iface_void }, { "Identifier", 2623, 2622, iface_int, iface_void }, { "Identifiers", 0, 4024, iface_string, iface_int }, @@ -3138,6 +3216,7 @@ static std::vector ifaceProperties = { { "MouseSelectionRectangularSwitch", 2669, 2668, iface_bool, iface_void }, { "MouseWheelCaptures", 2697, 2696, iface_bool, iface_void }, { "MoveExtendsSelection", 2706, 0, iface_bool, iface_void }, + { "MultiEdgeColumn", 2749, 0, iface_position, iface_int }, { "MultiPaste", 2615, 2614, iface_int, iface_void }, { "MultipleSelection", 2564, 2563, iface_bool, iface_void }, { "NamedStyles", 4029, 0, iface_int, iface_void }, @@ -3176,7 +3255,9 @@ static std::vector ifaceProperties = { { "SelectionNCaret", 2577, 2576, iface_position, iface_int }, { "SelectionNCaretVirtualSpace", 2581, 2580, iface_position, iface_int }, { "SelectionNEnd", 2587, 2586, iface_position, iface_int }, + { "SelectionNEndVirtualSpace", 2727, 0, iface_position, iface_int }, { "SelectionNStart", 2585, 2584, iface_position, iface_int }, + { "SelectionNStartVirtualSpace", 2726, 0, iface_position, iface_int }, { "SelectionStart", 2143, 2142, iface_position, iface_void }, { "Selections", 2570, 0, iface_int, iface_void }, { "Status", 2383, 2382, iface_int, iface_void }, @@ -3202,10 +3283,13 @@ static std::vector ifaceProperties = { { "SubStylesStart", 4021, 0, iface_int, iface_int }, { "TabDrawMode", 2698, 2699, iface_int, iface_void }, { "TabIndents", 2261, 2260, iface_bool, iface_void }, + { "TabMinimumWidth", 2725, 2724, iface_int, iface_void }, { "TabWidth", 2121, 2036, iface_int, iface_void }, { "Tag", 2616, 0, iface_stringresult, iface_int }, { "TargetEnd", 2193, 2192, iface_position, iface_void }, + { "TargetEndVirtualSpace", 2731, 2730, iface_position, iface_void }, { "TargetStart", 2191, 2190, iface_position, iface_void }, + { "TargetStartVirtualSpace", 2729, 2728, iface_position, iface_void }, { "TargetText", 2687, 0, iface_stringresult, iface_void }, { "Technology", 2631, 2630, iface_int, iface_void }, { "TextLength", 2183, 0, iface_position, iface_void }, diff --git a/src/SciTE/IFaceTable.h b/src/SciTE/IFaceTable.h index 9fe1c38..3fb65a6 100644 --- a/src/SciTE/IFaceTable.h +++ b/src/SciTE/IFaceTable.h @@ -20,6 +20,7 @@ #pragma once #include +#include enum IFaceType { iface_void, From 066aeb615c08581898e124f216396f3d8aa8c1c8 Mon Sep 17 00:00:00 2001 From: dail8859 Date: Mon, 15 Mar 2021 20:37:23 -0400 Subject: [PATCH 2/7] v0.11 release --- docs/classes/Editor.html | 335 +++++++++++++++++++- docs/classes/Match.html | 2 +- docs/classes/Notepad.html | 2 +- docs/classes/Styler.html | 2 +- docs/examples/bookmark.lua.html | 2 +- docs/examples/highlightoccurrences.lua.html | 2 +- docs/examples/luaautoindent.lua.html | 2 +- docs/examples/luasyntaxchecker.lua.html | 2 +- docs/examples/randomizelines.lua.html | 2 +- docs/examples/selectionaddnext.lua.html | 2 +- docs/examples/sessionmanager.lua.html | 2 +- docs/examples/stylecsv.lua.html | 2 +- docs/examples/stylecustom.lua.html | 2 +- docs/examples/visualstudiolinecopy.lua.html | 2 +- docs/index.html | 2 +- docs/topics/callbacks.md.html | 2 +- docs/topics/externalpluginsupport.md.html | 2 +- docs_gen/PaneAPI.html | 22 +- docs_gen/config.ld | 2 +- src/Version.h | 4 +- 20 files changed, 360 insertions(+), 35 deletions(-) diff --git a/docs/classes/Editor.html b/docs/classes/Editor.html index 70e55fa..18df388 100644 --- a/docs/classes/Editor.html +++ b/docs/classes/Editor.html @@ -23,7 +23,7 @@