Merge pull request #71 from barrettruth/fix/filetype-from-file-content

fix(parser): detect filetype from file content (shebang/modeline)

lua/diffs/parser.lua

@@ -13,12 +13,33 @@ local M = {}
 
 local dbg = require('diffs.log').dbg
 
+---@param filepath string
+---@param n integer
+---@return string[]?
+local function read_first_lines(filepath, n)
+  local f = io.open(filepath, 'r')
+  if not f then
+    return nil
+  end
+  local lines = {}
+  for _ = 1, n do
+    local line = f:read('*l')
+    if not line then
+      break
+    end
+    table.insert(lines, line)
+  end
+  f:close()
+  return #lines > 0 and lines or nil
+end
+
 ---@param filename string
 ---@param repo_root string?
 ---@return string?
 local function get_ft_from_filename(filename, repo_root)
   if repo_root then
     local full_path = vim.fs.joinpath(repo_root, filename)
+
     local buf = vim.fn.bufnr(full_path)
     if buf ~= -1 then
       local ft = vim.api.nvim_get_option_value('filetype', { buf = buf })
@@ -30,10 +51,25 @@ local function get_ft_from_filename(filename, repo_root)
   end
 
   local ft = vim.filetype.match({ filename = filename })
-  if not ft then
-    dbg('no filetype for: %s', filename)
+  if ft then
+    dbg('filetype from filename: %s', ft)
+    return ft
   end
-  return ft
+
+  if repo_root then
+    local full_path = vim.fs.joinpath(repo_root, filename)
+    local contents = read_first_lines(full_path, 10)
+    if contents then
+      ft = vim.filetype.match({ filename = filename, contents = contents })
+      if ft then
+        dbg('filetype from file content: %s', ft)
+        return ft
+      end
+    end
+  end
+
+  dbg('no filetype for: %s', filename)
+  return nil
 end
 
 ---@param ft string

spec/helpers.lua

@@ -2,6 +2,8 @@ local plugin_dir = vim.fn.getcwd()
 vim.opt.runtimepath:prepend(plugin_dir)
 vim.opt.packpath = {}
 
+vim.cmd('filetype on')
+
 local function ensure_parser(lang)
   local ok = pcall(vim.treesitter.language.inspect, lang)
   if not ok then

spec/parser_spec.lua

@@ -359,5 +359,67 @@ describe('parser', function()
       delete_buffer(file_buf)
       delete_buffer(diff_buf)
     end)
+
+    it('detects filetype from file content shebang without open buffer', function()
+      local repo_root = '/tmp/diffs-test-shebang'
+      vim.fn.mkdir(repo_root, 'p')
+
+      local file_path = repo_root .. '/build'
+      local f = io.open(file_path, 'w')
+      f:write('#!/bin/bash\n')
+      f:write('set -e\n')
+      f:write('echo "hello"\n')
+      f:close()
+
+      local diff_buf = create_buffer({
+        'M build',
+        '@@ -1,2 +1,3 @@',
+        ' #!/bin/bash',
+        '+set -e',
+        ' echo "hello"',
+      })
+      vim.api.nvim_buf_set_var(diff_buf, 'diffs_repo_root', repo_root)
+
+      local hunks = parser.parse_buffer(diff_buf)
+
+      assert.are.equal(1, #hunks)
+      assert.are.equal('build', hunks[1].filename)
+      assert.are.equal('sh', hunks[1].ft)
+
+      delete_buffer(diff_buf)
+      os.remove(file_path)
+      vim.fn.delete(repo_root, 'rf')
+    end)
+
+    it('detects python from shebang without open buffer', function()
+      local repo_root = '/tmp/diffs-test-shebang-py'
+      vim.fn.mkdir(repo_root, 'p')
+
+      local file_path = repo_root .. '/deploy'
+      local f = io.open(file_path, 'w')
+      f:write('#!/usr/bin/env python3\n')
+      f:write('import sys\n')
+      f:write('print("hi")\n')
+      f:close()
+
+      local diff_buf = create_buffer({
+        'M deploy',
+        '@@ -1,2 +1,3 @@',
+        ' #!/usr/bin/env python3',
+        '+import sys',
+        ' print("hi")',
+      })
+      vim.api.nvim_buf_set_var(diff_buf, 'diffs_repo_root', repo_root)
+
+      local hunks = parser.parse_buffer(diff_buf)
+
+      assert.are.equal(1, #hunks)
+      assert.are.equal('deploy', hunks[1].filename)
+      assert.are.equal('python', hunks[1].ft)
+
+      delete_buffer(diff_buf)
+      os.remove(file_path)
+      vim.fn.delete(repo_root, 'rf')
+    end)
   end)
 end)