From 23f6d2a46d52fe6de0c09fd3b4161c41c44a2ca3 Mon Sep 17 00:00:00 2001 From: monaqa Date: Sat, 9 Sep 2023 12:08:34 +0900 Subject: [PATCH 1/2] docs: replace config functions --- README.md | 34 ++++++++++++++++++++++++++-------- README_ja.md | 34 ++++++++++++++++++++++++++-------- doc/dial.jax | 23 ++++++++++++++++------- doc/dial.txt | 23 ++++++++++++++++------- 4 files changed, 84 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 869f5ef..8a713fb 100644 --- a/README.md +++ b/README.md @@ -58,17 +58,35 @@ vmap g g(dial-increment) vmap g g(dial-decrement) ``` +Note: When you use "g(dial-increment)" or "g(dial-decrement)" on the right side, `remap` option must be enabled. + Or you can configure it with Lua as follows: ```lua -vim.keymap.set("n", "", require("dial.map").inc_normal(), {noremap = true}) -vim.keymap.set("n", "", require("dial.map").dec_normal(), {noremap = true}) -vim.keymap.set("n", "g", require("dial.map").inc_gnormal(), {noremap = true}) -vim.keymap.set("n", "g", require("dial.map").dec_gnormal(), {noremap = true}) -vim.keymap.set("v", "", require("dial.map").inc_visual(), {noremap = true}) -vim.keymap.set("v", "", require("dial.map").dec_visual(), {noremap = true}) -vim.keymap.set("v", "g",require("dial.map").inc_gvisual(), {noremap = true}) -vim.keymap.set("v", "g",require("dial.map").dec_gvisual(), {noremap = true}) +vim.keymap.set("n", "", function() + require("dial.map").manipulate("increment", "normal") +end) +vim.keymap.set("n", "", function() + require("dial.map").manipulate("decrement", "normal") +end) +vim.keymap.set("n", "g", function() + require("dial.map").manipulate("increment", "gnormal") +end) +vim.keymap.set("n", "g", function() + require("dial.map").manipulate("decrement", "gnormal") +end) +vim.keymap.set("v", "", function() + require("dial.map").manipulate("increment", "visual") +end) +vim.keymap.set("v", "", function() + require("dial.map").manipulate("decrement", "visual") +end) +vim.keymap.set("v", "g", function() + require("dial.map").manipulate("increment", "gvisual") +end) +vim.keymap.set("v", "g", function() + require("dial.map").manipulate("decrement", "gvisual") +end) ``` ## Configuration diff --git a/README_ja.md b/README_ja.md index 2c92e10..9380923 100644 --- a/README_ja.md +++ b/README_ja.md @@ -61,17 +61,35 @@ vmap g g(dial-increment) vmap g g(dial-decrement) ``` +注意: `g(dial-increment)` や `g(dial-decrement)` を右辺で用いる場合は remap を有効にする必要があります。 + または Lua 上で以下のように設定することもできます。 ```lua -vim.keymap.set("n", "", require("dial.map").inc_normal(), {noremap = true}) -vim.keymap.set("n", "", require("dial.map").dec_normal(), {noremap = true}) -vim.keymap.set("n", "g", require("dial.map").inc_gnormal(), {noremap = true}) -vim.keymap.set("n", "g", require("dial.map").dec_gnormal(), {noremap = true}) -vim.keymap.set("v", "", require("dial.map").inc_visual(), {noremap = true}) -vim.keymap.set("v", "", require("dial.map").dec_visual(), {noremap = true}) -vim.keymap.set("v", "g", require("dial.map").inc_gvisual(), {noremap = true}) -vim.keymap.set("v", "g", require("dial.map").dec_gvisual(), {noremap = true}) +vim.keymap.set("n", "", function() + require("dial.map").manipulate("increment", "normal") +end) +vim.keymap.set("n", "", function() + require("dial.map").manipulate("decrement", "normal") +end) +vim.keymap.set("n", "g", function() + require("dial.map").manipulate("increment", "gnormal") +end) +vim.keymap.set("n", "g", function() + require("dial.map").manipulate("decrement", "gnormal") +end) +vim.keymap.set("v", "", function() + require("dial.map").manipulate("increment", "visual") +end) +vim.keymap.set("v", "", function() + require("dial.map").manipulate("decrement", "visual") +end) +vim.keymap.set("v", "g", function() + require("dial.map").manipulate("increment", "gvisual") +end) +vim.keymap.set("v", "g", function() + require("dial.map").manipulate("decrement", "gvisual") +end) ``` ## 設定方法 diff --git a/doc/dial.jax b/doc/dial.jax index 811e119..8454e90 100644 --- a/doc/dial.jax +++ b/doc/dial.jax @@ -189,11 +189,12 @@ Lua 上で以下のように記述すれば expression register を使わずマ きます。 > - vim.api.nvim_set_keymap( + vim.keymap.set( "n", "a", - require("dial.map").inc_normal("mygroup"), - {noremap = true} + function() + require("dial.map").manipulate("increment", "normal", "mygroup") + end ) < @@ -255,11 +256,19 @@ VISUAL モード用のグループを作成することで可能です。 } -- VISUAL モードでの被加数を変更する - vim.api.nvim_set_keymap( - "v", "", require("dial.map").inc_normal("visual"), {noremap = true} + vim.keymap.set( + "v", + "", + function() + require("dial.map").manipulate("increment", "visual", "visual") + end ) - vim.api.nvim_set_keymap( - "v", "", require("dial.map").dec_normal("visual"), {noremap = true} + vim.keymap.set( + "v", + "", + function() + require("dial.map").manipulate("decrement", "visual", "visual") + end ) < diff --git a/doc/dial.txt b/doc/dial.txt index 8b3313a..659bb9c 100644 --- a/doc/dial.txt +++ b/doc/dial.txt @@ -189,11 +189,12 @@ decrease, you can "map" it: Alternatively, you can set the same mapping without expression register: > - vim.api.nvim_set_keymap( + vim.keymap.set( "n", "a", - require("dial.map").inc_normal("mygroup"), - {noremap = true} + function() + require("dial.map").manipulate("increment", "normal", "mygroup") + end ) < @@ -253,11 +254,19 @@ Augends Only Valid in VISUAL Mode~ } -- change augends in VISUAL mode - vim.api.nvim_set_keymap( - "v", "", require("dial.map").inc_normal("visual"), {noremap = true} + vim.keymap.set( + "v", + "", + function() + require("dial.map").manipulate("increment", "visual", "visual") + end ) - vim.api.nvim_set_keymap( - "v", "", require("dial.map").dec_normal("visual"), {noremap = true} + vim.keymap.set( + "v", + "", + function() + require("dial.map").manipulate("decrement", "visual", "visual") + end ) < From 7f3f52706d03216d6168607dc446852c2ac0f03b Mon Sep 17 00:00:00 2001 From: monaqa Date: Sat, 9 Sep 2023 12:17:37 +0900 Subject: [PATCH 2/2] refactor: use vim.keymap.set instead of nvim_set_keymap --- plugin/dial.vim | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugin/dial.vim b/plugin/dial.vim index e886fa0..7cfed5a 100644 --- a/plugin/dial.vim +++ b/plugin/dial.vim @@ -4,14 +4,14 @@ let s:save_cpo = &cpo " save user coptions set cpo&vim " reset them to defaults lua << EOF -vim.api.nvim_set_keymap("n", "(dial-increment)", require("dial.map").inc_normal(), {noremap = true}) -vim.api.nvim_set_keymap("n", "(dial-decrement)", require("dial.map").dec_normal(), {noremap = true}) -vim.api.nvim_set_keymap("n", "g(dial-increment)", require("dial.map").inc_gnormal(), {noremap = true}) -vim.api.nvim_set_keymap("n", "g(dial-decrement)", require("dial.map").dec_gnormal(), {noremap = true}) -vim.api.nvim_set_keymap("v", "(dial-increment)", require("dial.map").inc_visual() .. "gv", {noremap = true}) -vim.api.nvim_set_keymap("v", "(dial-decrement)", require("dial.map").dec_visual() .. "gv", {noremap = true}) -vim.api.nvim_set_keymap("v", "g(dial-increment)", require("dial.map").inc_gvisual() .. "gv", {noremap = true}) -vim.api.nvim_set_keymap("v", "g(dial-decrement)", require("dial.map").dec_gvisual() .. "gv", {noremap = true}) +vim.keymap.set("n", "(dial-increment)", require("dial.map").inc_normal()) +vim.keymap.set("n", "(dial-decrement)", require("dial.map").dec_normal()) +vim.keymap.set("n", "g(dial-increment)", require("dial.map").inc_gnormal()) +vim.keymap.set("n", "g(dial-decrement)", require("dial.map").dec_gnormal()) +vim.keymap.set("v", "(dial-increment)", require("dial.map").inc_visual() .. "gv") +vim.keymap.set("v", "(dial-decrement)", require("dial.map").dec_visual() .. "gv") +vim.keymap.set("v", "g(dial-increment)", require("dial.map").inc_gvisual() .. "gv") +vim.keymap.set("v", "g(dial-decrement)", require("dial.map").dec_gvisual() .. "gv") EOF command! -range -nargs=? DialIncrement lua require"dial.command".command("increment", {from = , to = }, {})