test: fix tests and clippy checks

dundargoc · dundargoc · commit c89bf6fb0e88 · 2025-02-09T12:40:12.000+01:00
diff --git a/crates/vim9-gen/testdata/output/busted_assign.lua b/crates/vim9-gen/testdata/output/busted_assign.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_defer.lua b/crates/vim9-gen/testdata/output/busted_defer.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_function.lua b/crates/vim9-gen/testdata/output/busted_function.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_heredoc.lua b/crates/vim9-gen/testdata/output/busted_heredoc.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_indexing.lua b/crates/vim9-gen/testdata/output/busted_indexing.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_loops.lua b/crates/vim9-gen/testdata/output/busted_loops.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_megamethods.lua b/crates/vim9-gen/testdata/output/busted_megamethods.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_methods.lua b/crates/vim9-gen/testdata/output/busted_methods.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_methods_1.lua b/crates/vim9-gen/testdata/output/busted_methods_1.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_methods_2.lua b/crates/vim9-gen/testdata/output/busted_methods_2.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_methods_shifted.lua b/crates/vim9-gen/testdata/output/busted_methods_shifted.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_multiline.lua b/crates/vim9-gen/testdata/output/busted_multiline.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_operations.lua b/crates/vim9-gen/testdata/output/busted_operations.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_shared.lua b/crates/vim9-gen/testdata/output/busted_shared.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/busted_simple_assign.lua b/crates/vim9-gen/testdata/output/busted_simple_assign.lua
@@ -6,6 +6,7 @@
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/vim9_gen__test__assign.snap b/crates/vim9-gen/testdata/output/vim9_gen__test__assign.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1867
-expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
+assertion_line: 1880
+expression: "generate(contents, ParserOpts\n{ mode : ParserMode :: Standalone, }).unwrap().lua"
 ---
 ----------------------------------------
 -- This file is generated via github.com/tjdevries/vim9jit
@@ -11,6 +11,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/vim9_gen__test__autocmd.snap b/crates/vim9-gen/testdata/output/vim9_gen__test__autocmd.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1869
-expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
+assertion_line: 1882
+expression: "generate(contents, ParserOpts\n{ mode : ParserMode :: Standalone, }).unwrap().lua"
 ---
 ----------------------------------------
 -- This file is generated via github.com/tjdevries/vim9jit
@@ -11,6 +11,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/vim9_gen__test__call.snap b/crates/vim9-gen/testdata/output/vim9_gen__test__call.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1868
-expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
+assertion_line: 1881
+expression: "generate(contents, ParserOpts\n{ mode : ParserMode :: Standalone, }).unwrap().lua"
 ---
 ----------------------------------------
 -- This file is generated via github.com/tjdevries/vim9jit
@@ -11,6 +11,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/vim9_gen__test__cfilter.snap b/crates/vim9-gen/testdata/output/vim9_gen__test__cfilter.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1869
-expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
+assertion_line: 1883
+expression: "generate(contents, ParserOpts\n{ mode : ParserMode :: Standalone, }).unwrap().lua"
 ---
 ----------------------------------------
 -- This file is generated via github.com/tjdevries/vim9jit
@@ -11,6 +11,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/vim9_gen__test__export.snap b/crates/vim9-gen/testdata/output/vim9_gen__test__export.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1871
-expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
+assertion_line: 1884
+expression: "generate(contents, ParserOpts\n{ mode : ParserMode :: Standalone, }).unwrap().lua"
 ---
 ----------------------------------------
 -- This file is generated via github.com/tjdevries/vim9jit
@@ -11,6 +11,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/vim9_gen__test__expr.snap b/crates/vim9-gen/testdata/output/vim9_gen__test__expr.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1865
-expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
+assertion_line: 1878
+expression: "generate(contents, ParserOpts\n{ mode : ParserMode :: Standalone, }).unwrap().lua"
 ---
 ----------------------------------------
 -- This file is generated via github.com/tjdevries/vim9jit
@@ -11,6 +11,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/vim9_gen__test__if.snap b/crates/vim9-gen/testdata/output/vim9_gen__test__if.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1866
-expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
+assertion_line: 1879
+expression: "generate(contents, ParserOpts\n{ mode : ParserMode :: Standalone, }).unwrap().lua"
 ---
 ----------------------------------------
 -- This file is generated via github.com/tjdevries/vim9jit
@@ -11,6 +11,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-gen/testdata/output/vim9_gen__test__mapleader.snap b/crates/vim9-gen/testdata/output/vim9_gen__test__mapleader.snap
@@ -1,6 +1,7 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
+assertion_line: 1888
+expression: "generate(contents, ParserOpts\n{ mode : ParserMode :: Standalone, }).unwrap().lua"
 ---
 ----------------------------------------
 -- This file is generated via github.com/tjdevries/vim9jit
@@ -10,6 +11,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 -- Ignore "value assigned to a local variable is unused" because
 --  we can't guarantee that local variables will be used by plugins
 -- luacheck: ignore 311
+--- @diagnostic disable
 
 local vim9 = require('_vim9script')
 local M = {}
diff --git a/crates/vim9-lexer/src/lib.rs b/crates/vim9-lexer/src/lib.rs
@@ -65,7 +65,7 @@ impl<'a> From<&TokenText<'a>> for String {
     }
 }
 
-impl<'a> Debug for TokenText<'a> {
+impl Debug for TokenText<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             TokenText::Slice(s) => {
@@ -77,7 +77,7 @@ impl<'a> Debug for TokenText<'a> {
     }
 }
 
-impl<'a> Display for TokenText<'a> {
+impl Display for TokenText<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
diff --git a/crates/vim9-parser/src/lib.rs b/crates/vim9-parser/src/lib.rs
@@ -37,7 +37,7 @@ impl Debug for TokenMeta {
     }
 }
 
-impl<'a> From<Token<'a>> for TokenMeta {
+impl From<Token<'_>> for TokenMeta {
     fn from(t: Token) -> Self {
         Self {
             kind: t.kind,
@@ -46,7 +46,7 @@ impl<'a> From<Token<'a>> for TokenMeta {
     }
 }
 
-impl<'a> From<&Token<'a>> for TokenMeta {
+impl From<&Token<'_>> for TokenMeta {
     fn from(t: &Token) -> Self {
         Self {
             kind: t.kind.clone(),
@@ -556,7 +556,7 @@ pub struct Literal {
     pub token: TokenOwned,
 }
 
-impl<'a> TryFrom<Token<'a>> for Literal {
+impl TryFrom<Token<'_>> for Literal {
     type Error = anyhow::Error;
 
     fn try_from(token: Token) -> Result<Self> {
@@ -2441,10 +2441,9 @@ impl<'a> Parser<'a> {
         if *self.mode.borrow() == ParserMode::PreVim9Script
             && !self.command_match("vim9script")
             && !self.command_match("def")
+            && self.command_match("let")
         {
-            if self.command_match("let") {
-                return SharedCommand::parse(&self);
-            }
+            return SharedCommand::parse(self);
         }
 
         // If the line starts with a colon, then just skip over it.
diff --git a/crates/vim9-parser/testdata/output/vim9_parser__test__mapleader.snap b/crates/vim9-parser/testdata/output/vim9_parser__test__mapleader.snap
@@ -5,7 +5,7 @@ expression: snapshot_parsing(contents)
 [
     SharedCommand(
         SharedCommand {
-            contents: "let mapleader =  \\\\<Space>",
+            contents: "let mapleader =  \"\\<Space>\"",
             eol: Token(EndOfLine, (0,27)->(0,27)),
         },
     ),
