Skip to content

Commit 2c6d313

Browse files
authored
chore: lint complaint (#13)
1 parent 387bee5 commit 2c6d313

File tree

3 files changed

+25
-28
lines changed

3 files changed

+25
-28
lines changed

lua/marksman/init.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ local function notify(message, level)
6767
end
6868

6969
---Validate configuration against schema
70-
---@param user_config table User provided configuration
70+
---@param user_config table? User provided configuration
7171
---@param schema table Validation schema
7272
---@return table validated_config Validated configuration
7373
local function validate_config(user_config, schema)
@@ -103,7 +103,7 @@ local function validate_config(user_config, schema)
103103
end
104104

105105
---Lazy module loading with error handling
106-
---@return table storage Storage module
106+
---@return table? storage Storage module
107107
local function get_storage()
108108
if not storage then
109109
local ok, module = pcall(require, "marksman.storage")
@@ -118,7 +118,7 @@ local function get_storage()
118118
end
119119

120120
---Lazy module loading with error handling
121-
---@return table ui UI module
121+
---@return table? ui UI module
122122
local function get_ui()
123123
if not ui then
124124
local ok, module = pcall(require, "marksman.ui")
@@ -133,7 +133,7 @@ local function get_ui()
133133
end
134134

135135
---Lazy module loading with error handling
136-
---@return table utils Utils module
136+
---@return table? utils Utils module
137137
local function get_utils()
138138
if not utils then
139139
local ok, module = pcall(require, "marksman.utils")
@@ -162,8 +162,8 @@ local function debounced_save()
162162
end
163163

164164
---Add a mark at the current cursor position
165-
---@param name string|nil Optional mark name (auto-generated if nil)
166-
---@param description string|nil Optional mark description
165+
---@param name string? Optional mark name (auto-generated if nil)
166+
---@param description string? Optional mark description
167167
---@return table result Result with success, message, and mark_name
168168
function M.add_mark(name, description)
169169
local storage_module = get_storage()
@@ -365,7 +365,7 @@ function M.move_mark(name, direction)
365365
end
366366

367367
---Show marks in floating window
368-
---@param search_query string|nil Optional search query to filter marks
368+
---@param search_query string? Optional search query to filter marks
369369
function M.show_marks(search_query)
370370
local storage_module = get_storage()
371371
local ui_module = get_ui()
@@ -518,7 +518,7 @@ function M.cleanup()
518518
end
519519

520520
---Setup function to initialize the plugin
521-
---@param opts table|nil User configuration options
521+
---@param opts table? User configuration options
522522
function M.setup(opts)
523523
-- Validate and merge configuration
524524
local validated_opts = validate_config(opts, config_schema)

lua/marksman/ui.lua

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ end
9797
---Create header content for marks window
9898
---@param total_marks number Total number of marks
9999
---@param shown_marks number Number of marks shown
100-
---@param search_query string|nil Search query if any
100+
---@param search_query string? Search query if any
101101
---@return table lines Array of header lines
102102
---@return table highlights Array of highlight definitions
103103
local function create_header_content(total_marks, shown_marks, search_query)
@@ -137,6 +137,7 @@ end
137137
---@param name string Mark name
138138
---@param mark table Mark data
139139
---@param index number Mark index
140+
---@param line_idx number Line index for highlights
140141
---@return string line Formatted line
141142
---@return table highlights Array of highlight definitions for this line
142143
local function create_minimal_mark_line(name, mark, index, line_idx)
@@ -239,7 +240,7 @@ end
239240

240241
---Create complete marks window content
241242
---@param marks table All marks data
242-
---@param search_query string|nil Optional search query
243+
---@param search_query string? Optional search query
243244
---@return table lines Array of content lines
244245
---@return table highlights Array of highlight definitions
245246
---@return table mark_info Mapping of line numbers to mark info
@@ -331,7 +332,7 @@ end
331332

332333
---Find mark information for current cursor position
333334
---@param mark_info table Mapping of line numbers to mark info
334-
---@return table|nil mark_info Mark info for cursor position
335+
---@return table? mark_info Mark info for cursor position
335336
local function get_mark_under_cursor(mark_info)
336337
local line = vim.fn.line(".")
337338
local closest_mark = nil
@@ -353,7 +354,7 @@ end
353354
---@param marks table Marks data
354355
---@param project_name string Project name
355356
---@param mark_info table Mark info mapping
356-
---@param search_query string|nil Search query
357+
---@param search_query string? Search query
357358
local function setup_window_keymaps(buf, marks, project_name, mark_info, search_query)
358359
local function refresh_window(new_search)
359360
local storage = require("marksman.storage")
@@ -511,7 +512,7 @@ end
511512
-- Public API
512513

513514
---Setup the UI module
514-
---@param user_config table Plugin configuration
515+
---@param user_config table? Plugin configuration
515516
function M.setup(user_config)
516517
config = user_config or {}
517518
setup_highlights()
@@ -520,7 +521,7 @@ end
520521
---Show marks in floating window
521522
---@param marks table Marks data
522523
---@param project_name string Project name
523-
---@param search_query string|nil Optional search query
524+
---@param search_query string? Optional search query
524525
function M.show_marks_window(marks, project_name, search_query)
525526
-- Close existing window
526527
close_window()
@@ -540,9 +541,11 @@ function M.show_marks_window(marks, project_name, search_query)
540541

541542
local ok, err = pcall(function()
542543
vim.api.nvim_buf_set_lines(buf, 0, -1, false, lines)
543-
vim.bo[buf].modifiable = false
544-
vim.bo[buf].buftype = "nofile"
545-
vim.bo[buf].filetype = "marksman"
544+
-- Use vim.bo syntax instead of deprecated option setting
545+
local bufnr = buf
546+
vim.bo[bufnr].modifiable = false
547+
vim.bo[bufnr].buftype = "nofile"
548+
vim.bo[bufnr].filetype = "marksman"
546549
end)
547550

548551
if not ok then
@@ -587,8 +590,10 @@ function M.show_marks_window(marks, project_name, search_query)
587590
current_window = win
588591
current_buffer = buf
589592

590-
-- Set window highlight
591-
pcall(vim.api.nvim_win_set_option, win, "winhighlight", "Normal:Normal,FloatBorder:ProjectMarksBorder")
593+
-- Set window highlight using vim.wo syntax
594+
pcall(function()
595+
vim.wo[win].winhighlight = "Normal:Normal,FloatBorder:ProjectMarksBorder"
596+
end)
592597

593598
-- Setup keymaps
594599
setup_window_keymaps(buf, marks, project_name, mark_info, search_query)

tests/marksman_spec.lua

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1+
-- luacheck: globals describe it before_each after_each assert
12
local assert = require("luassert")
23

3-
-- Helper to create test files
4-
local function create_test_file(name, content)
5-
local test_dir = vim.env.MARKSMAN_TEST_DIR or vim.fn.tempname()
6-
local filepath = test_dir .. "/" .. name
7-
vim.fn.mkdir(vim.fn.fnamemodify(filepath, ":h"), "p")
8-
vim.fn.writefile(content or { "test content" }, filepath)
9-
return filepath
10-
end
11-
124
-- Helper to setup buffer with file
135
local function setup_buffer_with_file(filepath, content)
146
vim.fn.writefile(content or { "test content" }, filepath)

0 commit comments

Comments
 (0)