diff options
Diffstat (limited to 'script')
-rw-r--r-- | script/client.lua | 3 | ||||
-rw-r--r-- | script/config/loader.lua | 3 | ||||
-rw-r--r-- | script/core/infer.lua | 3 | ||||
-rw-r--r-- | script/inspect.lua | 337 | ||||
-rw-r--r-- | script/jsonrpc.lua | 4 | ||||
-rw-r--r-- | script/library.lua | 3 | ||||
-rw-r--r-- | script/proto/proto.lua | 25 | ||||
-rw-r--r-- | script/provider/provider.lua | 15 | ||||
-rw-r--r-- | script/workspace/workspace.lua | 3 |
9 files changed, 369 insertions, 27 deletions
diff --git a/script/client.lua b/script/client.lua index 6c3e503d..07520937 100644 --- a/script/client.lua +++ b/script/client.lua @@ -8,6 +8,7 @@ local converter = require 'proto.converter' local json = require 'json-beautify' local await = require 'await' local scope = require 'workspace.scope' +local inspect = require 'inspect' local m = {} @@ -398,7 +399,7 @@ local function hookPrint() end function m.init(t) - log.debug('Client init', util.dump(t)) + log.debug('Client init', inspect(t)) m.info = t nonil.enable() m.client(t.clientInfo.name) diff --git a/script/config/loader.lua b/script/config/loader.lua index c0bd66d7..c53f9399 100644 --- a/script/config/loader.lua +++ b/script/config/loader.lua @@ -4,6 +4,7 @@ local lang = require 'language' local util = require 'utility' local workspace = require 'workspace' local scope = require 'workspace.scope' +local inspect = require 'inspect' local function errorMessage(msg) proto.notify('window/showMessage', { @@ -105,7 +106,7 @@ function m.loadClientConfig(uri) }, }) if not configs or not configs[1] then - log.warn('No config?', util.dump(configs)) + log.warn('No config?', inspect(configs)) return nil end diff --git a/script/core/infer.lua b/script/core/infer.lua index 88028a6c..76d6c3b4 100644 --- a/script/core/infer.lua +++ b/script/core/infer.lua @@ -4,6 +4,7 @@ local noder = require 'core.noder' local util = require 'utility' local vm = require "vm.vm" local guide = require "parser.guide" +local inspect = require 'inspect' local CLASS = { 'CLASS' } local TABLE = { 'TABLE' } @@ -606,7 +607,7 @@ function m.searchAndViewInfers(source, field, mark) local infers = m.searchInfers(source, field, mark) local view = m.viewInfers(guide.getUri(source), infers) if type(view) == 'boolean' then - log.error('Why view is boolean?', util.dump(infers)) + log.error('Why view is boolean?', inspect(infers)) return 'any' end return view diff --git a/script/inspect.lua b/script/inspect.lua new file mode 100644 index 00000000..f8d69dc7 --- /dev/null +++ b/script/inspect.lua @@ -0,0 +1,337 @@ +local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local math = _tl_compat and _tl_compat.math or math; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table +local inspect = {Options = {}, } + + + + + + + + + + + + + + + + + +inspect._VERSION = 'inspect.lua 3.1.0' +inspect._URL = 'http://github.com/kikito/inspect.lua' +inspect._DESCRIPTION = 'human-readable representations of tables' +inspect._LICENSE = [[ + MIT LICENSE + + Copyright (c) 2022 Enrique GarcĂa Cota + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +]] +inspect.KEY = setmetatable({}, { __tostring = function() return 'inspect.KEY' end }) +inspect.METATABLE = setmetatable({}, { __tostring = function() return 'inspect.METATABLE' end }) + +local tostring = tostring +local rep = string.rep +local match = string.match +local char = string.char +local gsub = string.gsub +local fmt = string.format + +local function rawpairs(t) + return next, t, nil +end + + + +local function smartQuote(str) + if match(str, '"') and not match(str, "'") then + return "'" .. str .. "'" + end + return '"' .. gsub(str, '"', '\\"') .. '"' +end + + +local shortControlCharEscapes = { + ["\a"] = "\\a", ["\b"] = "\\b", ["\f"] = "\\f", ["\n"] = "\\n", + ["\r"] = "\\r", ["\t"] = "\\t", ["\v"] = "\\v", ["\127"] = "\\127", +} +local longControlCharEscapes = { ["\127"] = "\127" } +for i = 0, 31 do + local ch = char(i) + if not shortControlCharEscapes[ch] then + shortControlCharEscapes[ch] = "\\" .. i + longControlCharEscapes[ch] = fmt("\\%03d", i) + end +end + +local function escape(str) + return (gsub(gsub(gsub(str, "\\", "\\\\"), + "(%c)%f[0-9]", longControlCharEscapes), + "%c", shortControlCharEscapes)) +end + +local function isIdentifier(str) + return type(str) == "string" and not not str:match("^[_%a][_%a%d]*$") +end + +local flr = math.floor +local function isSequenceKey(k, sequenceLength) + return type(k) == "number" and + flr(k) == k and + 1 <= (k) and + k <= sequenceLength +end + +local defaultTypeOrders = { + ['number'] = 1, ['boolean'] = 2, ['string'] = 3, ['table'] = 4, + ['function'] = 5, ['userdata'] = 6, ['thread'] = 7, +} + +local function sortKeys(a, b) + local ta, tb = type(a), type(b) + + + if ta == tb and (ta == 'string' or ta == 'number') then + return (a) < (b) + end + + local dta = defaultTypeOrders[ta] or 100 + local dtb = defaultTypeOrders[tb] or 100 + + + return dta == dtb and ta < tb or dta < dtb +end + +local function getKeys(t) + + local seqLen = 1 + while rawget(t, seqLen) ~= nil do + seqLen = seqLen + 1 + end + seqLen = seqLen - 1 + + local keys, keysLen = {}, 0 + for k in rawpairs(t) do + if not isSequenceKey(k, seqLen) then + keysLen = keysLen + 1 + keys[keysLen] = k + end + end + table.sort(keys, sortKeys) + return keys, keysLen, seqLen +end + +local function countCycles(x, cycles) + if type(x) == "table" then + if cycles[x] then + cycles[x] = cycles[x] + 1 + else + cycles[x] = 1 + for k, v in rawpairs(x) do + countCycles(k, cycles) + countCycles(v, cycles) + end + countCycles(getmetatable(x), cycles) + end + end +end + +local function makePath(path, a, b) + local newPath = {} + local len = #path + for i = 1, len do newPath[i] = path[i] end + + newPath[len + 1] = a + newPath[len + 2] = b + + return newPath +end + + +local function processRecursive(process, + item, + path, + visited) + if item == nil then return nil end + if visited[item] then return visited[item] end + + local processed = process(item, path) + if type(processed) == "table" then + local processedCopy = {} + visited[item] = processedCopy + local processedKey + + for k, v in rawpairs(processed) do + processedKey = processRecursive(process, k, makePath(path, k, inspect.KEY), visited) + if processedKey ~= nil then + processedCopy[processedKey] = processRecursive(process, v, makePath(path, processedKey), visited) + end + end + + local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE), visited) + if type(mt) ~= 'table' then mt = nil end + setmetatable(processedCopy, mt) + processed = processedCopy + end + return processed +end + +local function puts(buf, str) + buf.n = buf.n + 1 + buf[buf.n] = str +end + + + +local Inspector = {} + + + + + + + + + + +local Inspector_mt = { __index = Inspector } + +local function tabify(inspector) + puts(inspector.buf, inspector.newline .. rep(inspector.indent, inspector.level)) +end + +function Inspector:getId(v) + local id = self.ids[v] + local ids = self.ids + if not id then + local tv = type(v) + id = (ids[tv] or 0) + 1 + ids[v], ids[tv] = id, id + end + return tostring(id) +end + +function Inspector:putValue(v) + local buf = self.buf + local tv = type(v) + if tv == 'string' then + puts(buf, smartQuote(escape(v))) + elseif tv == 'number' or tv == 'boolean' or tv == 'nil' or + tv == 'cdata' or tv == 'ctype' then + puts(buf, tostring(v)) + elseif tv == 'table' and not self.ids[v] then + local t = v + + if t == inspect.KEY or t == inspect.METATABLE then + puts(buf, tostring(t)) + elseif self.level >= self.depth then + puts(buf, '{...}') + else + if self.cycles[t] > 1 then puts(buf, fmt('<%d>', self:getId(t))) end + + local keys, keysLen, seqLen = getKeys(t) + + puts(buf, '{') + self.level = self.level + 1 + + for i = 1, seqLen + keysLen do + if i > 1 then puts(buf, ',') end + if i <= seqLen then + puts(buf, ' ') + self:putValue(t[i]) + else + local k = keys[i - seqLen] + tabify(self) + if isIdentifier(k) then + puts(buf, k) + else + puts(buf, "[") + self:putValue(k) + puts(buf, "]") + end + puts(buf, ' = ') + self:putValue(t[k]) + end + end + + local mt = getmetatable(t) + if type(mt) == 'table' then + if seqLen + keysLen > 0 then puts(buf, ',') end + tabify(self) + puts(buf, '<metatable> = ') + self:putValue(mt) + end + + self.level = self.level - 1 + + if keysLen > 0 or type(mt) == 'table' then + tabify(self) + elseif seqLen > 0 then + puts(buf, ' ') + end + + puts(buf, '}') + end + + else + puts(buf, fmt('<%s %d>', tv, self:getId(v))) + end +end + + + + +function inspect.inspect(root, options) + options = options or {} + + local depth = options.depth or (math.huge) + local newline = options.newline or '\n' + local indent = options.indent or ' ' + local process = options.process + + if process then + root = processRecursive(process, root, {}, {}) + end + + local cycles = {} + countCycles(root, cycles) + + local inspector = setmetatable({ + buf = { n = 0 }, + ids = {}, + cycles = cycles, + depth = depth, + level = 0, + newline = newline, + indent = indent, + }, Inspector_mt) + + inspector:putValue(root) + + return table.concat(inspector.buf) +end + +setmetatable(inspect, { + __call = function(_, root, options) + return inspect.inspect(root, options) + end, +}) + +return inspect diff --git a/script/jsonrpc.lua b/script/jsonrpc.lua index 583bb6e2..91d6c9dd 100644 --- a/script/jsonrpc.lua +++ b/script/jsonrpc.lua @@ -1,7 +1,7 @@ local json = require 'json' +local inspect = require 'inspect' local pcall = pcall local tonumber = tonumber -local util = require 'utility' ---@class jsonrpc local m = {} @@ -44,7 +44,7 @@ function m.decode(reader) end local len = head['Content-Length'] if not len then - return nil, 'Proto header error: ' .. util.dump(head) + return nil, 'Proto header error: ' .. inspect(head) end local content = reader(len) if not content then diff --git a/script/library.lua b/script/library.lua index adfd0955..af86fe95 100644 --- a/script/library.lua +++ b/script/library.lua @@ -13,6 +13,7 @@ local timer = require 'timer' local encoder = require 'encoder' local ws = require 'workspace.workspace' local scope = require 'workspace.scope' +local inspect = require 'inspect' local m = {} @@ -255,7 +256,7 @@ local function initBuiltIn(uri) end local result = fsu.fileSync(out, metaPath) if #result.err > 0 then - log.warn('File sync error:', util.dump(result)) + log.warn('File sync error:', inspect(result)) end end diff --git a/script/proto/proto.lua b/script/proto/proto.lua index cb549764..d245ab65 100644 --- a/script/proto/proto.lua +++ b/script/proto/proto.lua @@ -5,6 +5,7 @@ local pub = require 'pub' local jsonrpc = require 'jsonrpc' local define = require 'proto.define' local json = require 'json' +local inspect = require 'inspect' local reqCounter = util.counter() @@ -49,7 +50,7 @@ end function m.response(id, res) if id == nil then - log.error('Response id is nil!', util.dump(res)) + log.error('Response id is nil!', inspect(res)) return end assert(m.holdon[id]) @@ -62,7 +63,7 @@ end function m.responseErr(id, code, message) if id == nil then - log.error('Response id is nil!', util.dump(message)) + log.error('Response id is nil!', inspect(message)) return end assert(m.holdon[id]) @@ -128,16 +129,14 @@ function m.request(name, params, callback) end local secretOption = { - format = { - ['text'] = function (value, _, _, stack) - if stack[1] == 'params' - and stack[2] == 'textDocument' - and stack[3] == nil then - return '"***"' - end - return ('%q'):format(value) + process = function (item, path) + if path[1] == 'params' + and path[2] == 'textDocument' + and path[3] == nil then + return '"***"' end - } + return item + end } function m.doMethod(proto) @@ -168,7 +167,7 @@ function m.doMethod(proto) local response <close> = function () local passed = os.clock() - clock if passed > 0.5 then - log.warn(('Method [%s] takes [%.3f]sec. %s'):format(method, passed, util.dump(proto, secretOption))) + log.warn(('Method [%s] takes [%.3f]sec. %s'):format(method, passed, inspect(proto, secretOption))) end --log.debug('Finish method:', method) if not proto.id then @@ -201,7 +200,7 @@ function m.doResponse(proto) local id = proto.id local waiting = m.waiting[id] if not waiting then - log.warn('Response id not found: ' .. util.dump(proto)) + log.warn('Response id not found: ' .. inspect(proto)) return end m.waiting[id] = nil diff --git a/script/provider/provider.lua b/script/provider/provider.lua index 1904301d..62284823 100644 --- a/script/provider/provider.lua +++ b/script/provider/provider.lua @@ -18,6 +18,7 @@ local filewatch = require 'filewatch' local json = require 'json' local scope = require 'workspace.scope' local furi = require 'file-uri' +local inspect = require 'inspect' ---@async local function updateConfig(uri) @@ -25,7 +26,7 @@ local function updateConfig(uri) local specified = cfgLoader.loadLocalConfig(uri, CONFIGPATH) if specified then log.info('Load config from specified', CONFIGPATH) - log.debug(util.dump(specified)) + log.debug(inspect(specified)) -- watch directory filewatch.watch(workspace.getAbsolutePath(uri, CONFIGPATH):gsub('[^/\\]+$', '')) config.update(scope.override, specified) @@ -35,13 +36,13 @@ local function updateConfig(uri) local clientConfig = cfgLoader.loadClientConfig(folder.uri) if clientConfig then log.info('Load config from client', folder.uri) - log.debug(util.dump(clientConfig)) + log.debug(inspect(clientConfig)) end local rc = cfgLoader.loadRCConfig(folder.uri, '.luarc.json') if rc then log.info('Load config from luarc.json', folder.uri) - log.debug(util.dump(rc)) + log.debug(inspect(rc)) end config.update(folder, clientConfig, rc) @@ -49,7 +50,7 @@ local function updateConfig(uri) local global = cfgLoader.loadClientConfig() log.info('Load config from client', 'fallback') - log.debug(util.dump(global)) + log.debug(inspect(global)) config.update(scope.fallback, global) end @@ -169,7 +170,7 @@ m.register 'workspace/didChangeConfiguration' { m.register 'workspace/didCreateFiles' { ---@async function (params) - log.debug('workspace/didCreateFiles', util.dump(params)) + log.debug('workspace/didCreateFiles', inspect(params)) for _, file in ipairs(params.files) do if workspace.isValidLuaUri(file.uri) then files.setText(file.uri, util.loadFile(furi.decode(file.uri)), false) @@ -180,7 +181,7 @@ m.register 'workspace/didCreateFiles' { m.register 'workspace/didDeleteFiles' { function (params) - log.debug('workspace/didDeleteFiles', util.dump(params)) + log.debug('workspace/didDeleteFiles', inspect(params)) for _, file in ipairs(params.files) do files.remove(file.uri) local childs = files.getChildFiles(file.uri) @@ -195,7 +196,7 @@ m.register 'workspace/didDeleteFiles' { m.register 'workspace/didRenameFiles' { ---@async function (params) - log.debug('workspace/didRenameFiles', util.dump(params)) + log.debug('workspace/didRenameFiles', inspect(params)) for _, file in ipairs(params.files) do local text = files.getOriginText(file.oldUri) if text then diff --git a/script/workspace/workspace.lua b/script/workspace/workspace.lua index c0385085..91923bb8 100644 --- a/script/workspace/workspace.lua +++ b/script/workspace/workspace.lua @@ -12,6 +12,7 @@ local util = require 'utility' local fw = require 'filewatch' local scope = require 'workspace.scope' local loading = require 'workspace.loading' +local inspect = require 'inspect' ---@class workspace local m = {} @@ -202,7 +203,7 @@ function m.getLibraryMatchers(scp) end scp:set('libraryMatcher', matchers) - log.debug('library matcher:', util.dump(matchers)) + log.debug('library matcher:', inspect(matchers)) return matchers end |