Merge branch 'master' into max-fields-count

Author: halflifefan

.luarc.json

@@ -29,8 +29,7 @@
             "script/?.lua",
             "script/?/init.lua",
             "test/?.lua",
-            "test/?/init.lua",
-            "script/meta/?.lua"
+            "test/?/init.lua"
         ],
         "pathStrict": true
     },

changelog.md

@@ -2,13 +2,16 @@
 
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
-* `FIX` Plugin virtual comment style and behavior issues
+
+## 3.16.0
+`2025-12-2`
 * `NEW` Support Lua 5.5
+* `CHG` Doc output now contains file paths for `@alias` and `@enum` types
+* `CHG` Rename configuration option `Lua.diagnostics.disableScheme` to `Lua.diagnostics.validScheme` and improve its description. Now it enables diagnostics for Lua files that use the specified scheme.
+* `FIX` Plugin virtual comment style and behavior issues
 * `FIX` Incorrect generation of function signatures with tuple-parameters
-* `NEW` Doc output now contains file paths for `@alias` and `@enum` types
 * `FIX` Typos in a few error messages.
 * `FIX` Incorrect inject-field message for extra table field in exact class
-* `CHG` Rename configuration option `Lua.diagnostics.disableScheme` to `Lua.diagnostics.validScheme` and improve its description. Now it enables diagnostics for Lua files that use the specified scheme.
 * `FIX` adds the `|lambda|` operator to the `Lua.runtime.nonstandardSymbol` configuration template, which allows the use of that option. Previously, support for it existed in the parser, but we could not actually use the option because it is not recognised in the configuration.
 * `FIX` Typed `@field` (eg `---@field [string] boolean`) should not override other defined field [#2171](https://github.com/LuaLS/lua-language-server/issues/2171), [#2711](https://github.com/LuaLS/lua-language-server/issues/2711)
 * `FIX` don't return empty hover doc when luals failed to find definition

lua-language-server-scm-1.rockspec

@@ -1,4 +1,4 @@
-local git_ref = '3.15.1'
+local git_ref = '3.16.0'
 local modrev = 'scm'
 local specrev = '1'
 

make.bat

@@ -0,0 +1,9 @@
+git submodule update --init --recursive
+cd 3rd\luamake
+call compile\build.bat
+cd ..\..
+IF "%~1"=="" (
+    call 3rd\luamake\luamake.exe rebuild
+) ELSE (
+    call 3rd\luamake\luamake.exe rebuild --platform %1
+)

make.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+git submodule update --init --recursive
+pushd 3rd/luamake
+./compile/build.sh
+popd
+if [ -z "$1" ]; then
+    3rd/luamake/luamake rebuild
+else
+    3rd/luamake/luamake rebuild --platform "$1"
+fi

script/meta/bee/channel.lua

@@ -1,4 +1,4 @@
----@meta
+---@meta bee.channel
 
 ---@class bee.channel
 local channelMod = {}

script/meta/bee/filesystem.lua

@@ -1,4 +1,4 @@
----@meta
+---@meta bee.filesystem
 
 ---@class fs.path
 ---@operator div: fs.path

script/meta/bee/filewatch.lua

@@ -1,4 +1,4 @@
----@meta
+---@meta bee.filewatch
 
 ---@class bee.filewatch.instance
 local instance = {}

script/meta/bee/select.lua

@@ -1,4 +1,4 @@
----@meta
+---@meta bee.select
 
 ---@class bee.select
 local select = {}

script/meta/bee/socket.lua

@@ -1,4 +1,4 @@
----@meta
+---@meta bee.socket
 
 ---@alias bee.socket.protocol
 ---| 'tcp'