Jmaa/pretty
1
0
Fork 0
Code Actions

Fixed issue encounted when source contains a filename, but is missing '@' at the start.

Browse Source
This commit is contained in:
Jon Michael Aanes 2017-07-22 16:58:00 +02:00
parent 6d56713627
commit bb67701f8f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
function.lua
View File

@ -78,6 +78,8 @@ local FUNCTION_DEFINITION_MATCH = '.-' .. -- Look for stuff before the functio
'[ \t]*(.+)[ \t]*' .. -- Look for the function body '[ \t]*(.+)[ \t]*' .. -- Look for the function body
'end' -- Look for the end keyword 'end' -- Look for the end keyword
local LUA_FILE_PATTERN = '^%s*[%w_]+.lua%s*$'
local NR_CHARS_IN_LONG_FUNCTION_BODY = 30 local NR_CHARS_IN_LONG_FUNCTION_BODY = 30
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -111,7 +113,7 @@ local function get_function_info (f)
if info.source:sub(1,1) == '=' then info.defined_how = 'C' if info.source:sub(1,1) == '=' then info.defined_how = 'C'
elseif info.source:sub(1,1) == '@' then info.defined_how = 'file' elseif info.source:sub(1,1) == '@' then info.defined_how = 'file'
elseif info.source:find'^%w+.lua$' then info.defined_how = 'file' -- Hotfix for Love2d boot.lua issue. elseif info.source:find(LUA_FILE_PATTERN) then info.defined_how = 'file' -- Fix for when someone has misunderstood the source format is for.
else info.defined_how = 'string' else info.defined_how = 'string'
end end
@ -284,7 +286,10 @@ return function (value, depth, l, format_value)
local function_params, function_body = nil, '...' local function_params, function_body = nil, '...'
if not info.docs and info.defined_how ~= 'C' then if not info.docs and info.defined_how ~= 'C' and (depth == 0 or info.defined_how == 'string') then
-- Only look for documentation, when at depth 0, or when defined in
-- string. We don't want to open a ton of files constantly when
-- formatting a table.
info = get_function_body_info(info) info = get_function_body_info(info)
if info.body and #info.body <= NR_CHARS_IN_LONG_FUNCTION_BODY and not info.body:find '\n' and not info.body:find(FUNCTION_KEYWORD_MATCH) then if info.body and #info.body <= NR_CHARS_IN_LONG_FUNCTION_BODY and not info.body:find '\n' and not info.body:find(FUNCTION_KEYWORD_MATCH) then