From 5aa14e1231b7eccfbc54cba8f20d54105212847d Mon Sep 17 00:00:00 2001
From: altermo <107814000+altermo@users.noreply.github.com>
Date: Wed, 17 Jan 2024 20:34:25 +0100
Subject: [PATCH] fix(lua): return after assert returns assert message (#27064)

---
 runtime/lua/vim/diagnostic.lua | 6 ++----
 runtime/lua/vim/glob.lua       | 3 ++-
 scripts/gen_help_html.lua      | 6 ++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index c7a1e8ebd3..03a1fe9a2f 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -180,10 +180,8 @@ local all_namespaces = {}
 ---@return vim.diagnostic.Severity?
 local function to_severity(severity)
   if type(severity) == 'string' then
-    return assert(
-      M.severity[string.upper(severity)],
-      string.format('Invalid severity: %s', severity)
-    )
+    assert(M.severity[string.upper(severity)], string.format('Invalid severity: %s', severity))
+    return M.severity[string.upper(severity)]
   end
   return severity
 end
diff --git a/runtime/lua/vim/glob.lua b/runtime/lua/vim/glob.lua
index 49d6f555da..764200dd36 100644
--- a/runtime/lua/vim/glob.lua
+++ b/runtime/lua/vim/glob.lua
@@ -77,7 +77,8 @@ function M.to_lpeg(pattern)
   })
 
   local lpeg_pattern = p:match(pattern) --[[@as vim.lpeg.Pattern?]]
-  return assert(lpeg_pattern, 'Invalid glob')
+  assert(lpeg_pattern, 'Invalid glob')
+  return lpeg_pattern
 end
 
 return M
diff --git a/scripts/gen_help_html.lua b/scripts/gen_help_html.lua
index 49417e72bb..5986a399d9 100644
--- a/scripts/gen_help_html.lua
+++ b/scripts/gen_help_html.lua
@@ -1123,10 +1123,8 @@ function M._test()
       'if "expected" is given, "actual" is also required'
     )
     if expected then
-      return assert(
-        cond,
-        ('expected %s, got: %s'):format(vim.inspect(expected), vim.inspect(actual))
-      )
+      assert(cond, ('expected %s, got: %s'):format(vim.inspect(expected), vim.inspect(actual)))
+      return cond
     else
       return assert(cond)
     end