diff options
| author | 最萌小汐 <sumneko@hotmail.com> | 2022-04-01 02:02:06 +0800 |
|---|---|---|
| committer | 最萌小汐 <sumneko@hotmail.com> | 2022-04-01 02:02:06 +0800 |
| commit | bf6538f45636c4f3bceba6e3f4bbdaef3d21a071 (patch) | |
| tree | ac1205da6e910b1677bf7e2ff59417710527fa72 /script/core | |
| parent | c1ca4d8af0cefd6222b76f83341774857cef44ec (diff) | |
| download | lua-language-server-bf6538f45636c4f3bceba6e3f4bbdaef3d21a071.zip | |
cleanup
Diffstat (limited to 'script/core')
| -rw-r--r-- | script/core/hover/table.lua | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/script/core/hover/table.lua b/script/core/hover/table.lua index 4ad5e552..e8c9b95d 100644 --- a/script/core/hover/table.lua +++ b/script/core/hover/table.lua @@ -85,12 +85,6 @@ local function getKeyMap(fields) local mark = {} for _, field in ipairs(fields) do local key = vm.getKeyName(field) - local tp = vm.getKeyType(field) - if tp == 'number' or tp == 'integer' then - key = tonumber(key) - elseif tp == 'boolean' then - key = key == 'true' - end if key and not mark[key] then mark[key] = true keys[#keys+1] = key @@ -116,35 +110,31 @@ local function getKeyMap(fields) return keys end -local function getOptionalMap(fields) - local optionals = {} +---@async +local function getFieldMap(fields, keys) + local fieldMap = {} + for _, key in ipairs(keys) do + fieldMap[key] = { + infer = nil, + literal = nil, + opt = false, + } + end for _, field in ipairs(fields) do if field.type == 'doc.field.name' then if field.parent.optional then local key = vm.getKeyName(field) - local tp = vm.getKeyType(field) - if tp == 'number' or tp == 'integer' then - key = tonumber(key) - elseif tp == 'boolean' then - key = key == 'true' - end - optionals[key] = true + fieldMap[key].opt = true end end if field.type == 'doc.type.field' then if field.optional then local key = vm.getKeyName(field) - local tp = vm.getKeyType(field) - if tp == 'number' or tp == 'integer' then - key = tonumber(key) - elseif tp == 'boolean' then - key = key == 'true' - end - optionals[key] = true + fieldMap[key].opt = true end end end - return optionals + return fieldMap end ---@async @@ -154,9 +144,9 @@ return function (source) return 'table' end - local fields = vm.getFields(source) - local keys = getKeyMap(fields) - local optMap = getOptionalMap(fields) + local fields = vm.getFields(source) + local keys = getKeyMap(fields) + local fieldMap = getFieldMap(fields, keys) if #keys == 0 then return '{}' |