diff options
| -rw-r--r-- | core/file_io.lua | 52 | ||||
| -rw-r--r-- | core/keys.lua | 2 | ||||
| -rw-r--r-- | core/locale.conf | 10 | ||||
| -rw-r--r-- | core/locales/locale.ar.conf | 10 | ||||
| -rw-r--r-- | core/locales/locale.de.conf | 10 | ||||
| -rw-r--r-- | core/locales/locale.es.conf | 10 | ||||
| -rw-r--r-- | core/locales/locale.fr.conf | 10 | ||||
| -rw-r--r-- | core/locales/locale.it.conf | 10 | ||||
| -rw-r--r-- | core/locales/locale.pl.conf | 10 | ||||
| -rw-r--r-- | core/locales/locale.ru.conf | 10 | ||||
| -rw-r--r-- | core/locales/locale.sv.conf | 10 | ||||
| -rw-r--r-- | doc/manual.md | 11 | ||||
| -rw-r--r-- | modules/textadept/keys.lua | 20 | ||||
| -rw-r--r-- | modules/textadept/menu.lua | 12 |
14 files changed, 99 insertions, 88 deletions
diff --git a/core/file_io.lua b/core/file_io.lua index 9884cdf5..fdbcebd5 100644 --- a/core/file_io.lua +++ b/core/file_io.lua @@ -30,8 +30,8 @@ -- Arguments: -- -- * _`filename`_: The filename externally modified. --- @field SNAPOPEN_MAX (number) --- The maximum number of files listed in the snapopen dialog. +-- @field quick_open_max (number) +-- The maximum number of files listed in the quick open dialog. -- The default value is `1000`. module('io')]] @@ -42,7 +42,7 @@ events.FILE_BEFORE_SAVE = 'file_before_save' events.FILE_AFTER_SAVE = 'file_after_save' events.FILE_CHANGED = 'file_changed' -io.SNAPOPEN_MAX = 1000 +io.quick_open_max = 1000 --- -- List of recently opened files, the most recent being towards the top. @@ -378,11 +378,11 @@ function io.get_project_root(path) end --- --- Map of file paths to filters used by `io.snapopen()`. +-- Map of file paths to filters used by `io.quick_open()`. -- @class table --- @name snapopen_filters --- @see snapopen -io.snapopen_filters = {} +-- @name quick_open_filters +-- @see quick_open +io.quick_open_filters = {} --- -- Prompts the user to select files to be opened from *paths*, a string @@ -405,41 +405,41 @@ io.snapopen_filters = {} -- -- Any filter patterns starting with '!' exclude files and directories that do -- not match the pattern that follows. The number of files in the list is capped --- at `SNAPOPEN_MAX`. If *filter* is `nil` and *paths* is ultimately a string, --- the filter from the `io.snapopen_filters` table is used. In that case, unless --- explicitly specified, *exclude_FILTER* becomes `true`. +-- at `quick_open_max`. If *filter* is `nil` and *paths* is ultimately a string, +-- the filter from the `io.quick_open_filters` table is used. In that case, +-- unless explicitly specified, *exclude_FILTER* becomes `true`. -- *opts* is an optional table of additional options for -- `ui.dialogs.filteredlist()`. -- @param paths Optional string directory path or table of directory paths to -- search. The default value is the current project's root directory, if -- available. -- @param filter Optional filter for files and directories to exclude. The --- default value comes from `io.snapopen_filters` if *paths* is a string. +-- default value comes from `io.quick_open_filters` if *paths* is a string. -- @param exclude_FILTER Optional flag indicating whether or not to exclude the -- default filter `lfs.FILTER` in the search. If `false`, adds `lfs.FILTER` to -- *filter*. -- Normally, the default value is `false` to include the default filter. --- However, in the instances where *filter* comes from `io.snapopen_filters`, --- the default value is `true`. +-- However, in the instances where *filter* comes from +-- `io.quick_open_filters`, the default value is `true`. -- @param opts Optional table of additional options for -- `ui.dialogs.filteredlist()`. --- @usage io.snapopen(buffer.filename:match('^.+/')) -- list all files in the +-- @usage io.quick_open(buffer.filename:match('^.+/')) -- list all files in the -- current file's directory, subject to the default filter --- @usage io.snapopen('/project', '!%.lua$') -- list all Lua files in a project --- directory --- @usage io.snapopen('/project', {folders = {'build'}}) -- list all source +-- @usage io.quick_open('/project', '!%.lua$') -- list all Lua files in a +-- project directory +-- @usage io.quick_open('/project', {folders = {'build'}}) -- list all source -- files in a project directory --- @see io.snapopen_filters +-- @see io.quick_open_filters -- @see lfs.FILTER --- @see SNAPOPEN_MAX +-- @see quick_open_max -- @see ui.dialogs.filteredlist --- @name snapopen -function io.snapopen(paths, filter, exclude_FILTER, opts) +-- @name quick_open +function io.quick_open(paths, filter, exclude_FILTER, opts) if not paths then paths = io.get_project_root() end if not paths then return end if type(paths) == 'string' then if not filter then - filter = io.snapopen_filters[paths] + filter = io.quick_open_filters[paths] if filter and exclude_FILTER == nil then exclude_FILTER = filter ~= lfs.FILTER end @@ -449,15 +449,15 @@ function io.snapopen(paths, filter, exclude_FILTER, opts) local utf8_list = {} for i = 1, #paths do lfs.dir_foreach(paths[i], function(filename) - if #utf8_list >= io.SNAPOPEN_MAX then return false end + if #utf8_list >= io.quick_open_max then return false end filename = filename:gsub('^%.[/\\]', '') utf8_list[#utf8_list + 1] = filename:iconv('UTF-8', _CHARSET) end, filter, exclude_FILTER) end - if #utf8_list >= io.SNAPOPEN_MAX then - local msg = string.format('%d %s %d', io.SNAPOPEN_MAX, + if #utf8_list >= io.quick_open_max then + local msg = string.format('%d %s %d', io.quick_open_max, _L['files or more were found. Showing the first'], - io.SNAPOPEN_MAX) + io.quick_open_max) ui.dialogs.msgbox{ title = _L['File Limit Exceeded'], text = msg, icon = 'gtk-dialog-info' } diff --git a/core/keys.lua b/core/keys.lua index ce4a2cc0..ced1ff80 100644 --- a/core/keys.lua +++ b/core/keys.lua @@ -61,7 +61,7 @@ local M = {} -- keys['cn'] = buffer.new -- keys['cz'] = buffer.undo -- keys['a('] = {textadept.editing.enclose, '(', ')'} --- keys['cu'] = function() io.snapopen(_USERHOME) end +-- keys['cu'] = function() io.quick_open(_USERHOME) end -- -- Textadept handles [`buffer`]() references properly in static contexts. -- diff --git a/core/locale.conf b/core/locale.conf index 4a66df7a..75006a56 100644 --- a/core/locale.conf +++ b/core/locale.conf @@ -194,11 +194,11 @@ _Clear Bookmarks = _Clear Bookmarks _Next Bookmark = _Next Bookmark _Previous Bookmark = _Previous Bookmark _Goto Bookmark... = _Goto Bookmark... -Snap_open = Snap_open -Snapopen _User Home = Snapopen _User Home -Snapopen _Textadept Home = Snapopen _Textadept Home -Snapopen _Current Directory = Snapopen _Current Directory -Snapopen Current _Project = Snapopen Current _Project +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = _Snippets _Insert Snippet... = _Insert Snippet... _Expand Snippet/Next Placeholder = _Expand Snippet/Next Placeholder diff --git a/core/locales/locale.ar.conf b/core/locales/locale.ar.conf index a97bc0d0..5e23194f 100644 --- a/core/locales/locale.ar.conf +++ b/core/locales/locale.ar.conf @@ -195,11 +195,11 @@ _Clear Bookmarks = ا_مسح العلامات _Next Bookmark = العلامة ال_تالية _Previous Bookmark = العلامة ال_سابقة _Goto Bookmark... = ا_ذهب إلى العلامة .. -Snap_open = ا_فتح بإيجاز -Snapopen _User Home = افتح بإيجاز مجلد ال_مستخدم -Snapopen _Textadept Home = افتح بإيجاز مجلد ال_برنامج -Snapopen _Current Directory = افتح بإيجاز المجلد ال_حالي -Snapopen Current _Project = افتح بإيجاز الم_شروع الحالي +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = _قُصَاصات _Insert Snippet... = أ_دخِل القُصَاصة _Expand Snippet/Next Placeholder = _فعِّل القصاصة\الموضع التالي diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf index dbe42714..a8907684 100644 --- a/core/locales/locale.de.conf +++ b/core/locales/locale.de.conf @@ -184,11 +184,11 @@ _Clear Bookmarks = Lesezeichen löschen _Next Bookmark = Nächstes Lesezeichen _Previous Bookmark = Voriges Lesezeichen _Goto Bookmark... = Gehe zu Lesezeichen... -Snap_open = Snap_open -Snapopen _User Home = Snapopen _Userhome-Verzeichnis -Snapopen _Textadept Home = Snapopen _Textadept-Verzeichnis -Snapopen _Current Directory = Snapopen aktuelles Verzeichnis -Snapopen Current _Project = Snapopen aktuelles Projekt +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = _Snippets _Insert Snippet... = Snippet auswählen... _Expand Snippet/Next Placeholder = _Snippet einfügen/Nächster Platzhalter diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf index cc97c3db..77abddb5 100644 --- a/core/locales/locale.es.conf +++ b/core/locales/locale.es.conf @@ -195,11 +195,11 @@ _Clear Bookmarks = _Borrar marcadores _Next Bookmark = Marcador _siguiente _Previous Bookmark = Marcador _anterior _Goto Bookmark... = _Ir a marcador... -Snap_open = Snap_open -Snapopen _User Home = Snapopen en carpeta de _usuario -Snapopen _Textadept Home = Snapopen en carpeta de _Textadept -Snapopen _Current Directory = Snapopen en carpeta _actual -Snapopen Current _Project = +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = _Fragmentos de código _Insert Snippet... = _Insertar fragmento... _Expand Snippet/Next Placeholder = _Expandir fragmento/siguiente marcador diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf index 5938edef..8ff4c8c6 100644 --- a/core/locales/locale.fr.conf +++ b/core/locales/locale.fr.conf @@ -196,11 +196,11 @@ _Clear Bookmarks = _Supprimer les signets _Next Bookmark = Signet _suivant _Previous Bookmark = Signet _précédent _Goto Bookmark... = _Aller au signet... -Snap_open = Ouverture _rapide -Snapopen _User Home = Dossier _personnel -Snapopen _Textadept Home = Dossier de _Textadept -Snapopen _Current Directory = Dossier _courant -Snapopen Current _Project = _Projet courant +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = _Fragments _Insert Snippet... = _Insérer le fragment... _Expand Snippet/Next Placeholder = _Étendre le fragment/Espace réservé suivant diff --git a/core/locales/locale.it.conf b/core/locales/locale.it.conf index 781267c8..f6a4074d 100644 --- a/core/locales/locale.it.conf +++ b/core/locales/locale.it.conf @@ -195,11 +195,11 @@ _Clear Bookmarks = _Annulla i segnalibri _Next Bookmark = Segnalibro _seguente _Previous Bookmark = Segnalibro _precedente _Goto Bookmark... = _Vai al segnalibro... -Snap_open = Apertura _veloce -Snapopen _User Home = Cartella personale dell’_utente -Snapopen _Textadept Home = Cartella di _Textadept -Snapopen _Current Directory = Cartella _corrente -Snapopen Current _Project = _Progetto corrente +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = _Frammenti _Insert Snippet... = _Inserisci un frammento... _Expand Snippet/Next Placeholder = Espandi/Segnaposto _seguente diff --git a/core/locales/locale.pl.conf b/core/locales/locale.pl.conf index 089fe10f..e5250136 100644 --- a/core/locales/locale.pl.conf +++ b/core/locales/locale.pl.conf @@ -195,11 +195,11 @@ _Clear Bookmarks = _Wyczyść zakładki _Next Bookmark = _Następna zakładka _Previous Bookmark = _Poprzednia zakładka _Goto Bookmark... = Prz_ejdź do zakładki... -Snap_open = _Otwórz szybko -Snapopen _User Home = Z katalogu _użytkownika... -Snapopen _Textadept Home = Z katalogu _Textadepta... -Snapopen _Current Directory = Z _bieżącego katalogu... -Snapopen Current _Project = Z bieżącego _projektu... +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = Sk_rawek kodu _Insert Snippet... = _Wstaw... _Expand Snippet/Next Placeholder = Rozwiń / _Następne pole diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf index 5a045172..316c14ff 100644 --- a/core/locales/locale.ru.conf +++ b/core/locales/locale.ru.conf @@ -184,11 +184,11 @@ _Clear Bookmarks = _Очистить закладки _Next Bookmark = _Следующая закладка _Previous Bookmark = П_редыдущая закладка _Goto Bookmark... = П_ерейти к закладке... -Snap_open = _Быстрое открытие файлов -Snapopen _User Home = Быстрое открытие _домашнего каталога -Snapopen _Textadept Home = Быстрое открытие домашней страницы _Textadept -Snapopen _Current Directory = Быстрое открытие _текущего каталога -Snapopen Current _Project = Быстрое открытие текущего _проект +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = _Заготовки _Insert Snippet... = _Вставить загтовку... _Expand Snippet/Next Placeholder = _Развернуть заготовку/Следующая метка diff --git a/core/locales/locale.sv.conf b/core/locales/locale.sv.conf index 8c1ce00f..e8d35be4 100644 --- a/core/locales/locale.sv.conf +++ b/core/locales/locale.sv.conf @@ -196,11 +196,11 @@ _Clear Bookmarks = _Rensa bokmärken _Next Bookmark = _Nästa bokmärke _Previous Bookmark = _Föregående bokmärke _Goto Bookmark... = _Gå till bokmärke... -Snap_open = _Snabböppna -Snapopen _User Home = Snabböppna _användarkonfiguration... -Snapopen _Textadept Home = Snabböppna _systemkonfiguration... -Snapopen _Current Directory = Snabböppna _nuvarande katalog... -Snapopen Current _Project = Snabböppna nuvarande _projekt... +Quick _Open = Quick _Open +Quickly Open _User Home = Quickly Open _User Home +Quickly Open _Textadept Home = Quickly Open _Textadept Home +Quickly Open _Current Directory = Quickly Open _Current Directory +Quickly Open Current _Project = Quickly Open Current _Project _Snippets = Kodsn_uttar _Insert Snippet... = _Infoga kodsnutt... _Expand Snippet/Next Placeholder = Expandera kodsnutt/_Nästa fält diff --git a/doc/manual.md b/doc/manual.md index b66179dc..d10e9ac0 100644 --- a/doc/manual.md +++ b/doc/manual.md @@ -1847,6 +1847,17 @@ terminal's constraints: ## Migration Guides +### Textadept 8 to 9 + +#### API Changes + +Old API |Change |New API +----------------------------------|:------:|------- +**textadept.editing** | | +snapopen |Renamed |[quick\_open()][] +SNAPOPEN\_MAX |Renamed |[quick\_open\_max][] +snapopen\_filters |Renamed |[quick\_open\_filters][] + ### Textadept 7 to 8 Textadept 8 upgraded its internal copy of Lua from [5.2 to 5.3][]. Nearly all diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua index 17f45df1..79ed95ea 100644 --- a/modules/textadept/keys.lua +++ b/modules/textadept/keys.lua @@ -93,10 +93,10 @@ local M = {} -- F2 |F2 |F2 |Next bookmark -- Shift+F2 |⇧F2 |F3 |Previous bookmark -- Alt+F2 |⌥F2 |F4 |Goto bookmark... --- Ctrl+U |⌘U |^U |Snapopen `_USERHOME` --- None |None |None |Snapopen `_HOME` --- Ctrl+Alt+Shift+O|^⌘⇧O |M-S-O |Snapopen current directory --- Ctrl+Alt+Shift+P|^⌘⇧P |M-^P |Snapopen current project +-- Ctrl+U |⌘U |^U |Quickly open `_USERHOME` +-- None |None |None |Quickly open `_HOME` +-- Ctrl+Alt+Shift+O|^⌘⇧O |M-S-O |Quickly open current directory +-- Ctrl+Alt+Shift+P|^⌘⇧P |M-^P |Quickly open current project -- Ctrl+I |⌘I |M-S-I |Show style -- **Buffer** | | | -- Ctrl+Tab |^⇥ |M-N |Next buffer @@ -402,13 +402,13 @@ keys[not OSX and (GUI and 'csf2' or 'f6') or 'msf2'] = textadept.bookmarks.clear keys.f2 = m_bookmark[_L['_Next Bookmark']][2] keys[GUI and 'sf2' or 'f3'] = m_bookmark[_L['_Previous Bookmark']][2] keys[GUI and 'af2' or 'f4'] = textadept.bookmarks.goto_mark --- Snapopen. -local m_snapopen = m_tools[_L['Snap_open']] -keys[not OSX and 'cu' or 'mu'] = m_snapopen[_L['Snapopen _User Home']][2] --- TODO: m_snapopen[_L['Snapopen _Textadept Home']][2] +-- Quick Open. +local m_quick_open = m_tools[_L['Quick _Open']] +keys[not OSX and 'cu' or 'mu'] = m_quick_open[_L['Quickly Open _User Home']][2] +-- TODO: m_quick_open[_L['Quickly Open _Textadept Home']][2] keys[not OSX and (GUI and 'caO' or 'mO') - or 'cmO'] = m_snapopen[_L['Snapopen _Current Directory']][2] -keys[not OSX and (GUI and 'caP' or 'cmp') or 'cmP'] = io.snapopen + or 'cmO'] = m_quick_open[_L['Quickly Open _Current Directory']][2] +keys[not OSX and (GUI and 'caP' or 'cmp') or 'cmP'] = io.quick_open -- Snippets. keys[not OSX and (GUI and 'ck' or 'mk') or 'a\t'] = textadept.snippets._select keys['\t'] = textadept.snippets._insert diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua index 440df9af..7c6692f9 100644 --- a/modules/textadept/menu.lua +++ b/modules/textadept/menu.lua @@ -220,15 +220,15 @@ local default_menubar = { {_L['_Goto Bookmark...'], textadept.bookmarks.goto_mark}, }, { - title = _L['Snap_open'], - {_L['Snapopen _User Home'], function() io.snapopen(_USERHOME) end}, - {_L['Snapopen _Textadept Home'], function() io.snapopen(_HOME) end}, - {_L['Snapopen _Current Directory'], function() + title = _L['Quick _Open'], + {_L['Quickly Open _User Home'], function() io.quick_open(_USERHOME) end}, + {_L['Quickly Open _Textadept Home'], function() io.quick_open(_HOME) end}, + {_L['Quickly Open _Current Directory'], function() if buffer.filename then - io.snapopen(buffer.filename:match('^(.+)[/\\]')) + io.quick_open(buffer.filename:match('^(.+)[/\\]')) end end}, - {_L['Snapopen Current _Project'], io.snapopen}, + {_L['Quickly Open Current _Project'], io.quick_open}, }, { title = _L['_Snippets'], |