Merge branch 'master' into feat/param_infer_for_override

Author: sumneko

Diff for: changelog.md

@@ -4,6 +4,8 @@
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `NEW` Added support for Japanese locale
 * `NEW` Infer function parameter types when overriding the same-named class function in an instance of that class [#2158](https://github.com/LuaLS/lua-language-server/issues/2158)
+* `FIX` Eliminate floating point error in test benchmark output
+* `FIX` Remove luamake install from make scripts
 
 ## 3.10.6
 `2024-9-10`

Diff for: make.bat

@@ -1,6 +1,5 @@
 git submodule update --init --recursive
 cd 3rd\luamake
-call compile\install.bat
 call compile\build.bat
 cd ..\..
 IF "%~1"=="" (

Diff for: make.sh

@@ -2,7 +2,6 @@
 
 git submodule update --init --recursive
 pushd 3rd/luamake
-./compile/install.sh
 ./compile/build.sh
 popd
 if [ -z "$1" ]; then

Diff for: test/full/projects.lua

@@ -49,7 +49,7 @@ local function doProjects(pathname)
     for uri in files.eachFile() do
         local fileClock = os.clock()
         diag.doDiagnostic(uri, true)
-        print('诊断文件耗时：', os.clock() - fileClock, uri)
+        print('诊断文件耗时：', string.format("%.6f", os.clock() - fileClock), uri)
     end
 
     local passed = os.clock() - clock

Diff for: test/full/self.lua

@@ -48,7 +48,7 @@ for uri in files.eachFile() do
     end)
     local fileClock = os.clock()
     diag.doDiagnostic(uri, true)
-    print('诊断文件耗时：', os.clock() - fileClock, uri)
+    print('诊断文件耗时：', string.format("%.6f", os.clock() - fileClock), uri)
     ::CONTINUE::
 end