Added lfs.dir_foreach() for allowing Find in Files to have a filter.

Also moved snapopen module into core as io.snapopen().

5 files changed, 45 insertions, 196 deletions

diff --git a/modules/textadept/find.lua b/modules/textadept/find.lua
index 0d316105..411b59c5 100644
--- a/modules/textadept/find.lua
+++ b/modules/textadept/find.lua
@@ -80,6 +80,22 @@ local MARK_FIND = _SCINTILLA.next_marker_number()
 local MARK_FIND_COLOR = 0x4D9999
 local preferred_view
 
+---
+-- Table of Lua patterns matching files and folders to exclude when finding in
+-- files.
+-- Each filter string is a pattern that matches filenames to exclude, with
+-- patterns matching folders to exclude listed in a `folders` sub-table.
+-- Patterns starting with '!' exclude files and folders that do not match the
+-- pattern that follows. Use a table of raw file extensions assigned to an
+-- `extensions` key for fast filtering by extension. All strings must be encoded
+-- in `_G._CHARSET`, not UTF-8.
+-- The default value is `lfs.FILTER`, a filter for common binary file extensions
+-- and version control folders.
+-- @see find_in_files
+-- @class table
+-- @name FILTER
+find.FILTER = lfs.FILTER
+
 -- Text escape sequences with their associated characters.
 -- @class table
 -- @name escapes
@@ -92,9 +108,11 @@ local escapes = {
 -- Searches the *utf8_dir* or user-specified directory for files that match
 -- search text and options and prints the results to a buffer.
 -- Use the `find_text`, `match_case`, `whole_word`, and `lua` fields to set the
--- search text and option flags, respectively.
--- @param utf8_dir Optional UTF-8-encoded directory name to search. If `nil`,
+-- search text and option flags, respectively. Use `FILTER` to set the search
+-- filter.
+-- @param utf8_dir Optional UTF-8-encoded directory path to search. If `nil`,
 --   the user is prompted for one.
+-- @see FILTER
 -- @name find_in_files
 function find.find_in_files(utf8_dir)
   if not utf8_dir then
@@ -105,46 +123,28 @@ function find.find_in_files(utf8_dir)
                           (buffer.filename or ''):match('^.+[/\\]') or '',
                           '--no-newline')
   end
-  if #utf8_dir > 0 then
-    local text = find.find_entry_text
-    if not find.lua then text = text:gsub('([().*+?^$%%[%]-])', '%%%1') end
-    if not find.match_case then text = text:lower() end
-    if find.whole_word then text = '%f[%w_]'..text..'%f[^%w_]' end
-    local match_case, whole_word = find.match_case, find.whole_word
-    local matches = {'Find: '..text}
-    function search_file(file)
-      local line_num = 1
-      for line in io.lines(file) do
-        local optimized_line = line
-        if not match_case then optimized_line = line:lower() end
-        if optimized_line:find(text) then
-          file = file:iconv('UTF-8', _CHARSET)
-          matches[#matches + 1] = ('%s:%s:%s'):format(file, line_num, line)
-        end
-        line_num = line_num + 1
+  if utf8_dir == '' then return end
+
+  local text = find.find_entry_text
+  if not find.lua then text = text:gsub('([().*+?^$%%[%]-])', '%%%1') end
+  if not find.match_case then text = text:lower() end
+  if find.whole_word then text = '%f[%w_]'..text..'%f[^%w_]' end
+  local matches = {_L['Find:']..' '..text}
+  lfs.dir_foreach(utf8_dir, function(file)
+    local match_case = find.match_case
+    local line_num = 1
+    for line in io.lines(file) do
+      if (match_case and line or line:lower()):find(text) then
+        file = file:iconv('UTF-8', _CHARSET)
+        matches[#matches + 1] = ('%s:%s:%s'):format(file, line_num, line)
       end
+      line_num = line_num + 1
     end
-    local lfs_dir, lfs_attributes = lfs.dir, lfs.attributes
-    function search_dir(directory)
-      for file in lfs_dir(directory) do
-        if not file:find('^%.%.?$') then -- ignore . and ..
-          local path = directory..(not WIN32 and '/' or '\\')..file
-          local type = lfs_attributes(path, 'mode')
-          if type == 'directory' then
-            search_dir(path)
-          elseif type == 'file' then
-            search_file(path)
-          end
-        end
-      end
-    end
-    local dir = utf8_dir:iconv(_CHARSET, 'UTF-8')
-    search_dir(dir)
-    if #matches == 1 then matches[2] = _L['No results found'] end
-    matches[#matches + 1] = ''
-    if buffer._type ~= _L['[Files Found Buffer]'] then preferred_view = view end
-    gui._print(_L['[Files Found Buffer]'], table.concat(matches, '\n'))
-  end
+  end, find.FILTER, true)
+  if #matches == 1 then matches[2] = _L['No results found'] end
+  matches[#matches + 1] = ''
+  if buffer._type ~= _L['[Files Found Buffer]'] then preferred_view = view end
+  gui._print(_L['[Files Found Buffer]'], table.concat(matches, '\n'))
 end
 
 local c = _SCINTILLA.constants
diff --git a/modules/textadept/init.lua b/modules/textadept/init.lua
index 838c0c42..951c27b4 100644
--- a/modules/textadept/init.lua
+++ b/modules/textadept/init.lua
@@ -18,7 +18,6 @@ M.filter_through = require 'textadept.filter_through'
 M.mime_types = require 'textadept.mime_types'
 M.run = require 'textadept.run'
 M.session = require 'textadept.session'
-M.snapopen = require 'textadept.snapopen'
 M.snippets = require 'textadept.snippets'
 
 -- These need to be loaded last.
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 2951c2b3..a11f09b4 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -224,9 +224,7 @@ M.utils = {
   end,
   select_command = function() _M.textadept.menu.select_command() end,
   snapopen_filedir = function()
-    if buffer.filename then
-      _M.textadept.snapopen.open(buffer.filename:match('^(.+)[/\\]'))
-    end
+    if buffer.filename then io.snapopen(buffer.filename:match('^(.+)[/\\]')) end
   end,
   show_style = function()
     local buffer = buffer
@@ -494,8 +492,8 @@ keys.f2 = m_bookmarks.goto_next
 keys[not NCURSES and 'sf2' or 'f3'] = m_bookmarks.goto_prev
 keys[not NCURSES and 'af2' or 'f4'] = m_bookmarks.goto_bookmark
 -- Snapopen.
-keys[not OSX and 'cu' or 'mu'] = {m_textadept.snapopen.open, _USERHOME}
--- TODO: {m_textadept.snapopen.open, _HOME}
+keys[not OSX and 'cu' or 'mu'] = {io.snapopen, _USERHOME}
+-- TODO: {io.snapopen, _HOME}
 keys[not OSX and (not NCURSES and 'caO' or 'mO')
              or 'cmO'] = utils.snapopen_filedir
 if not NCURSES then keys[not OSX and 'ci' or 'mi'] = utils.show_style end
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 6cc6d447..b1ffd0c2 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -138,8 +138,8 @@ M.menubar = {
       {_L['_Goto Bookmark...'], m_bookmarks.goto_bookmark},
     },
     { title = _L['Snap_open'],
-      {_L['Snapopen _User Home'], {m_textadept.snapopen.open, _USERHOME}},
-      {_L['Snapopen _Textadept Home'], {m_textadept.snapopen.open, _HOME}},
+      {_L['Snapopen _User Home'], {io.snapopen, _USERHOME}},
+      {_L['Snapopen _Textadept Home'], {io.snapopen, _HOME}},
       {_L['Snapopen _Current Directory'], utils.snapopen_filedir},
     },
     { title = _L['_Snippets'],
diff --git a/modules/textadept/snapopen.lua b/modules/textadept/snapopen.lua
deleted file mode 100644
index 04e60002..00000000
--- a/modules/textadept/snapopen.lua
+++ /dev/null
@@ -1,148 +0,0 @@
--- Copyright 2007-2013 Mitchell mitchell.att.foicica.com. See LICENSE.
-
-local M = {}
-
---[[ This comment is for LuaDoc.
----
--- Quickly open files in a set of directories using a filtered list dialog.
--- @field DEFAULT_DEPTH (number)
---   The maximum directory depth to search.
---   The default value is `99`.
--- @field MAX (number)
---   The maximum number of files to list.
---   The default value is `1000`.
-module('_M.textadept.snapopen')]]
-
----
--- The default filter table containing common binary file extensions and version
--- control folders to exclude from snapopen file lists.
--- @class table
--- @name FILTER
-M.FILTER = {
-  extensions = {
-    'a', 'bmp', 'bz2', 'class', 'dll', 'exe', 'gif', 'gz', 'jar', 'jpeg', 'jpg',
-    'o', 'png', 'so', 'tar', 'tgz', 'tif', 'tiff', 'zip'
-  },
-  folders = {'%.bzr$', '%.git$', '%.hg$', '%.svn$', 'CVS$'}
-}
-M.DEFAULT_DEPTH = 99
-M.MAX = 1000
-
-local lfs_dir, lfs_attributes = lfs.dir, lfs.attributes
-local DEPTH = M.DEFAULT_DEPTH
-
--- Determines whether or not the given file matches the given filter.
--- @param file The filename.
--- @param filter The filter table.
--- @return boolean `true` or `false`.
-local function exclude(file, filter)
-  if not filter then return false end
-  local string_match, string_sub = string.match, string.sub
-  local utf8_file = file:iconv('UTF-8', _CHARSET)
-  local ext = filter.extensions
-  if ext and ext[utf8_file:match('[^%.]+$')] then return true end
-  for i = 1, #filter do
-    local patt = filter[i]
-    if string_sub(patt, 1, 1) ~= '!' then
-      if string_match(utf8_file, patt) then return true end
-    else
-      if not string_match(utf8_file, string_sub(patt, 2)) then return true end
-    end
-  end
-  return false
-end
-
--- Adds a directory's contents to a list of files.
--- @param utf8_dir The UTF-8 directory to open.
--- @param list The list of files to add dir's contents to.
--- @param depth The current depth of nested folders.
--- @param filter The filter table.
-local function add_directory(utf8_dir, list, depth, filter)
-  local string_match, string_gsub, MAX = string.match, string.gsub, M.MAX
-  local dir = utf8_dir:iconv(_CHARSET, 'UTF-8')
-  for file in lfs_dir(dir) do
-    if not string_match(file, '^%.%.?$') then
-      file = dir..(not WIN32 and '/' or '\\')..file
-      if lfs_attributes(file, 'mode') == 'directory' then
-        if not exclude(file, filter.folders) and depth < DEPTH then
-          add_directory(file, list, depth + 1, filter)
-        end
-      elseif not exclude(file, filter) then
-        if #list >= MAX then return end
-        list[#list + 1] = string_gsub(file, '^%.[/\\]', '')
-      end
-    end
-  end
-end
-
----
--- Quickly open files from the set of directories *utf8_paths* using a filtered
--- list dialog.
--- Files shown in the dialog do not match any pattern in string or table
--- *filter*, and, unless *exclude_FILTER* is `true`, `FILTER` as well. A filter
--- table contains Lua patterns that match filenames to exclude. Patterns
--- starting with '!' exclude files that do not match the pattern that follows.
--- The filter may also contain an `extensions` key whose value is a table of
--- file extensions to exclude. Additionally, it may contain a `folders` key
--- whose value is a table of folder names to exclude. Extensions and folder
--- names must be encoded in UTF-8. The number of files in the list is capped at
--- `MAX`.
--- @param utf8_paths A UTF-8 string directory path or table of UTF-8 directory
---   paths to search.
--- @param filter Optional filter for files and folders to exclude.
--- @param exclude_FILTER Optional flag indicating whether or not to exclude the
---   default filter `FILTER` in the search. If `false`, adds `FILTER` to
---   *filter*.
---   The default value is `false` to include the default filter.
--- @param depth Number of directories to recurse into for finding files.
---   The default value is `DEFAULT_DEPTH`.
--- @usage _M.textadept.snapopen.open(buffer.filename:match('^.+/')) -- list all
---   files in the current file's directory, subject to the default filter
--- @usage _M.textadept.snapopen.open('/project', '!%.lua$') -- list all Lua
---    files in a project directory
--- @usage _M.textadept.snapopen.open('/project', {folders = {'build'}}) -- list
---   all source files in a project directory
--- @see FILTER
--- @see DEFAULT_DEPTH
--- @see MAX
--- @name open
-function M.open(utf8_paths, filter, exclude_FILTER, depth)
-  -- Convert utf8_paths to a table from nil or string arguments.
-  if not utf8_paths then utf8_paths = {} end
-  if type(utf8_paths) == 'string' then utf8_paths = {utf8_paths} end
-  -- Convert filter to a table from nil or string arguments.
-  if not filter then filter = {} end
-  if type(filter) == 'string' then filter = {filter} end
-  -- Add FILTER to filter unless specified otherwise.
-  if not exclude_FILTER then
-    for k, v in pairs(M.FILTER) do
-      if not filter[k] then filter[k] = {} end
-      local filter_k = filter[k]
-      for i = 1, #v do filter_k[#filter_k + 1] = v[i] end
-    end
-  end
-  DEPTH = depth or M.DEFAULT_DEPTH
-
-  -- Create file extension filter hash table for quick lookups.
-  local ext = filter.extensions
-  if ext then for i = 1, #ext do ext[ext[i]] = true end end
-
-  -- Create the file list, prompt the user to choose a file, then open the file.
-  local list = {}
-  for _, path in ipairs(utf8_paths) do add_directory(path, list, 1, filter) end
-  if #list >= M.MAX then
-    gui.dialog('ok-msgbox',
-               '--title', _L['File Limit Exceeded'],
-               '--text',
-               string.format('%d %s %d', M.MAX,
-                             _L['files or more were found. Showing the first'],
-                             M.MAX),
-               '--button1', _L['_OK'])
-  end
-  local width = NCURSES and {'--width', gui.size[1] - 2} or ''
-  local utf8_filenames = gui.filteredlist(_L['Open'], _L['File'], list, false,
-                                          '--select-multiple', width) or ''
-  for filename in utf8_filenames:gmatch('[^\n]+') do io.open_file(filename) end
-end
-
-return M