Merge branch 'master' into pr/ian-pascoe/3330

Author: sumneko

changelog.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
+* `FIX` convert all keys to string before using
 * `FIX` Generic class inheritance with type arguments now works correctly (e.g., `class Bar: Foo<integer>`) [#1929](https://github.com/LuaLS/lua-language-server/issues/1929)
 * `FIX` Method return types on generic classes now resolve correctly (e.g., `Box<string>:getValue()` returns `string`) [#1863](https://github.com/LuaLS/lua-language-server/issues/1863)
 * `FIX` Self-referential generic classes no longer cause infinite expansion in hover display [#1853](https://github.com/LuaLS/lua-language-server/issues/1853)

script/locale-loader.lua

@@ -2,6 +2,7 @@ local function mergeKey(key, k)
     if not key then
         return k
     end
+    k = tostring(k)
     if k:sub(1, 1):match '%w' then
         return key .. '.' .. k
     else