Skip to content

Commit 9216ae0

Browse files
committed
(mise) update neovim
1 parent 4a45f7d commit 9216ae0

5 files changed

Lines changed: 14 additions & 22 deletions

File tree

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@
22
path = library/busted
33
url = https://github.com/LuaCATS/busted
44
branch = main
5-
[submodule "library/luv"]
6-
path = library/luv
7-
url = https://github.com/LuaCATS/luv
8-
branch = main

examples/docker-containers.lua

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,12 @@ local function App(ctx)
293293
--
294294
-- Help (if enabled)
295295
--
296-
state.show_help
297-
and {
298-
h(Help, {
299-
show_help = state.show_help,
300-
}),
301-
'\n\n',
302-
},
296+
state.show_help and {
297+
h(Help, {
298+
show_help = state.show_help,
299+
}),
300+
'\n\n',
301+
},
303302

304303
--
305304
-- List of containers

library/luv

Lines changed: 0 additions & 1 deletion
This file was deleted.

lua/morph.lua

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,14 +1163,12 @@ function Morph:mount(tree)
11631163
elseif new_type == 'string' or new_type == 'number' then
11641164
rendered = new_tree
11651165
elseif new_type == 'array' then
1166-
local old_array = (old_type == 'array') and old_tree --[[@as morph.Node[]?]]
1167-
or nil
1166+
local old_array = (old_type == 'array') and old_tree --[[@as morph.Node[]?]] or nil
11681167
--- @diagnostic disable-next-line: need-check-nil
11691168
rendered = reconcile_array(old_array, new_tree --[[@as morph.Node[] ]])
11701169
elseif new_type == 'tag' then
11711170
local new_tag = new_tree --[[@as morph.Tag]]
1172-
local old_children = (old_type == new_type) and (old_tree --[[@as morph.Tag]]).children
1173-
or nil
1171+
local old_children = (old_type == new_type) and (old_tree --[[@as morph.Tag]]).children or nil
11741172
--- @diagnostic disable-next-line: need-check-nil
11751173
rendered = h(new_tag.name, new_tag.attributes, reconcile_tree(old_children, new_tag.children))
11761174
elseif new_type == 'component' then

mise.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jq = "1.8.1"
1010
# installed. In the tests, we will override with `eval $(nvimv env VERSION)`,
1111
# but to avoid having to litter a bunch of commands with that environment
1212
# initialization, this just makes things simpler:
13-
neovim = "0.12.1"
14-
"http:nvimv" = { version = "latest", url = "https://raw.githubusercontent.com/jrop/nvimv/refs/heads/main/nvimv" }
15-
stylua = "2.3.1"
16-
cargo-binstall = "1.17.9"
13+
neovim = "0.12.2"
14+
"http:nvimv" = { version = "2d018f5", url = "https://raw.githubusercontent.com/jrop/nvimv/2d018f55173bb88e6fb41e6f07a4908e5619c136/nvimv" }
15+
stylua = "2.4.1"
16+
cargo-binstall = "1.18.1"
1717
"cargo:emmylua_ls" = { version = "0.20.0", depends = ["cargo-binstall"] }
1818
"cargo:emmylua_check" = { version = "0.20.0", depends = ["cargo-binstall"] }
1919

@@ -77,12 +77,12 @@ arg "<version>" help="The version of Neovim to test with"
7777
run = 'mise test:version:no-prep $usage_version'
7878

7979
[tasks."test"]
80-
run = 'mise test:version 0.12.1'
80+
run = 'mise test:version 0.12.2'
8181

8282
[tasks."test:all"]
8383
depends = ["test:prepare"]
8484
run = '''
85-
VERSIONS="0.10.4 0.11.7 0.12.1 nightly"
85+
VERSIONS="0.10.4 0.11.7 0.12.2 nightly"
8686
for v in $VERSIONS; do
8787
mise test:version:no-prep $v
8888
done

0 commit comments

Comments
 (0)