summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2022-11-17 17:30:08 +0800
committerGitHub <noreply@github.com>2022-11-17 17:30:08 +0800
commitd33debdaa7d8748beef0e0365f0314222006058e (patch)
treecaa39e1ac44b0ad0310308d89078a0de7748839b
parente54fb73d81459fcee1e8402da422f56d00684921 (diff)
parent30964ab86e315ccf45a5f6dd2432d70317fb9357 (diff)
downloadlua-language-server-d33debdaa7d8748beef0e0365f0314222006058e.zip
Merge pull request #1706 from fesily/fix-some-doc-error
fix some doc error
-rw-r--r--meta/3rd/OpenResty/library/ngx.lua3
-rw-r--r--meta/3rd/OpenResty/library/ngx/pipe.lua2
-rw-r--r--meta/3rd/OpenResty/library/ngx/semaphore.lua2
-rw-r--r--meta/3rd/OpenResty/library/resty/core/base.lua2
-rw-r--r--meta/template/os.lua2
5 files changed, 8 insertions, 3 deletions
diff --git a/meta/3rd/OpenResty/library/ngx.lua b/meta/3rd/OpenResty/library/ngx.lua
index aa2a29ce..a223709d 100644
--- a/meta/3rd/OpenResty/library/ngx.lua
+++ b/meta/3rd/OpenResty/library/ngx.lua
@@ -581,6 +581,9 @@ function ngx.worker.pid() end
--- This boolean field indicates whether the current NGINX is a debug build, i.e., being built by the `./configure` option `--with-debug`.
---@field debug boolean
---
+--- This boolean field indicates whether the current NGINX run by resty.
+---@field is_console boolean
+---
ngx.config = {}
diff --git a/meta/3rd/OpenResty/library/ngx/pipe.lua b/meta/3rd/OpenResty/library/ngx/pipe.lua
index 3f58c9cb..c0190e3a 100644
--- a/meta/3rd/OpenResty/library/ngx/pipe.lua
+++ b/meta/3rd/OpenResty/library/ngx/pipe.lua
@@ -73,7 +73,7 @@ pipe.version = require("resty.core.base").version
---```
---
---
----@param args table[]|string
+---@param args string[]|string
---@param opts? ngx.pipe.spawn.opts
---@return ngx.pipe.proc? proc
---@return string? error
diff --git a/meta/3rd/OpenResty/library/ngx/semaphore.lua b/meta/3rd/OpenResty/library/ngx/semaphore.lua
index 105262e6..cd5c7586 100644
--- a/meta/3rd/OpenResty/library/ngx/semaphore.lua
+++ b/meta/3rd/OpenResty/library/ngx/semaphore.lua
@@ -1,6 +1,8 @@
---@meta
---@class ngx.semaphore
+--- sem is the internal c handler
+---@field sem userdata
local semaphore = {
version = require("resty.core.base").version,
}
diff --git a/meta/3rd/OpenResty/library/resty/core/base.lua b/meta/3rd/OpenResty/library/resty/core/base.lua
index 61cd29e5..d84c3486 100644
--- a/meta/3rd/OpenResty/library/resty/core/base.lua
+++ b/meta/3rd/OpenResty/library/resty/core/base.lua
@@ -17,7 +17,7 @@ function resty_core_base.get_request() end
function resty_core_base.get_size_ptr() end
---@param size number
----@param must_alloc boolean
+---@param must_alloc? boolean
---@return userdata
function resty_core_base.get_string_buf(size, must_alloc) end
diff --git a/meta/template/os.lua b/meta/template/os.lua
index 760c029a..fbe37891 100644
--- a/meta/template/os.lua
+++ b/meta/template/os.lua
@@ -44,7 +44,7 @@ function os.date(format, time) end
function os.difftime(t2, t1) end
---#DES 'os.execute'
----#if VERSION <= 5.1 then
+---#if VERSION <= 5.1 and not JIT then
---@param command? string
---@return integer code
function os.execute(command) end