diff --git a/.vscode/launch.json b/.vscode/launch.json index dad13e8..6b867cd 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -20,7 +20,7 @@ }, "args": [ "test", - "_spec" // Adapt to the spec to debug + "\"--pattern _spec --tags debug\"" ], "scriptFiles": ["${workspaceFolder}/**/*.tl"] } diff --git a/justfile b/justfile index 5fbf8d6..772de37 100644 --- a/justfile +++ b/justfile @@ -64,12 +64,12 @@ validate: check \ awesomerc.tl -test PATTERN="_spec": +test PARAMETERS="--pattern=_spec": luarocks \ --lua-version {{ lua_version }} \ test \ {{ rockspec_file }} \ - -- --pattern={{ PATTERN }} + -- {{ PARAMETERS }} local-test PATTERN="_spec": luarocks \ diff --git a/spec/scraper/module_doc_spec.tl b/spec/scraper/module_doc_spec.tl index b01a74c..94f5d22 100644 --- a/spec/scraper/module_doc_spec.tl +++ b/spec/scraper/module_doc_spec.tl @@ -27,6 +27,7 @@ describe("Scrap documentation", function() name = "Empty", module_path = "empty", dependencies = {}, + global = false, token = "module", })) @@ -89,6 +90,7 @@ describe("Scrap documentation", function() name = "Property_signal", module_path = "property_signal", dependencies = {}, + global = false, token = "module", })) @@ -202,6 +204,7 @@ describe("Scrap documentation", function() name = "Property_enum", module_path = "property_enum", dependencies = {}, + global = false, token = "module", })) @@ -244,6 +247,7 @@ describe("Scrap documentation", function() name = "Property_string", module_path = "property_string", dependencies = {}, + global = false, token = "module", })) @@ -311,6 +315,7 @@ describe("Scrap documentation", function() name = "Tag", module_path = "awful.tag", dependencies = {}, + global = false, token = "module", })) @@ -363,6 +368,7 @@ describe("Scrap documentation", function() name = "Signal", module_path = "signal", dependencies = {}, + global = false, token = "module", })) @@ -450,7 +456,7 @@ describe("Scrap documentation", function() token = "variable", }, }, - return_types = { "boolean" }, + return_types = { { "boolean" }}, name = "kill", token = "function", } @@ -458,10 +464,11 @@ describe("Scrap documentation", function() name = "Awesome", module_path = "awesome", dependencies = {}, + global = false, token = "module", })) - it("should produce a Record node when a function parameter is a named-parameter-table", test( + it("should produce a Record node when a function parameter is a named-parameter-table #debug", test( [[

Static module functions @@ -566,6 +573,7 @@ describe("Scrap documentation", function() } }, name = "Focused_Args", + global = false, token = "record", }, { @@ -576,7 +584,7 @@ describe("Scrap documentation", function() token = "variable", }, }, - return_types = { "screen" }, + return_types = { { "screen" }}, name = "focused", token = "function", }, @@ -584,6 +592,7 @@ describe("Scrap documentation", function() name = "Screen", module_path = "awful.screen", dependencies = {}, + global = false, token = "module", })) @@ -667,7 +676,7 @@ describe("Scrap documentation", function() token = "variable", } }, - return_types = { "table" }, + return_types = { { "table" }}, name = "crush", token = "function", } @@ -675,6 +684,7 @@ describe("Scrap documentation", function() name = "Table", module_path = "gears.table", dependencies = {}, + global = false, token = "module", })) @@ -759,7 +769,7 @@ describe("Scrap documentation", function() token = "variable", }, }, - return_types = { "table" }, + return_types = { { "table" } }, name = "tags", token = "function", }, @@ -767,6 +777,7 @@ describe("Scrap documentation", function() name = "Client", module_path = "awful.client", dependencies = {}, + global = false, token = "module", })) @@ -810,12 +821,13 @@ describe("Scrap documentation", function() name = "Client", module_path = "awful.client", dependencies = {}, + global = false, token = "module", }, { { parameters = {}, - return_types = { "integer" }, + return_types = { { "integer" } }, name = "client.instances", token = "function", } diff --git a/src/awesomewmdtl/scraper/module_doc.tl b/src/awesomewmdtl/scraper/module_doc.tl index 5063d99..51353ae 100644 --- a/src/awesomewmdtl/scraper/module_doc.tl +++ b/src/awesomewmdtl/scraper/module_doc.tl @@ -119,6 +119,7 @@ local function extract_function_return_types(ol_html: string): { { string } } end):iter() do table.insert(ts, t) end + table.insert(types, ts) end return types end