Suppport nvim -d and fix test

Author: lguarda

lua/common/arg_parse.lua

@@ -10,6 +10,7 @@ local parameters_map = {
     ["-o"] = "split",
     ["-O"] = "vsplit",
     ["-p"] = "tab",
+    ["-d"] = "diff",
 }
 
 local function detect_parameters(str)
@@ -66,7 +67,7 @@ local function parse_line_number(arg, state)
         state.files[index] = {}
     end
 
-    state.files[index].line = line
+    state.files[index].line = tonumber(line)
 
     return true
 end

lua/server/server_functions.lua

@@ -88,33 +88,41 @@ local open_methods_table = {
     vsplit = "vsplit",
     tab = "tabnew",
     argadd = "argadd",
+    diff = "diff",
 }
 
 local function unception_detect_open_method(options)
     local open_method = open_methods_table[options.multi_file_open_method]
     if open_method == nil then
         print("unception can't find multi_file_open_method fall back to tab")
         open_method = "tabnew"
+    elseif open_method == "diff" then
+        -- For now net's assume that the only way to view diff is via vsplit
+        open_method = "vsplit"
+        options.diff = true
     end
     return open_method
 end
 
-local function unception_open_file(open_method, file)
+local function unception_open_file(open_method, file, diff)
     if file.line then
         vim.cmd(("%s +%d %s"):format(open_method, file.line, file.path))
     else
         vim.cmd(("%s %s"):format(open_method, file.path))
     end
+    if diff then
+        vim.cmd.diffthis()
+    end
 end
 
 local function unception_open_file_other(file_args, options, open_method)
     if options.open_in_new_tab and open_method ~= "tabnew" then
         vim.cmd("tabnew")
-        unception_open_file("edit", file_args[1])
+        unception_open_file("edit", file_args[1], options.diff)
         table.remove(file_args, 1)
     end
     for _, file in ipairs(file_args) do
-        unception_open_file(open_method, file)
+        unception_open_file(open_method, file, options.diff)
     end
 end
 

test/test.lua test/unception_arg_parse_test.luatest/test.lua renamed to test/unception_arg_parse_test.lua

@@ -8,43 +8,44 @@ require "common.arg_parse"
 describe("unception nvim tests", function()
     describe("argument parser", function()
         local tests_list = {
-            -- { -- NYI
-            --     argv = { "file", "\\+32" },
-            --     output = { { file = "open" }, { file = "+32" } }
-            -- },
             {
                 argv = { "/usr/bin/nvim", "file", "+5", "-p" },
-                output = { { path = "file", line = "5" } },
-                option = { multi_file_open_method="tab" }
+                output = { file = 5 },
+                option = { multi_file_open_method = "tab" }
             },
             {
                 argv = { "/usr/bin/dontcare", "file", "file2", "+32" },
-                output = { { path = "file" }, { path = "file2", line = "32" } },
-                option = { }
+                output = { file2 = 32 },
+                option = {}
             },
             {
-                argv = { "/usr/bin/dontcare", "--ignored-option-long", "-i", "file", "file2", "+32" },
-                output = { { path = "file" }, { path = "file2", line = "32" } },
-                option = { }
+                argv = { "/usr/bin/dontcare", "--ignored-option-long", "-i", "file2", "+32" },
+                output = { file2 = 32 },
+                option = {}
             },
             -- { -- NYI
             --     argv = { "/usr/bin/dontcare", "\\- file starting with dash" },
             --     output = { { file = "- file starting with dash" } }
             -- },
             {
-                argv = { "/usr/bin/dontcare", "--", "- file starting with dash" },
-                output = { { path = "- file starting with dash" } },
-                option = { }
+                argv = { "/usr/bin/dontcare", "+15", "--", "- file starting with dash" },
+                output = { ["- file starting with dash"] = 15 },
+                option = {}
             },
             {
                 argv = { "/usr/bin/nvim", "file", "+5", "-o" },
-                output = { { path = "file", line = "5" } },
-                option = { multi_file_open_method="split" }
+                output = { file = 5 },
+                option = { multi_file_open_method = "split" }
             },
             {
                 argv = { "/usr/bin/nvim", "file", "+5", "-O" },
-                output = { { path = "file", line = "5" } },
-                option = { multi_file_open_method="vsplit" }
+                output = { file = 5 },
+                option = { multi_file_open_method = "vsplit" }
+            },
+            {
+                argv = { "/usr/bin/nvim", "file", "file2", "+3", "-d" },
+                output = { file2 = 3 },
+                option = { multi_file_open_method = "diff" }
             },
         }
         for i, test in ipairs(tests_list) do
@@ -55,6 +56,5 @@ describe("unception nvim tests", function()
                 assert.are.same(options, test.option)
             end)
         end
-
     end)
 end)