Compare commits

..

1 Commits

Author SHA1 Message Date
iGor milhit b09dc7e748
plugins: update the treesitter configuration
- Updates the treesitter configruation according to the API
  documentation.
- Updates the mkdnflow configuration according to the documentation.
- Forces the filetype of *.md files before mkdnflow is loaded.

Co-Authored-by: iGor milhit <igor@milhit.ch>
2026-02-19 14:01:55 +01:00
10 changed files with 15 additions and 49 deletions

View File

@ -93,7 +93,7 @@ I don't provide links for each of these plugins as they are easy to be found.
- `vim-speeddating` to increment dates, times, etc. - `vim-speeddating` to increment dates, times, etc.
- `vim-surround` to improve surroundings management. - `vim-surround` to improve surroundings management.
- `autopairs.nvim`. - `autopairs.nvim`.
- `mini.comment` to comment lines and blocs. - `Comment.nvim` to comment lines and blocs.
- `ident-blankline.nvim` to improve readability of indentation. - `ident-blankline.nvim` to improve readability of indentation.
- `zen-mode.nvim` for a good zen mode. - `zen-mode.nvim` for a good zen mode.
- `toggleterm.nvim` to quickly get a terminal. Might find a better one. - `toggleterm.nvim` to quickly get a terminal. Might find a better one.

View File

@ -1 +0,0 @@
vim.opt.textwidth = 0

View File

@ -1,25 +0,0 @@
-- Deactivate fold for python files
vim.opt.foldlevel = 99
-- Ruff import sorting and formatting
vim.api.nvim_create_autocmd("BufWritePre", {
buffer = 0,
callback = function()
-- Tri des imports via code action Ruff
local clients = vim.lsp.get_clients({ bufnr = 0 })
for _, c in ipairs(clients) do
if c.name == "ruff" then
vim.lsp.buf.code_action({
context = { only = { "source.organizeImports.ruff" } },
apply = true,
})
break
end
end
-- Formatage du code
vim.lsp.buf.format({ async = false })
end,
})

View File

@ -1,5 +0,0 @@
vim.treesitter.language.register('markdown', 'qmd')
vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
vim.wo[0][0].foldmethod = 'expr'

View File

@ -0,0 +1,2 @@
vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"

View File

@ -1,5 +1,6 @@
-- Install and configure Comment.nvim -- Install and configure Comment.nvim
-- "gc" to comment visual regions/lines -- "gc" to comment visual regions/lines
return { return {
'nvim-mini/mini.comment' 'numToStr/Comment.nvim',
opts = {}
} }

View File

@ -44,7 +44,7 @@ return {
}) })
vim.lsp.config.marksman = { vim.lsp.config.marksman = {
filetypes = { "markdown", "quarto", "qmd" }, filetypes = { "markdown", "quarto" },
root_dir = vim.fs.root(0, { root_dir = vim.fs.root(0, {
".git", ".git",
".marksman.toml", ".marksman.toml",

View File

@ -49,7 +49,6 @@ return {
}, },
luasnip.filetype_extend("pandoc", {"markdown"}), luasnip.filetype_extend("pandoc", {"markdown"}),
luasnip.filetype_extend("quarto", {"markdown"}), luasnip.filetype_extend("quarto", {"markdown"}),
luasnip.filetype_extend("qmd", {"markdown"}),
} }
-- Load snippets from ~/.config/nvim/my_snippets/ -- Load snippets from ~/.config/nvim/my_snippets/

View File

@ -7,7 +7,6 @@ return {
lazy = true, lazy = true,
ft = { ft = {
"quarto", "quarto",
"qmd",
}, },
dependencies = { dependencies = {
"jmbuhr/otter.nvim", "jmbuhr/otter.nvim",

View File

@ -1,4 +1,3 @@
-- Diagnostic keymaps -- Diagnostic keymaps
vim.keymap.set( vim.keymap.set(
@ -21,13 +20,12 @@ return {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
dependencies = { dependencies = {
"nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/nvim-treesitter-textobjects",
branch = "main", -- ← nécessaire aussi pour textobjects
}, },
lazy = false, lazy = false,
branch = "main",
build = ":TSUpdate", build = ":TSUpdate",
config = function() -- Configure treesitter
config = function ()
local treesitter = require('nvim-treesitter') local treesitter = require('nvim-treesitter')
treesitter.setup() treesitter.setup()
treesitter.install({ treesitter.install({
@ -48,7 +46,6 @@ return {
'typescript', 'typescript',
'vim', 'vim',
'vimdoc', 'vimdoc',
'xml',
'yaml', 'yaml',
}) })
@ -71,19 +68,18 @@ return {
'typescript', 'typescript',
'vim', 'vim',
'vimdoc', 'vimdoc',
'xml',
'yaml', 'yaml',
}, },
callback = function() callback = function()
-- syntax highlighting, provided by Neovim -- syntax highlighting, provided by Neovim
pcall(vim.treesitter.start) -- ← pcall: évite l'erreur si pas de parser vim.treesitter.start()
-- folds, provided by Neovim -- folds, provided by Neovim
vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
vim.wo.foldmethod = 'expr' vim.wo.foldmethod = 'expr'
-- indentation, provided by nvim-treesitter (expérimental) -- indentation, provided by nvim-treesitter
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
end, end,
}) })
end end
} }