Skip to content

Commit 67c23b3

Browse files
authored
Merge pull request #9 from oriori1703/feature/type-hints
Add type hints to plugin options where possible
2 parents f5f085f + 5962064 commit 67c23b3

File tree

8 files changed

+62
-10
lines changed

8 files changed

+62
-10
lines changed

init.lua

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,16 @@ require('lazy').setup({
273273
-- See `:help gitsigns` to understand what the configuration keys do
274274
{ -- Adds git related signs to the gutter, as well as utilities for managing changes
275275
'lewis6991/gitsigns.nvim',
276+
---@module 'gitsigns'
277+
---@type Gitsigns.Config
278+
---@diagnostic disable-next-line: missing-fields
276279
opts = {
277280
signs = {
278-
add = { text = '+' },
279-
change = { text = '~' },
280-
delete = { text = '_' },
281-
topdelete = { text = '' },
282-
changedelete = { text = '~' },
281+
add = { text = '+' }, ---@diagnostic disable-line: missing-fields
282+
change = { text = '~' }, ---@diagnostic disable-line: missing-fields
283+
delete = { text = '_' }, ---@diagnostic disable-line: missing-fields
284+
topdelete = { text = '' }, ---@diagnostic disable-line: missing-fields
285+
changedelete = { text = '~' }, ---@diagnostic disable-line: missing-fields
283286
},
284287
},
285288
},
@@ -301,6 +304,9 @@ require('lazy').setup({
301304
{ -- Useful plugin to show you pending keybinds.
302305
'folke/which-key.nvim',
303306
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
307+
---@module 'which-key'
308+
---@type wk.Opts
309+
---@diagnostic disable-next-line: missing-fields
304310
opts = {
305311
-- delay between pressing a key and opening which-key (milliseconds)
306312
-- this setting is independent of vim.o.timeoutlen
@@ -468,6 +474,9 @@ require('lazy').setup({
468474
-- used for completion, annotations and signatures of Neovim apis
469475
'folke/lazydev.nvim',
470476
ft = 'lua',
477+
---@module 'lazydev'
478+
---@type lazydev.Config
479+
---@diagnostic disable-next-line: missing-fields
471480
opts = {
472481
library = {
473482
-- Load luvit types when the `vim.uv` word is found
@@ -482,7 +491,13 @@ require('lazy').setup({
482491
-- Automatically install LSPs and related tools to stdpath for Neovim
483492
-- Mason must be loaded before its dependents so we need to set it up here.
484493
-- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
485-
{ 'mason-org/mason.nvim', opts = {} },
494+
{
495+
'mason-org/mason.nvim',
496+
---@module 'mason.settings'
497+
---@type MasonSettings
498+
---@diagnostic disable-next-line: missing-fields
499+
opts = {},
500+
},
486501
'mason-org/mason-lspconfig.nvim',
487502
'WhoIsSethDaniel/mason-tool-installer.nvim',
488503

@@ -774,6 +789,8 @@ require('lazy').setup({
774789
desc = '[F]ormat buffer',
775790
},
776791
},
792+
---@module 'conform'
793+
---@type conform.setupOpts
777794
opts = {
778795
notify_on_error = false,
779796
format_on_save = function(bufnr)
@@ -834,8 +851,8 @@ require('lazy').setup({
834851
},
835852
'folke/lazydev.nvim',
836853
},
837-
--- @module 'blink.cmp'
838-
--- @type blink.cmp.Config
854+
---@module 'blink.cmp'
855+
---@type blink.cmp.Config
839856
opts = {
840857
keymap = {
841858
-- 'default' (recommended) for mappings similar to built-in completions
@@ -923,7 +940,15 @@ require('lazy').setup({
923940
},
924941

925942
-- Highlight todo, notes, etc in comments
926-
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
943+
{
944+
'folke/todo-comments.nvim',
945+
event = 'VimEnter',
946+
dependencies = { 'nvim-lua/plenary.nvim' },
947+
---@module 'todo-comments'
948+
---@type TodoOptions
949+
---@diagnostic disable-next-line: missing-fields
950+
opts = { signs = false },
951+
},
927952

928953
{ -- Collection of various small independent plugins/modules
929954
'echasnovski/mini.nvim',
@@ -967,6 +992,9 @@ require('lazy').setup({
967992
build = ':TSUpdate',
968993
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
969994
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
995+
---@module 'nvim-treesitter'
996+
---@type TSConfig
997+
---@diagnostic disable-next-line: missing-fields
970998
opts = {
971999
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
9721000
-- Autoinstall languages that are not installed
@@ -1014,7 +1042,7 @@ require('lazy').setup({
10141042
-- Or use telescope!
10151043
-- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
10161044
-- you can continue same window with `<space>sr` which resumes last telescope search
1017-
}, {
1045+
}, { ---@diagnostic disable-line: missing-fields
10181046
ui = {
10191047
-- If you are using a Nerd Font: set icons to an empty table which will use the
10201048
-- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table

lua/custom/plugins/init.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
-- I promise not to create any merge conflicts in this directory :)
33
--
44
-- See the kickstart.nvim README for more information
5+
6+
---@module 'lazy'
7+
---@type LazySpec
58
return {}

lua/kickstart/plugins/autopairs.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
-- autopairs
22
-- https://github.com/windwp/nvim-autopairs
33

4+
---@module 'lazy'
5+
---@type LazySpec
46
return {
57
'windwp/nvim-autopairs',
68
event = 'InsertEnter',

lua/kickstart/plugins/debug.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
-- be extended to other languages as well. That's why it's called
77
-- kickstart.nvim and not kitchen-sink.nvim ;)
88

9+
---@module 'lazy'
10+
---@type LazySpec
911
return {
1012
-- NOTE: Yes, you can install new plugins here!
1113
'mfussenegger/nvim-dap',
@@ -100,11 +102,13 @@ return {
100102

101103
-- Dap UI setup
102104
-- For more information, see |:help nvim-dap-ui|
105+
---@diagnostic disable-next-line: missing-fields
103106
dapui.setup {
104107
-- Set icons to characters that are more likely to work in every terminal.
105108
-- Feel free to remove or use ones that you like more! :)
106109
-- Don't feel like these are good choices.
107110
icons = { expanded = '', collapsed = '', current_frame = '*' },
111+
---@diagnostic disable-next-line: missing-fields
108112
controls = {
109113
icons = {
110114
pause = '',

lua/kickstart/plugins/gitsigns.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
-- NOTE: gitsigns is already included in init.lua but contains only the base
33
-- config. This will add also the recommended keymaps.
44

5+
---@module 'lazy'
6+
---@type LazySpec
57
return {
68
{
79
'lewis6991/gitsigns.nvim',
10+
---@module 'gitsigns'
11+
---@type Gitsigns.Config
12+
---@diagnostic disable-next-line: missing-fields
813
opts = {
914
on_attach = function(bufnr)
1015
local gitsigns = require 'gitsigns'

lua/kickstart/plugins/indent_line.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
---@module 'lazy'
2+
---@type LazySpec
13
return {
24
{ -- Add indentation guides even on blank lines
35
'lukas-reineke/indent-blankline.nvim',
46
-- Enable `lukas-reineke/indent-blankline.nvim`
57
-- See `:help ibl`
68
main = 'ibl',
9+
---@module 'ibl'
10+
---@type ibl.config
711
opts = {},
812
},
913
}

lua/kickstart/plugins/lint.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
---@module 'lazy'
2+
---@type LazySpec
13
return {
24

35
{ -- Linting

lua/kickstart/plugins/neo-tree.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
-- Neo-tree is a Neovim plugin to browse the file system
22
-- https://github.com/nvim-neo-tree/neo-tree.nvim
33

4+
---@module 'lazy'
5+
---@type LazySpec
46
return {
57
'nvim-neo-tree/neo-tree.nvim',
68
version = '*',
@@ -13,6 +15,8 @@ return {
1315
keys = {
1416
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
1517
},
18+
---@module 'neo-tree'
19+
---@type neotree.Config
1620
opts = {
1721
filesystem = {
1822
window = {

0 commit comments

Comments
 (0)