feat(utils): use vim.filetype.match

Author: clason

lua/neoplen/path.lua

@@ -126,7 +126,7 @@ end
 
 -- TODO: Asyncify this and use vim.wait in the meantime.
 --  This will allow other events to happen while we're waiting!
-function Path:_read()
+function Path:read()
   self = check_self(self)
 
   local fd = assert(uv.fs_open(self:_fs_filename(), "r", 438)) -- for some reason test won't pass with absolute
@@ -184,13 +184,6 @@ function Path:_read_async(callback)
   end)
 end
 
-function Path:read(callback)
-  if callback then
-    return self:_read_async(callback)
-  end
-  return self:_read()
-end
-
 function Path:readlines()
   self = check_self(self)
 
@@ -200,41 +193,4 @@ function Path:readlines()
   return vim.split(data, "\n")
 end
 
-function Path:readbyterange(offset, length)
-  self = check_self(self)
-
-  local fd = uv.fs_open(self:_fs_filename(), "r", 438)
-  if not fd then
-    return
-  end
-  local stat = assert(uv.fs_fstat(fd))
-  if stat.type ~= "file" then
-    uv.fs_close(fd)
-    return nil
-  end
-
-  if offset < 0 then
-    offset = stat.size + offset
-    -- Windows fails if offset is < 0 even though offset is defined as signed
-    -- http://docs.libuv.org/en/v1.x/fs.html#c.uv_fs_read
-    if offset < 0 then
-      offset = 0
-    end
-  end
-
-  local data = ""
-  while #data < length do
-    local read_chunk = assert(uv.fs_read(fd, length - #data, offset))
-    if #read_chunk == 0 then
-      break
-    end
-    data = data .. read_chunk
-    offset = offset + #read_chunk
-  end
-
-  assert(uv.fs_close(fd))
-
-  return data
-end
-
 return Path

lua/telescope/previewers/utils.lua

@@ -5,57 +5,11 @@ local strings = require "neoplen.strings"
 local conf = require("telescope.config").values
 
 local Job = require "neoplen.job"
-local Path = require "neoplen.path"
 
 local utils = {}
 
-local detect_from_shebang = function(p)
-  local s = p:readbyterange(0, 256)
-  if s then
-    local lines = ts_utils.split_lines(s)
-    return vim.filetype.match { contents = lines }
-  end
-end
-
-local parse_modeline = function(tail)
-  if tail:find "vim:" then
-    return tail:match ".*:ft=([^: ]*):.*$" or ""
-  end
-end
-
-local detect_from_modeline = function(p)
-  local s = p:readbyterange(-256, 256)
-  if s then
-    local lines = ts_utils.split_lines(s)
-    local idx = lines[#lines] ~= "" and #lines or #lines - 1
-    if idx >= 1 then
-      return parse_modeline(lines[idx])
-    end
-  end
-end
-
 utils.filetype_detect = function(filepath)
-  if type(filepath) ~= string then
-    filepath = tostring(filepath)
-  end
-
-  local match = vim.filetype.match { filename = filepath }
-  if match and match ~= "" then
-    return match
-  end
-
-  local p = Path:new(filepath)
-  if p and p:is_file() then
-    match = detect_from_shebang(p)
-    if match and match ~= "" then
-      return match
-    end
-
-    match = detect_from_modeline(p)
-    if match and match ~= "" then
-      return match
-    end
-  end
+  return vim.filetype.match { filename = filepath }
 end
 
 -- API helper functions for buffer previewer