Skip to content

Commit cbbf997

Browse files
committed
fix(align): use "press modifier" instead of "enter modifier"
Details: - This implies that it is a single key that needs to be pressed. - This also redocuments a message shown at the bottom with the currently entered modifiers from "helper message" into "state".
1 parent 9517c95 commit cbbf997

File tree

77 files changed

+120
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+120
-120
lines changed

lua/mini/align.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1797,17 +1797,17 @@ end
17971797
-- Work with user interaction -------------------------------------------------
17981798
H.user_modifier = function(with_preview, msg_chunks)
17991799
-- Get from user single character modifier
1800-
local needs_help_msg = true
1800+
local needs_show_state = true
18011801
local delay = (H.cache.msg_shown or with_preview) and 0 or 1000
18021802
vim.defer_fn(function()
1803-
if not needs_help_msg then return end
1803+
if not needs_show_state then return end
18041804

1805-
table.insert(msg_chunks, { ' Enter modifier' })
1805+
table.insert(msg_chunks, { ' Press modifier' })
18061806
H.echo(msg_chunks)
18071807
H.cache.msg_shown = true
18081808
end, delay)
18091809
local ok, char = pcall(vim.fn.getcharstr)
1810-
needs_help_msg = false
1810+
needs_show_state = false
18111811

18121812
-- Terminate if couldn't get input (like with <C-c>) or it is `<Esc>`
18131813
if not ok or char == '\27' then return nil end

tests/screenshots/tests-test_align.lua---Align---cleans-command-line-only-if-helper-message-was-shown renamed to tests/screenshots/tests-test_align.lua---Align---cleans-command-line-only-if-state-was-shown

File renamed without changes.

tests/screenshots/tests-test_align.lua---Align---helper-message-does-not-cause-hit-enter-prompt renamed to tests/screenshots/tests-test_align.lua---Align---showing-state-does-not-cause-hit-enter-prompt

File renamed without changes.

tests/screenshots/tests-test_align.lua---Align---prompts-helper-message-after-one-idle-second---test-+-args-{-'Normal'-} renamed to tests/screenshots/tests-test_align.lua---Align---shows-state-after-one-idle-second---test-+-args-{-'Normal'-}

File renamed without changes.

tests/screenshots/tests-test_align.lua---Align---prompts-helper-message-after-one-idle-second---test-+-args-{-'Normal'-}-002 renamed to tests/screenshots/tests-test_align.lua---Align---shows-state-after-one-idle-second---test-+-args-{-'Normal'-}-002

File renamed without changes.

tests/screenshots/tests-test_align.lua---Align---prompts-helper-message-after-one-idle-second---test-+-args-{-'Normal'-}-003 renamed to tests/screenshots/tests-test_align.lua---Align---shows-state-after-one-idle-second---test-+-args-{-'Normal'-}-003

File renamed without changes.

tests/screenshots/tests-test_align.lua---Align---prompts-helper-message-after-one-idle-second---test-+-args-{-'Normal'-}-004 renamed to tests/screenshots/tests-test_align.lua---Align---shows-state-after-one-idle-second---test-+-args-{-'Normal'-}-004

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
07|[No Name] 1,1
99
08|(mini.align) Split:
1010
09|"" | Justify: "right
11-
10|" | Merge: "" | Ente
12-
11|r modifier
11+
10|" | Merge: "" | Pres
12+
11|s modifier
1313
12|
1414

1515
--|---------|---------|

tests/screenshots/tests-test_align.lua---Align---prompts-helper-message-after-one-idle-second---test-+-args-{-'Normal'-}-005 renamed to tests/screenshots/tests-test_align.lua---Align---shows-state-after-one-idle-second---test-+-args-{-'Normal'-}-005

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
07|[No Name] 1,1
99
08|(mini.align) Split:
1010
09|"" | Justify: "cente
11-
10|r" | Merge: "" | Ent
12-
11|er modifier
11+
10|r" | Merge: "" | Pre
12+
11|ss modifier
1313
12|
1414

1515
--|---------|---------|

tests/screenshots/tests-test_align.lua---Align---prompts-helper-message-after-one-idle-second---test-+-args-{-'Normal'-}-006 renamed to tests/screenshots/tests-test_align.lua---Align---shows-state-after-one-idle-second---test-+-args-{-'Normal'-}-006

File renamed without changes.

tests/screenshots/tests-test_align.lua---Align---prompts-helper-message-after-one-idle-second---test-+-args-{-'Visual'-} renamed to tests/screenshots/tests-test_align.lua---Align---shows-state-after-one-idle-second---test-+-args-{-'Visual'-}

File renamed without changes.

0 commit comments

Comments
 (0)