Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jmbuhr committed Dec 1, 2023
2 parents 5a04ed0 + 95d7283 commit 5a78371
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 21 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Changelog

## [2.2.0](https://github.com/jmbuhr/quarto-nvim-kickstarter/compare/v2.1.0...v2.2.0) (2023-11-28)


### Features

* configure paste image plugin for quarto and add molten example ([24470a6](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/24470a63bd03745a792f316c98adca79f1cd8951))

## [2.1.0](https://github.com/jmbuhr/quarto-nvim-kickstarter/compare/v2.0.1...v2.1.0) (2023-11-21)


### Features

* exempt markdown headings from `]]` `[[` ts textobjects jumps ([c80622d](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/c80622d6a51a1108cfad1fff51ea60fd5e0780c7))

## [2.0.1](https://github.com/jmbuhr/quarto-nvim-kickstarter/compare/v2.0.0...v2.0.1) (2023-11-16)


### Performance Improvements

* improve pyright performance ([edee5bc](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/edee5bc5b38ac08e5a7893f5a4f57b6f797e41f9))

## [2.0.0](https://github.com/jmbuhr/quarto-nvim-kickstarter/compare/v1.0.0...v2.0.0) (2023-11-15)


Expand Down
1 change: 0 additions & 1 deletion after/queries/markdown/textobjects.scm
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

(paragraph) @function.outer @function.inner


10 changes: 5 additions & 5 deletions lua/config/keymap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ wk.register({
c = {
name = "code",
c = { ":SlimeConfig<cr>", "slime config" },
n = { ":split term://$SHELL<cr>", "new terminal" },
r = { ":split term://R<cr>", "new R terminal" },
p = { ":split term://python<cr>", "new python terminal" },
i = { ":split term://ipython<cr>", "new ipython terminal" },
j = { ":split term://julia<cr>", "new julia terminal" },
n = { ":vsplit term://$SHELL<cr>", "new terminal" },
r = { ":vsplit term://R<cr>", "new R terminal" },
p = { ":vsplit term://python<cr>", "new python terminal" },
i = { ":vsplit term://ipython<cr>", "new ipython terminal" },
j = { ":vsplit term://julia<cr>", "new julia terminal" },
},
["coo"] = { "o# %%<cr>", "new code chunk below" },
["cOo"] = { "O# %%<cr>", "new code chunk above" },
Expand Down
48 changes: 33 additions & 15 deletions lua/plugins/quarto.lua
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,23 @@ return {

-- paste an image to markdown from the clipboard
-- :PasteImg,
{ "dfendr/clipboard-image.nvim" },
{
"dfendr/clipboard-image.nvim",
keys = {
{ "<leader>ip", ":PasteImg<cr>", desc = "image paste" },
},
cmd = {
"PasteImg",
},
config = function()
require 'clipboard-image'.setup {
quarto = {
img_dir = "img",
affix = "![](%s)"
}
}
end
},

-- preview equations
{
Expand All @@ -729,18 +745,20 @@ return {
{ "<leader>eh", ':lua require"nabla".popup()<cr>', "hover equation" },
},
},
{
"benlubas/molten-nvim",
build = ":UpdateRemotePlugins",
init = function()
vim.g.molten_image_provider = "image.nvim"
vim.g.molten_output_win_max_height = 20
vim.g.molten_auto_open_output = false
end,
keys = {
{"<leader>mi", ":MoltenInit<cr>", desc = "molten init"},
{"<leader>mv", ":<C-u>MoltenEvaluateVisual<cr>", mode="v", desc = "molten eval visual"},
{"<leader>mr", ":MoltenReevaluateCell<cr>", desc = "molten re-eval cell"},
}
},

-- {
-- "benlubas/molten-nvim",
-- build = ":UpdateRemotePlugins",
-- init = function()
-- vim.g.molten_image_provider = "image.nvim"
-- vim.g.molten_output_win_max_height = 20
-- vim.g.molten_auto_open_output = false
-- end,
-- keys = {
-- { "<leader>mi", ":MoltenInit<cr>", desc = "molten init" },
-- { "<leader>mv", ":<C-u>MoltenEvaluateVisual<cr>", mode = "v", desc = "molten eval visual" },
-- { "<leader>mr", ":MoltenReevaluateCell<cr>", desc = "molten re-eval cell" },
-- }
-- },

}
14 changes: 14 additions & 0 deletions queries/markdown/textobjects.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
; (atx_heading
; heading_content: (_) @class.inner) @class.outer
;
; (setext_heading
; heading_content: (_) @class.inner) @class.outer
;
; (thematic_break) @class.outer

(fenced_code_block (code_fence_content) @block.inner) @block.outer

[
(paragraph)
(list)
] @block.outer

0 comments on commit 5a78371

Please sign in to comment.