diff options
| -rw-r--r-- | core/._SCINTILLA.luadoc | 35 | ||||
| -rw-r--r-- | core/.buffer.luadoc | 34 | ||||
| -rw-r--r-- | core/events.lua | 40 | ||||
| -rw-r--r-- | core/iface.lua | 2 | ||||
| -rw-r--r-- | core/ui.lua | 5 | ||||
| -rw-r--r-- | doc/14_Appendix.md | 1 | ||||
| -rw-r--r-- | modules/textadept/adeptsense.lua | 2 | ||||
| -rw-r--r-- | modules/textadept/editing.lua | 6 | ||||
| -rw-r--r-- | modules/textadept/find.lua | 12 | ||||
| -rw-r--r-- | modules/textadept/keys.lua | 2 | ||||
| -rw-r--r-- | modules/textadept/menu.lua | 2 | ||||
| -rw-r--r-- | properties.lua | 10 | ||||
| -rwxr-xr-x | scripts/gen_iface.lua | 8 |
13 files changed, 76 insertions, 83 deletions
diff --git a/core/._SCINTILLA.luadoc b/core/._SCINTILLA.luadoc index 8df0b680..d5dd1e0b 100644 --- a/core/._SCINTILLA.luadoc +++ b/core/._SCINTILLA.luadoc @@ -33,23 +33,23 @@ -- * `_G._SCINTILLA.constants.INDIC_STRIKE` 4 -- * `_G._SCINTILLA.constants.INDIC_TT` 2 -- * `_G._SCINTILLA.constants.MARKER_MAX` 31 --- * `_G._SCINTILLA.constants.SCFIND_MATCHCASE` 4 --- * `_G._SCINTILLA.constants.SCFIND_POSIX` 4194304 --- * `_G._SCINTILLA.constants.SCFIND_REGEXP` 2097152 --- * `_G._SCINTILLA.constants.SCFIND_WHOLEWORD` 2 --- * `_G._SCINTILLA.constants.SCFIND_WORDSTART` 1048576 --- * `_G._SCINTILLA.constants.SCMOD_ALT` 4 --- * `_G._SCINTILLA.constants.SCMOD_CTRL` 2 --- * `_G._SCINTILLA.constants.SCMOD_META` 16 --- * `_G._SCINTILLA.constants.SCMOD_NORM` 0 --- * `_G._SCINTILLA.constants.SCMOD_SHIFT` 1 --- * `_G._SCINTILLA.constants.SCMOD_SUPER` 8 --- * `_G._SCINTILLA.constants.SCVS_NONE` 0 --- * `_G._SCINTILLA.constants.SCVS_RECTANGULARSELECTION` 1 --- * `_G._SCINTILLA.constants.SCVS_USERACCESSIBLE` 2 --- * `_G._SCINTILLA.constants.SCWS_INVISIBLE` 0 --- * `_G._SCINTILLA.constants.SCWS_VISIBLEAFTERINDENT` 2 --- * `_G._SCINTILLA.constants.SCWS_VISIBLEALWAYS` 1 +-- * `_G._SCINTILLA.constants.FIND_MATCHCASE` 4 +-- * `_G._SCINTILLA.constants.FIND_POSIX` 4194304 +-- * `_G._SCINTILLA.constants.FIND_REGEXP` 2097152 +-- * `_G._SCINTILLA.constants.FIND_WHOLEWORD` 2 +-- * `_G._SCINTILLA.constants.FIND_WORDSTART` 1048576 +-- * `_G._SCINTILLA.constants.MOD_ALT` 4 +-- * `_G._SCINTILLA.constants.MOD_CTRL` 2 +-- * `_G._SCINTILLA.constants.MOD_META` 16 +-- * `_G._SCINTILLA.constants.MOD_NORM` 0 +-- * `_G._SCINTILLA.constants.MOD_SHIFT` 1 +-- * `_G._SCINTILLA.constants.MOD_SUPER` 8 +-- * `_G._SCINTILLA.constants.VS_NONE` 0 +-- * `_G._SCINTILLA.constants.VS_RECTANGULARSELECTION` 1 +-- * `_G._SCINTILLA.constants.VS_USERACCESSIBLE` 2 +-- * `_G._SCINTILLA.constants.WS_INVISIBLE` 0 +-- * `_G._SCINTILLA.constants.WS_VISIBLEAFTERINDENT` 2 +-- * `_G._SCINTILLA.constants.WS_VISIBLEALWAYS` 1 -- * `_G._SCINTILLA.constants.ALPHA_NOALPHA` 256 -- * `_G._SCINTILLA.constants.ALPHA_OPAQUE` 255 -- * `_G._SCINTILLA.constants.ALPHA_TRANSPARENT` 0 @@ -223,4 +223,3 @@ -- * `_G._SCINTILLA.constants.SCN_URIDROPPED` 2015 -- * `_G._SCINTILLA.constants.SCN_INDICATORCLICK` 2023 -- * `_G._SCINTILLA.constants.SCN_MODIFYATTEMPTRO` 2004 --- * `_G._SCINTILLA.constants.SCLEX_LPEG` 999 diff --git a/core/.buffer.luadoc b/core/.buffer.luadoc index 0e310010..cbd3d89e 100644 --- a/core/.buffer.luadoc +++ b/core/.buffer.luadoc @@ -585,15 +585,15 @@ -- The modifier key used in combination with a mouse drag to create a -- rectangular selection. -- --- * `buffer.SCMOD_CTRL` +-- * `buffer.MOD_CTRL` -- The "Control" modifier key. --- * `buffer.SCMOD_ALT` +-- * `buffer.MOD_ALT` -- The "Alt" modifier key. --- * `buffer.SCMOD_SUPER` +-- * `buffer.MOD_SUPER` -- The "Super" modifier key, usually defined as the left "Windows" or -- "Command" key. -- --- The default value is `buffer.SCMOD_CTRL`. +-- The default value is `buffer.MOD_CTRL`. -- @field rgba_image_height (number) -- The height for the RGBA image to be defined using -- [`buffer:marker_define_rgba_image()`](#marker_define_rgba_image). @@ -624,15 +624,15 @@ -- The bit-mask of search flags used by -- [`buffer:search_in_target()`](#search_in_target). -- --- * `buffer.SCFIND_WHOLEWORD` +-- * `buffer.FIND_WHOLEWORD` -- Match text surrounded by non-word characters. --- * `buffer.SCFIND_MATCHCASE` +-- * `buffer.FIND_MATCHCASE` -- Match text case sensitively. --- * `buffer.SCFIND_WORDSTART` +-- * `buffer.FIND_WORDSTART` -- Match text only when the previous character is a non-word character. --- * `buffer.SCFIND_REGEXP` +-- * `buffer.FIND_REGEXP` -- Interpret the search string as a regular expression. --- * `buffer.SCFIND_POSIX` +-- * `buffer.FIND_POSIX` -- Interpret '(' and ')' as tags instead of "\\(" and "\\)" in a regular -- expression. -- @@ -821,25 +821,25 @@ -- @field view_ws (number) -- The whitespace character visibility mode. -- --- * `buffer.SCWS_INVISIBLE` +-- * `buffer.WS_INVISIBLE` -- Whitespace is invisible. --- * `buffer.SCWS_VISIBLEALWAYS` +-- * `buffer.WS_VISIBLEALWAYS` -- Display all whitespace as dots and arrows. --- * `buffer.SCWS_VISIBLEAFTERINDENT` +-- * `buffer.WS_VISIBLEAFTERINDENT` -- Display only non-indentation whitespace as dots and arrows. -- --- The default value is `buffer.SCWS_INVISIBLE`. +-- The default value is `buffer.WS_INVISIBLE`. -- @field virtual_space_options (number) -- The virtual space mode. -- --- * `buffer.SCVS_NONE` +-- * `buffer.VS_NONE` -- Disable virtual space. --- * `buffer.SCVS_RECTANGULARSELECTION` +-- * `buffer.VS_RECTANGULARSELECTION` -- Enable virtual space only for rectangular selections. --- * `buffer.SCVS_USERACCESSIBLE` +-- * `buffer.VS_USERACCESSIBLE` -- Enable virtual space. -- --- The default value is `buffer.SCVS_NONE`. +-- The default value is `buffer.VS_NONE`. -- @field whitespace_chars (string) -- The string set of characters recognized as whitespace characters. -- Set this only after setting [`buffer.word_chars`](#word_chars). diff --git a/core/events.lua b/core/events.lua index 3d9c1c56..5e830c79 100644 --- a/core/events.lua +++ b/core/events.lua @@ -85,11 +85,11 @@ local M = {} -- -- * _`position`_: The position double-clicked. -- * _`line`_: The line number double-clicked. --- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.SCMOD_CTRL`, --- `buffer.SCMOD_SHIFT`, `buffer.SCMOD_ALT`, and `buffer.SCMOD_META`. +-- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.MOD_CTRL`, +-- `buffer.MOD_SHIFT`, `buffer.MOD_ALT`, and `buffer.MOD_META`. -- Note: If you set `buffer.rectangular_selection_modifier` to --- `buffer.SCMOD_CTRL`, the "Control" modifier is reported as *both* --- "Control" and "Alt" due to a Scintilla limitation with GTK+. +-- `buffer.MOD_CTRL`, the "Control" modifier is reported as *both* "Control" +-- and "Alt" due to a Scintilla limitation with GTK+. -- @field DWELL_END (string) -- Emitted after a `DWELL_START` when the user moves the mouse, presses a key, -- etc. @@ -123,22 +123,22 @@ local M = {} -- Arguments: -- -- * _`position`_: The position clicked. --- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.SCMOD_CTRL`, --- `buffer.SCMOD_SHIFT`, `buffer.SCMOD_ALT`, and `buffer.SCMOD_META`. +-- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.MOD_CTRL`, +-- `buffer.MOD_SHIFT`, `buffer.MOD_ALT`, and `buffer.MOD_META`. -- Note: If you set `buffer.rectangular_selection_modifier` to --- `buffer.SCMOD_CTRL`, the "Control" modifier is reported as *both* --- "Control" and "Alt" due to a Scintilla limitation with GTK+. +-- `buffer.MOD_CTRL`, the "Control" modifier is reported as *both* "Control" +-- and "Alt" due to a Scintilla limitation with GTK+. -- @field HOTSPOT_DOUBLE_CLICK (string) -- Emitted when double-clicking on text that is in a style with the hotspot -- attribute set. -- Arguments: -- -- * _`position`_: The position double-clicked. --- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.SCMOD_CTRL`, --- `buffer.SCMOD_SHIFT`, `buffer.SCMOD_ALT`, and `buffer.SCMOD_META`. +-- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.MOD_CTRL`, +-- `buffer.MOD_SHIFT`, `buffer.MOD_ALT`, and `buffer.MOD_META`. -- Note: If you set `buffer.rectangular_selection_modifier` to --- `buffer.SCMOD_CTRL`, the "Control" modifier is reported as *both* --- "Control" and "Alt" due to a Scintilla limitation with GTK+. +-- `buffer.MOD_CTRL`, the "Control" modifier is reported as *both* "Control" +-- and "Alt" due to a Scintilla limitation with GTK+. -- @field HOTSPOT_RELEASE_CLICK (string) -- Emitted after releasing the mouse after clicking on text that was in a -- style with the hotspot attribute set. @@ -150,11 +150,11 @@ local M = {} -- Arguments: -- -- * _`position`_: The position of the clicked text. --- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.SCMOD_CTRL`, --- `buffer.SCMOD_SHIFT`, `buffer.SCMOD_ALT`, and `buffer.SCMOD_META`. +-- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.MOD_CTRL`, +-- `buffer.MOD_SHIFT`, `buffer.MOD_ALT`, and `buffer.MOD_META`. -- Note: If you set `buffer.rectangular_selection_modifier` to --- `buffer.SCMOD_CTRL`, the "Control" modifier is reported as *both* --- "Control" and "Alt" due to a Scintilla limitation with GTK+. +-- `buffer.MOD_CTRL`, the "Control" modifier is reported as *both* "Control" +-- and "Alt" due to a Scintilla limitation with GTK+. -- @field INDICATOR_RELEASE (string) -- Emitted when releasing the mouse after clicking on text that has an -- indicator present. @@ -180,11 +180,11 @@ local M = {} -- * _`margin`_: The margin number clicked. -- * _`position`_: The position of the start of the line whose margin was -- clicked. --- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.SCMOD_CTRL`, --- `buffer.SCMOD_SHIFT`, `buffer.SCMOD_ALT`, and `buffer.SCMOD_META`. +-- * _`modifiers`_: A bit-mask of any modifier keys used: `buffer.MOD_CTRL`, +-- `buffer.MOD_SHIFT`, `buffer.MOD_ALT`, and `buffer.MOD_META`. -- Note: If you set `buffer.rectangular_selection_modifier` to --- `buffer.SCMOD_CTRL`, the "Control" modifier is reported as *both* --- "Control" and "Alt" due to a Scintilla limitation with GTK+. +-- `buffer.MOD_CTRL`, the "Control" modifier is reported as *both* "Control" +-- and "Alt" due to a Scintilla limitation with GTK+. -- @field MENU_CLICKED (string) -- Emitted after selecting a menu item. -- Arguments: diff --git a/core/iface.lua b/core/iface.lua index 2af60a26..2624591f 100644 --- a/core/iface.lua +++ b/core/iface.lua @@ -13,7 +13,7 @@ module('_SCINTILLA')]] -- Map of Scintilla constant names to their numeric values. -- @class table -- @name constants -M.constants = {ANNOTATION_BOXED=2,ANNOTATION_HIDDEN=0,ANNOTATION_STANDARD=1,CARETSTYLE_BLOCK=2,CARETSTYLE_INVISIBLE=0,CARETSTYLE_LINE=1,CARET_EVEN=0x08,CARET_JUMPS=0x10,CARET_SLOP=0x01,CARET_STRICT=0x04,EDGE_BACKGROUND=2,EDGE_LINE=1,EDGE_NONE=0,INDIC_BOX=6,INDIC_COMPOSITIONTHICK=14,INDIC_CONTAINER=8,INDIC_DASH=9,INDIC_DIAGONAL=3,INDIC_DOTBOX=12,INDIC_DOTS=10,INDIC_HIDDEN=5,INDIC_MAX=31,INDIC_PLAIN=0,INDIC_ROUNDBOX=7,INDIC_SQUIGGLE=1,INDIC_SQUIGGLELOW=11,INDIC_SQUIGGLEPIXMAP=13,INDIC_STRAIGHTBOX=8,INDIC_STRIKE=4,INDIC_TT=2,MARKER_MAX=31,SCFIND_MATCHCASE=4,SCFIND_POSIX=0x00400000,SCFIND_REGEXP=0x00200000,SCFIND_WHOLEWORD=2,SCFIND_WORDSTART=0x00100000,SCMOD_ALT=4,SCMOD_CTRL=2,SCMOD_META=16,SCMOD_NORM=0,SCMOD_SHIFT=1,SCMOD_SUPER=8,SCVS_NONE=0,SCVS_RECTANGULARSELECTION=1,SCVS_USERACCESSIBLE=2,SCWS_INVISIBLE=0,SCWS_VISIBLEAFTERINDENT=2,SCWS_VISIBLEALWAYS=1,ALPHA_NOALPHA=256,ALPHA_OPAQUE=255,ALPHA_TRANSPARENT=0,AUTOMATICFOLD_CHANGE=0x0004,AUTOMATICFOLD_CLICK=0x0002,AUTOMATICFOLD_SHOW=0x0001,CARETSTICKY_OFF=0,CARETSTICKY_ON=1,CARETSTICKY_WHITESPACE=2,CASEINSENSITIVEBEHAVIOUR_IGNORECASE=1,CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=0,CASE_LOWER=2,CASE_MIXED=0,CASE_UPPER=1,CP_UTF8=65001,CURSORARROW=2,CURSORNORMAL=-1,CURSORREVERSEARROW=7,CURSORWAIT=4,EOL_CR=1,EOL_CRLF=0,EOL_LF=2,FOLDACTION_CONTRACT=0,FOLDACTION_EXPAND=1,FOLDACTION_TOGGLE=2,FOLDFLAG_LEVELNUMBERS=0x0040,FOLDFLAG_LINEAFTER_CONTRACTED=0x0010,FOLDFLAG_LINEAFTER_EXPANDED=0x0008,FOLDFLAG_LINEBEFORE_CONTRACTED=0x0004,FOLDFLAG_LINEBEFORE_EXPANDED=0x0002,FOLDLEVELBASE=0x400,FOLDLEVELHEADERFLAG=0x2000,FOLDLEVELNUMBERMASK=0x0FFF,FOLDLEVELWHITEFLAG=0x1000,IV_LOOKBOTH=3,IV_LOOKFORWARD=2,IV_NONE=0,IV_REAL=1,LASTSTEPINUNDOREDO=0x100,MARGINOPTION_NONE=0,MARGINOPTION_SUBLINESELECT=1,MARGIN_BACK=2,MARGIN_FORE=3,MARGIN_NUMBER=1,MARGIN_RTEXT=5,MARGIN_SYMBOL=0,MARGIN_TEXT=4,MARKNUM_FOLDER=30,MARKNUM_FOLDEREND=25,MARKNUM_FOLDERMIDTAIL=27,MARKNUM_FOLDEROPEN=31,MARKNUM_FOLDEROPENMID=26,MARKNUM_FOLDERSUB=29,MARKNUM_FOLDERTAIL=28,MARK_ARROW=2,MARK_ARROWDOWN=6,MARK_ARROWS=24,MARK_AVAILABLE=28,MARK_BACKGROUND=22,MARK_BOXMINUS=14,MARK_BOXMINUSCONNECTED=15,MARK_BOXPLUS=12,MARK_BOXPLUSCONNECTED=13,MARK_CHARACTER=10000,MARK_CIRCLE=0,MARK_CIRCLEMINUS=20,MARK_CIRCLEMINUSCONNECTED=21,MARK_CIRCLEPLUS=18,MARK_CIRCLEPLUSCONNECTED=19,MARK_DOTDOTDOT=23,MARK_EMPTY=5,MARK_FULLRECT=26,MARK_LCORNER=10,MARK_LCORNERCURVE=16,MARK_LEFTRECT=27,MARK_MINUS=7,MARK_PIXMAP=25,MARK_PLUS=8,MARK_RGBAIMAGE=30,MARK_ROUNDRECT=1,MARK_SHORTARROW=4,MARK_SMALLRECT=3,MARK_TCORNER=11,MARK_TCORNERCURVE=17,MARK_UNDERLINE=29,MARK_VLINE=9,MASK_FOLDERS=-33554432,MAX_MARGIN=4,MODEVENTMASKALL=0xFFFFF,MOD_BEFOREDELETE=0x800,MOD_BEFOREINSERT=0x400,MOD_CHANGEANNOTATION=0x20000,MOD_CHANGEFOLD=0x8,MOD_CHANGEINDICATOR=0x4000,MOD_CHANGELINESTATE=0x8000,MOD_CHANGEMARGIN=0x10000,MOD_CHANGEMARKER=0x200,MOD_CHANGESTYLE=0x4,MOD_CONTAINER=0x40000,MOD_DELETETEXT=0x2,MOD_INSERTTEXT=0x1,MOD_LEXERSTATE=0x80000,MULTILINEUNDOREDO=0x1000,MULTIPASTE_EACH=1,MULTIPASTE_ONCE=0,MULTISTEPUNDOREDO=0x80,ORDER_CUSTOM=2,ORDER_PERFORMSORT=1,ORDER_PRESORTED=0,PERFORMED_REDO=0x40,PERFORMED_UNDO=0x20,PERFORMED_USER=0x10,SEL_LINES=2,SEL_RECTANGLE=1,SEL_STREAM=0,SEL_THIN=3,STARTACTION=0x2000,TIME_FOREVER=10000000,UPDATE_CONTENT=0x1,UPDATE_H_SCROLL=0x8,UPDATE_SELECTION=0x2,UPDATE_V_SCROLL=0x4,WRAPINDENT_FIXED=0,WRAPINDENT_INDENT=2,WRAPINDENT_SAME=1,WRAPVISUALFLAGLOC_DEFAULT=0x0000,WRAPVISUALFLAGLOC_END_BY_TEXT=0x0001,WRAPVISUALFLAGLOC_START_BY_TEXT=0x0002,WRAPVISUALFLAG_END=0x0001,WRAPVISUALFLAG_MARGIN=0x0004,WRAPVISUALFLAG_NONE=0x0000,WRAPVISUALFLAG_START=0x0002,WRAP_CHAR=2,WRAP_NONE=0,WRAP_WORD=1,STYLE_BRACEBAD=35,STYLE_BRACELIGHT=34,STYLE_CALLTIP=38,STYLE_CONTROLCHAR=36,STYLE_DEFAULT=32,STYLE_INDENTGUIDE=37,STYLE_LASTPREDEFINED=39,STYLE_LINENUMBER=33,STYLE_MAX=255,VISIBLE_SLOP=0x01,VISIBLE_STRICT=0x04,SCN_DOUBLECLICK=2006,SCN_AUTOCCHARDELETED=2027,SCN_SAVEPOINTLEFT=2003,SCN_PAINTED=2013,SCN_HOTSPOTRELEASECLICK=2028,SCN_UPDATEUI=2007,SCN_STYLENEEDED=2000,SCN_AUTOCCANCELLED=2026,SCN_MACRORECORD=2009,SCN_INDICATORRELEASE=2024,SCN_MODIFIED=2008,SCN_SAVEPOINTREACHED=2002,SCN_HOTSPOTDOUBLECLICK=2020,SCN_NEEDSHOWN=2011,SCN_CALLTIPCLICK=2021,SCN_AUTOCSELECTION=2022,SCN_DWELLEND=2017,SCN_ZOOM=2018,SCN_CHARADDED=2001,SCN_HOTSPOTCLICK=2019,SCN_KEY=2005,SCN_DWELLSTART=2016,SCN_MARGINCLICK=2010,SCN_USERLISTSELECTION=2014,SCN_URIDROPPED=2015,SCN_INDICATORCLICK=2023,SCN_MODIFYATTEMPTRO=2004,SCLEX_LPEG=999} +M.constants = {ANNOTATION_BOXED=2,ANNOTATION_HIDDEN=0,ANNOTATION_STANDARD=1,CARETSTYLE_BLOCK=2,CARETSTYLE_INVISIBLE=0,CARETSTYLE_LINE=1,CARET_EVEN=0x08,CARET_JUMPS=0x10,CARET_SLOP=0x01,CARET_STRICT=0x04,EDGE_BACKGROUND=2,EDGE_LINE=1,EDGE_NONE=0,INDIC_BOX=6,INDIC_COMPOSITIONTHICK=14,INDIC_CONTAINER=8,INDIC_DASH=9,INDIC_DIAGONAL=3,INDIC_DOTBOX=12,INDIC_DOTS=10,INDIC_HIDDEN=5,INDIC_MAX=31,INDIC_PLAIN=0,INDIC_ROUNDBOX=7,INDIC_SQUIGGLE=1,INDIC_SQUIGGLELOW=11,INDIC_SQUIGGLEPIXMAP=13,INDIC_STRAIGHTBOX=8,INDIC_STRIKE=4,INDIC_TT=2,MARKER_MAX=31,FIND_MATCHCASE=4,FIND_POSIX=0x00400000,FIND_REGEXP=0x00200000,FIND_WHOLEWORD=2,FIND_WORDSTART=0x00100000,MOD_ALT=4,MOD_CTRL=2,MOD_META=16,MOD_NORM=0,MOD_SHIFT=1,MOD_SUPER=8,VS_NONE=0,VS_RECTANGULARSELECTION=1,VS_USERACCESSIBLE=2,WS_INVISIBLE=0,WS_VISIBLEAFTERINDENT=2,WS_VISIBLEALWAYS=1,ALPHA_NOALPHA=256,ALPHA_OPAQUE=255,ALPHA_TRANSPARENT=0,AUTOMATICFOLD_CHANGE=0x0004,AUTOMATICFOLD_CLICK=0x0002,AUTOMATICFOLD_SHOW=0x0001,CARETSTICKY_OFF=0,CARETSTICKY_ON=1,CARETSTICKY_WHITESPACE=2,CASEINSENSITIVEBEHAVIOUR_IGNORECASE=1,CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=0,CASE_LOWER=2,CASE_MIXED=0,CASE_UPPER=1,CP_UTF8=65001,CURSORARROW=2,CURSORNORMAL=-1,CURSORREVERSEARROW=7,CURSORWAIT=4,EOL_CR=1,EOL_CRLF=0,EOL_LF=2,FOLDACTION_CONTRACT=0,FOLDACTION_EXPAND=1,FOLDACTION_TOGGLE=2,FOLDFLAG_LEVELNUMBERS=0x0040,FOLDFLAG_LINEAFTER_CONTRACTED=0x0010,FOLDFLAG_LINEAFTER_EXPANDED=0x0008,FOLDFLAG_LINEBEFORE_CONTRACTED=0x0004,FOLDFLAG_LINEBEFORE_EXPANDED=0x0002,FOLDLEVELBASE=0x400,FOLDLEVELHEADERFLAG=0x2000,FOLDLEVELNUMBERMASK=0x0FFF,FOLDLEVELWHITEFLAG=0x1000,IV_LOOKBOTH=3,IV_LOOKFORWARD=2,IV_NONE=0,IV_REAL=1,LASTSTEPINUNDOREDO=0x100,MARGINOPTION_NONE=0,MARGINOPTION_SUBLINESELECT=1,MARGIN_BACK=2,MARGIN_FORE=3,MARGIN_NUMBER=1,MARGIN_RTEXT=5,MARGIN_SYMBOL=0,MARGIN_TEXT=4,MARKNUM_FOLDER=30,MARKNUM_FOLDEREND=25,MARKNUM_FOLDERMIDTAIL=27,MARKNUM_FOLDEROPEN=31,MARKNUM_FOLDEROPENMID=26,MARKNUM_FOLDERSUB=29,MARKNUM_FOLDERTAIL=28,MARK_ARROW=2,MARK_ARROWDOWN=6,MARK_ARROWS=24,MARK_AVAILABLE=28,MARK_BACKGROUND=22,MARK_BOXMINUS=14,MARK_BOXMINUSCONNECTED=15,MARK_BOXPLUS=12,MARK_BOXPLUSCONNECTED=13,MARK_CHARACTER=10000,MARK_CIRCLE=0,MARK_CIRCLEMINUS=20,MARK_CIRCLEMINUSCONNECTED=21,MARK_CIRCLEPLUS=18,MARK_CIRCLEPLUSCONNECTED=19,MARK_DOTDOTDOT=23,MARK_EMPTY=5,MARK_FULLRECT=26,MARK_LCORNER=10,MARK_LCORNERCURVE=16,MARK_LEFTRECT=27,MARK_MINUS=7,MARK_PIXMAP=25,MARK_PLUS=8,MARK_RGBAIMAGE=30,MARK_ROUNDRECT=1,MARK_SHORTARROW=4,MARK_SMALLRECT=3,MARK_TCORNER=11,MARK_TCORNERCURVE=17,MARK_UNDERLINE=29,MARK_VLINE=9,MASK_FOLDERS=-33554432,MAX_MARGIN=4,MODEVENTMASKALL=0xFFFFF,MOD_BEFOREDELETE=0x800,MOD_BEFOREINSERT=0x400,MOD_CHANGEANNOTATION=0x20000,MOD_CHANGEFOLD=0x8,MOD_CHANGEINDICATOR=0x4000,MOD_CHANGELINESTATE=0x8000,MOD_CHANGEMARGIN=0x10000,MOD_CHANGEMARKER=0x200,MOD_CHANGESTYLE=0x4,MOD_CONTAINER=0x40000,MOD_DELETETEXT=0x2,MOD_INSERTTEXT=0x1,MOD_LEXERSTATE=0x80000,MULTILINEUNDOREDO=0x1000,MULTIPASTE_EACH=1,MULTIPASTE_ONCE=0,MULTISTEPUNDOREDO=0x80,ORDER_CUSTOM=2,ORDER_PERFORMSORT=1,ORDER_PRESORTED=0,PERFORMED_REDO=0x40,PERFORMED_UNDO=0x20,PERFORMED_USER=0x10,SEL_LINES=2,SEL_RECTANGLE=1,SEL_STREAM=0,SEL_THIN=3,STARTACTION=0x2000,TIME_FOREVER=10000000,UPDATE_CONTENT=0x1,UPDATE_H_SCROLL=0x8,UPDATE_SELECTION=0x2,UPDATE_V_SCROLL=0x4,WRAPINDENT_FIXED=0,WRAPINDENT_INDENT=2,WRAPINDENT_SAME=1,WRAPVISUALFLAGLOC_DEFAULT=0x0000,WRAPVISUALFLAGLOC_END_BY_TEXT=0x0001,WRAPVISUALFLAGLOC_START_BY_TEXT=0x0002,WRAPVISUALFLAG_END=0x0001,WRAPVISUALFLAG_MARGIN=0x0004,WRAPVISUALFLAG_NONE=0x0000,WRAPVISUALFLAG_START=0x0002,WRAP_CHAR=2,WRAP_NONE=0,WRAP_WORD=1,STYLE_BRACEBAD=35,STYLE_BRACELIGHT=34,STYLE_CALLTIP=38,STYLE_CONTROLCHAR=36,STYLE_DEFAULT=32,STYLE_INDENTGUIDE=37,STYLE_LASTPREDEFINED=39,STYLE_LINENUMBER=33,STYLE_MAX=255,VISIBLE_SLOP=0x01,VISIBLE_STRICT=0x04,SCN_DOUBLECLICK=2006,SCN_AUTOCCHARDELETED=2027,SCN_SAVEPOINTLEFT=2003,SCN_PAINTED=2013,SCN_HOTSPOTRELEASECLICK=2028,SCN_UPDATEUI=2007,SCN_STYLENEEDED=2000,SCN_AUTOCCANCELLED=2026,SCN_MACRORECORD=2009,SCN_INDICATORRELEASE=2024,SCN_MODIFIED=2008,SCN_SAVEPOINTREACHED=2002,SCN_HOTSPOTDOUBLECLICK=2020,SCN_NEEDSHOWN=2011,SCN_CALLTIPCLICK=2021,SCN_AUTOCSELECTION=2022,SCN_DWELLEND=2017,SCN_ZOOM=2018,SCN_CHARADDED=2001,SCN_HOTSPOTCLICK=2019,SCN_KEY=2005,SCN_DWELLSTART=2016,SCN_MARGINCLICK=2010,SCN_USERLISTSELECTION=2014,SCN_URIDROPPED=2015,SCN_INDICATORCLICK=2023,SCN_MODIFYATTEMPTRO=2004} --- -- Map of Scintilla function names to tables containing their IDs, return types, diff --git a/core/ui.lua b/core/ui.lua index c007c4f9..8149b9d7 100644 --- a/core/ui.lua +++ b/core/ui.lua @@ -221,11 +221,10 @@ events_connect(events.VIEW_NEW, function() } local ctrl_shift_keys = {'L', 'T', 'U', 'Z'} for _, key in ipairs(ctrl_keys) do - buffer:clear_cmd_key(string.byte(key), buffer.SCMOD_CTRL) + buffer:clear_cmd_key(string.byte(key), buffer.MOD_CTRL) end for _, key in ipairs(ctrl_shift_keys) do - buffer:clear_cmd_key(string.byte(key), - buffer.SCMOD_CTRL + buffer.SCMOD_SHIFT) + buffer:clear_cmd_key(string.byte(key), buffer.MOD_CTRL + buffer.MOD_SHIFT) end -- Since BUFFER_NEW loads themes and settings on startup, only load them for -- subsequent views. diff --git a/doc/14_Appendix.md b/doc/14_Appendix.md index 666f2228..4ca025c0 100644 --- a/doc/14_Appendix.md +++ b/doc/14_Appendix.md @@ -181,6 +181,7 @@ MARK\_ERROR\_BACK |Removed |N/A<sup>c</sup> open |Changed |\_G.[io.snapopen()][]<sup>e</sup> **_SCINTILLA.constants** | | SC\_\* |Renamed |Removed "SC\_" prefix. +SC(FIND\|MOD\|VS\|WS) |Renamed |Removed "SC" prefix. **buffer** | | get\_style\_name(buffer, n) |Renamed |[style\_name][]\[n\] reload |Renamed |[io.reload\_file][] diff --git a/modules/textadept/adeptsense.lua b/modules/textadept/adeptsense.lua index be350c75..4987f0cf 100644 --- a/modules/textadept/adeptsense.lua +++ b/modules/textadept/adeptsense.lua @@ -827,7 +827,7 @@ function M.goto_ctag(sense, kind, title) if not tonumber(line) then -- /^ ... $/ buffer.target_start, buffer.target_end = 0, buffer.length - buffer.search_flags = buffer.SCFIND_REGEXP + buffer.search_flags = buffer.FIND_REGEXP if buffer:search_in_target(line:sub(2, -2)) >= 0 then buffer:goto_pos(buffer.target_start) end diff --git a/modules/textadept/editing.lua b/modules/textadept/editing.lua index 8f6d93a2..72a905e5 100644 --- a/modules/textadept/editing.lua +++ b/modules/textadept/editing.lua @@ -223,9 +223,9 @@ function M.autocomplete_word(words) end local patt = '^['..buffer.word_chars..']+' buffer.target_start, buffer.target_end = 0, buffer.length - buffer.search_flags = buffer.SCFIND_WORDSTART + buffer.search_flags = buffer.FIND_WORDSTART if not buffer.auto_c_ignore_case then - buffer.search_flags = buffer.search_flags + buffer.SCFIND_MATCHCASE + buffer.search_flags = buffer.search_flags + buffer.FIND_MATCHCASE end local match_pos = buffer:search_in_target(root) while match_pos ~= -1 do @@ -489,7 +489,7 @@ function M.highlight_word() end if s == e then return end local word = buffer:text_range(s, e) - buffer.search_flags = buffer.SCFIND_WHOLEWORD + buffer.SCFIND_MATCHCASE + buffer.search_flags = buffer.FIND_WHOLEWORD + buffer.FIND_MATCHCASE buffer.target_start, buffer.target_end = 0, buffer.length while buffer:search_in_target(word) > -1 do local len = buffer.target_end - buffer.target_start diff --git a/modules/textadept/find.lua b/modules/textadept/find.lua index b4be38b5..82b5f4c4 100644 --- a/modules/textadept/find.lua +++ b/modules/textadept/find.lua @@ -115,8 +115,8 @@ local function find_(text, next, flags, no_wrap, wrapped) if text == '' then return end if not flags then flags = 0 - if M.match_case then flags = flags + buffer.SCFIND_MATCHCASE end - if M.whole_word then flags = flags + buffer.SCFIND_WHOLEWORD end + if M.match_case then flags = flags + buffer.FIND_MATCHCASE end + if M.whole_word then flags = flags + buffer.FIND_WHOLEWORD end if M.lua then flags = flags + 8 end if M.in_files then flags = flags + 16 end end @@ -171,7 +171,7 @@ events.connect(events.FIND, find_) -- Finds and selects text incrementally in the current buffer from a starting -- position. --- Flags other than `SCFIND_MATCHCASE` are ignored. +-- Flags other than `FIND_MATCHCASE` are ignored. -- @param text The text to find. -- @param next Flag indicating whether or not the search direction is forward. -- @param anchor Flag indicating whether or not to search from the current @@ -181,7 +181,7 @@ local function find_incremental(text, next, anchor) M.incremental_start = buffer.current_pos + (next and 1 or -1) end buffer:goto_pos(M.incremental_start or 0) - find_(text, next, M.match_case and buffer.SCFIND_MATCHCASE or 0) + find_(text, next, M.match_case and buffer.FIND_MATCHCASE or 0) end --- @@ -356,11 +356,11 @@ function M.goto_file_found(line, next) if next then buffer:line_end() else buffer:home() end buffer:search_anchor() local f = buffer['search_'..(next and 'next' or 'prev')] - local pos = f(buffer, buffer.SCFIND_REGEXP, '^.+:[0-9]+:.+$') + local pos = f(buffer, buffer.FIND_REGEXP, '^.+:[0-9]+:.+$') if pos == -1 then buffer:goto_line(next and 0 or buffer.line_count) buffer:search_anchor() - pos = f(buffer, buffer.SCFIND_REGEXP, '^.+:[0-9]+:.+$') + pos = f(buffer, buffer.FIND_REGEXP, '^.+:[0-9]+:.+$') end if pos == -1 then if CURSES then view:goto_buffer(cur_buf) end return end line = buffer:line_from_position(pos) diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua index c140c095..d6353d1b 100644 --- a/modules/textadept/keys.lua +++ b/modules/textadept/keys.lua @@ -547,7 +547,7 @@ if not CURSES then {utils.toggle_property, 'indentation_guides'} keys[not OSX and 'caS' or 'cS'] = {utils.toggle_property, 'view_ws'} keys[not OSX and 'caV' or 'cV'] = - {utils.toggle_property, 'virtual_space_options', buffer.SCVS_USERACCESSIBLE} + {utils.toggle_property, 'virtual_space_options', buffer.VS_USERACCESSIBLE} end keys[not OSX and not CURSES and 'c=' or 'm='] = buffer.zoom_in keys[not OSX and not CURSES and 'c-' or 'm-'] = buffer.zoom_out diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua index fbb74499..2f984d8a 100644 --- a/modules/textadept/menu.lua +++ b/modules/textadept/menu.lua @@ -180,7 +180,7 @@ local menubar = { {_L['Toggle View White_space'], {utils.toggle_property, 'view_ws'}}, {_L['Toggle _Virtual Space'], {utils.toggle_property, 'virtual_space_options', - buffer.SCVS_USERACCESSIBLE}}, + buffer.VS_USERACCESSIBLE}}, SEPARATOR, {_L['Zoom _In'], buffer.zoom_in}, {_L['Zoom _Out'], buffer.zoom_out}, diff --git a/properties.lua b/properties.lua index 74946ac4..72f5a179 100644 --- a/properties.lua +++ b/properties.lua @@ -6,10 +6,10 @@ local buffer = buffer buffer.multiple_selection = true buffer.additional_selection_typing = true --buffer.multi_paste = buffer.MULTIPASTE_EACH ---buffer.virtual_space_options = buffer.SCVS_RECTANGULARSELECTION + --- buffer.SCVS_USERACCESSIBLE -buffer.rectangular_selection_modifier = (WIN32 or OSX) and buffer.SCMOD_ALT or - buffer.SCMOD_SUPER +--buffer.virtual_space_options = buffer.VS_RECTANGULARSELECTION + +-- buffer.VS_USERACCESSIBLE +buffer.rectangular_selection_modifier = (WIN32 or OSX) and buffer.MOD_ALT or + buffer.MOD_SUPER --buffer.additional_carets_blink = false --buffer.additional_carets_visible = false @@ -25,7 +25,7 @@ buffer:set_y_caret_policy(buffer.CARET_SLOP + buffer.CARET_STRICT + --buffer.end_at_last_line = false -- Whitespace ---buffer.view_ws = buffer.SCWS_VISIBLEALWAYS +--buffer.view_ws = buffer.WS_VISIBLEALWAYS --buffer.whitespace_size = --buffer.extra_ascent = --buffer.extra_descent = diff --git a/scripts/gen_iface.lua b/scripts/gen_iface.lua index 6fa49cc0..b1c71298 100755 --- a/scripts/gen_iface.lua +++ b/scripts/gen_iface.lua @@ -48,7 +48,7 @@ for item in iface:match('Constants%[%] = (%b{})'):sub(2, -2):gmatch('%b{}') do local skip = false for i = 1, #ignores do if name:find(ignores[i]) then skip = true break end end if not skip then - name = name:gsub('SC_', '') + name = name:gsub('^SC_', ''):gsub('^SC([^N]%u+)', '%1') if name == 'MASK_FOLDERS' then value = '-33554432' end constants[#constants + 1] = string_format('%s=%s', name, value) fielddoc[#fielddoc + 1] = string_format('-- * `%s.%s` %d', s, name, value) @@ -89,12 +89,6 @@ for event, value in pairs(events) do constants[#constants + 1] = string_format('%s=%d', event, value) fielddoc[#fielddoc + 1] = string_format('-- * `%s.%s` %d', s, event, value) end --- Lexers added to constants. -local lexers = { SCLEX_LPEG = 999 } -for lexer, value in pairs(lexers) do - constants[#constants + 1] = string_format('%s=%d', lexer, value) - fielddoc[#fielddoc + 1] = string_format('-- * `%s.%s` %d', s, lexer, value) -end -- Write constants. f:write [[ |