feat: remove FFI diff implementation

lewis6991 · Jan 3, 2023 · 8164179 · 8164179
1 parent 615f256
commit 8164179
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 313 deletions.
diff --git a/doc/gitsigns.txt b/doc/gitsigns.txt
@@ -660,9 +660,6 @@ diff_opts                                          *gitsigns-config-diff_opts*
             • "histogram"  histogram diff algorithm
         • internal: boolean
             Use Neovim's built in xdiff library for running diffs.
-
-            Note Neovim v0.5 uses LuaJIT's FFI interface, whereas v0.5+ uses
-            `vim.diff`.
         • indent_heuristic: boolean
             Use the indent heuristic for the internal
             diff library.

diff --git a/lua/gitsigns/config.lua b/lua/gitsigns/config.lua
diff --git a/lua/gitsigns/diff_int.lua b/lua/gitsigns/diff_int.lua
diff --git a/lua/gitsigns/diff_int/xdl_diff_ffi.lua b/lua/gitsigns/diff_int/xdl_diff_ffi.lua
diff --git a/teal/gitsigns/config.tl b/teal/gitsigns/config.tl
@@ -386,9 +386,6 @@ M.schema = {
         elseif o == 'internal' then
           if vim.diff then
             r.internal = true
-          elseif jit and jit.os ~= "Windows" then
-            -- Use FFI
-            r.internal = true
           end
         elseif o == 'horizontal' then
           r.vertical = false
@@ -414,9 +411,6 @@ M.schema = {
             • "histogram"  histogram diff algorithm
         • internal: boolean
             Use Neovim's built in xdiff library for running diffs.
-
-            Note Neovim v0.5 uses LuaJIT's FFI interface, whereas v0.5+ uses
-            `vim.diff`.
         • indent_heuristic: boolean
             Use the indent heuristic for the internal
             diff library.

diff --git a/teal/gitsigns/diff_int.tl b/teal/gitsigns/diff_int.tl
@@ -54,10 +54,6 @@ local run_diff_xdl_async = async.wrap(function(
   end):queue(a, b, algorithm, indent_heuristic, linematch)
 end, 6)
 
-if not vim.diff then
-  run_diff_xdl = require('gitsigns.diff_int.xdl_diff_ffi')
-end
-
 M.run_diff = async.void(function(
   fa: {string}, fb: {string},
   diff_algo: string, indent_heuristic: boolean,

diff --git a/teal/gitsigns/diff_int/xdl_diff_ffi.tl b/teal/gitsigns/diff_int/xdl_diff_ffi.tl