Skip to content

Commit c8b5177

Browse files
sindretssindrets
committed
chore: Reformat some code.
1 parent ff9ffee commit c8b5177

File tree

4 files changed

+41
-41
lines changed

4 files changed

+41
-41
lines changed

‎lua/diffview/lib.lua

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ local lazy = require("diffview.lazy")
22

33
local DiffView = lazy.access("diffview.scene.views.diff.diff_view", "DiffView") ---@type DiffView|LazyModule
44
local FileHistoryView = lazy.access("diffview.scene.views.file_history.file_history_view", "FileHistoryView") ---@type FileHistoryView|LazyModule
5-
local Rev = lazy.access("diffview.vcs.rev", "Rev") ---@type Rev|LazyModule
65
local StandardView = lazy.access("diffview.scene.views.standard.standard_view", "StandardView") ---@type StandardView|LazyModule
76
local arg_parser = lazy.require("diffview.arg_parser") ---@module "diffview.arg_parser"
87
local config = lazy.require("diffview.config") ---@module "diffview.config"
@@ -42,6 +41,8 @@ function M.diffview_open(args)
4241
return
4342
end
4443

44+
---@cast adapter -?
45+
4546
local opts = adapter:diffview_options(args)
4647

4748
if opts == nil then
@@ -92,6 +93,8 @@ function M.file_history(range, args)
9293
return
9394
end
9495

96+
---@cast adapter -?
97+
9598
rel_paths = vim.tbl_map(function(v)
9699
return v == "." and "." or pl:relative(v, ".")
97100
end, adapter.ctx.path_args)

‎lua/diffview/vcs/adapters/git/init.lua

+22-19
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
local oop = require('diffview.oop')
1+
local Commit = require("diffview.vcs.adapters.git.commit").GitCommit
22
local CountDownLatch = require("diffview.control").CountDownLatch
3-
local arg_parser = require('diffview.arg_parser')
4-
local logger = require('diffview.logger')
5-
local utils = require('diffview.utils')
6-
local async = require("plenary.async")
7-
local config = require('diffview.config')
8-
local lazy = require('diffview.lazy')
9-
local FileEntry = require("diffview.scene.file_entry").FileEntry
103
local Diff2Hor = require("diffview.scene.layouts.diff_2_hor").Diff2Hor
11-
local LogEntry = require("diffview.vcs.log_entry").LogEntry
12-
local RevType = require("diffview.vcs.rev").RevType
4+
local FileEntry = require("diffview.scene.file_entry").FileEntry
135
local GitRev = require("diffview.vcs.adapters.git.rev").GitRev
14-
local VCSAdapter = require('diffview.vcs.adapter').VCSAdapter
156
local Job = require("plenary.job")
16-
local JobStatus = require('diffview.vcs.utils').JobStatus
17-
local diffview = require('diffview')
18-
local Commit = require('diffview.vcs.adapters.git.commit').GitCommit
7+
local JobStatus = require("diffview.vcs.utils").JobStatus
8+
local LogEntry = require("diffview.vcs.log_entry").LogEntry
9+
local RevType = require("diffview.vcs.rev").RevType
10+
local VCSAdapter = require("diffview.vcs.adapter").VCSAdapter
11+
local arg_parser = require("diffview.arg_parser")
12+
local async = require("plenary.async")
13+
local config = require("diffview.config")
14+
local diffview = require("diffview")
15+
local lazy = require("diffview.lazy")
16+
local logger = require("diffview.logger")
17+
local oop = require("diffview.oop")
18+
local utils = require("diffview.utils")
1919

2020
---@type PathLib
2121
local pl = lazy.access(utils, "path")
2222

2323
local M = {}
2424

2525
---@class GitAdapter : VCSAdapter
26-
local GitAdapter = oop.create_class('GitAdapter', VCSAdapter)
26+
local GitAdapter = oop.create_class("GitAdapter", VCSAdapter)
2727

2828
GitAdapter.Rev = GitRev
2929

@@ -90,7 +90,11 @@ end
9090
---@param path string
9191
---@return string?
9292
local function get_toplevel(path)
93-
local out, code = utils.system_list(vim.tbl_flatten({config.get_config().git_cmd, {"rev-parse", "--path-format=absolute", "--show-toplevel"}, path}))
93+
local out, code = utils.system_list(vim.tbl_flatten({
94+
config.get_config().git_cmd,
95+
{ "rev-parse", "--path-format=absolute", "--show-toplevel" },
96+
path
97+
}))
9498
if code ~= 0 then
9599
return nil
96100
end
@@ -527,8 +531,7 @@ local incremental_line_trace_data = async.void(function(state, callback)
527531
utils.handle_job(trace_job, {
528532
debug_opt = {
529533
context = "GitAdapter>incremental_line_trace_data()",
530-
func = "s_debug",
531-
debug_level = 1,
534+
func = "s_info",
532535
no_stdout = true,
533536
}
534537
})
@@ -1012,7 +1015,7 @@ function GitAdapter:diffview_options(args)
10121015
local default_args = config.get_config().default_args.DiffviewOpen
10131016
local argo = arg_parser.parse(vim.tbl_flatten({ default_args, args }))
10141017
local rev_arg = argo.args[1]
1015-
1018+
10161019
local left, right = self:parse_revs(rev_arg, {
10171020
cached = argo:get_flag({ "cached", "staged" }),
10181021
imply_local = argo:get_flag("imply-local"),

‎lua/diffview/vcs/file.lua

+10-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
local lazy = require("diffview.lazy")
22
local oop = require("diffview.oop")
33

4-
---@module "plenary.async"
5-
local async = lazy.require("plenary.async")
6-
---@type Rev
7-
local Rev = lazy.access("diffview.vcs.rev", "Rev")
8-
---@type ERevType
9-
local RevType = lazy.access("diffview.vcs.rev", "RevType")
10-
---@module "diffview.config"
11-
local config = lazy.require("diffview.config")
12-
---@module "diffview.vcs.utils"
13-
local vcs = lazy.require("diffview.vcs.utils")
14-
---@module "diffview.utils"
15-
local utils = lazy.require("diffview.utils")
16-
17-
---@type PathLib
18-
local pl = lazy.access(utils, "path")
4+
local Rev = lazy.access("diffview.vcs.rev", "Rev") ---@type Rev|LazyModule
5+
local RevType = lazy.access("diffview.vcs.rev", "RevType") ---@type ERevType|LazyModule
6+
local async = lazy.require("plenary.async") ---@module "plenary.async"
7+
local config = lazy.require("diffview.config") ---@module "diffview.config"
8+
local utils = lazy.require("diffview.utils") ---@module "diffview.utils"
9+
local vcs = lazy.require("diffview.vcs.utils") ---@module "diffview.vcs.utils"
10+
11+
local pl = lazy.access(utils, "path") ---@type PathLib|LazyModule
1912

2013
local api = vim.api
2114
local M = {}
@@ -387,10 +380,11 @@ end
387380

388381
---@type vcs.File
389382
File.NULL_FILE = File({
383+
-- NOTE: consider changing this adapter to be an actual adapter instance
390384
adapter = {
391385
ctx = {
392386
toplevel = "diffview://",
393-
}
387+
},
394388
},
395389
path = "null",
396390
kind = "working",

‎lua/diffview/vcs/utils.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
local CountDownLatch = require("diffview.control").CountDownLatch
2-
local utils = require("diffview.utils")
3-
local async = require("plenary.async")
4-
local logger = require("diffview.logger")
52
local FileDict = require("diffview.vcs.file_dict").FileDict
63
local FileEntry = require("diffview.scene.file_entry").FileEntry
7-
local RevType = require("diffview.vcs.rev").RevType
84
local Job = require("plenary.job")
9-
local Semaphore = require('diffview.control').Semaphore
5+
local RevType = require("diffview.vcs.rev").RevType
6+
local Semaphore = require("diffview.control").Semaphore
7+
local async = require("plenary.async")
8+
local logger = require("diffview.logger")
9+
local utils = require("diffview.utils")
1010

1111
local api = vim.api
1212

0 commit comments

Comments
 (0)