Skip to content

Commit

Permalink
Merge pull request #108 from BuckarooBanzay/minetest-builtin
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed May 18, 2024
2 parents 418f489 + 494b0f1 commit 7897788
Show file tree
Hide file tree
Showing 6 changed files with 504 additions and 4 deletions.
1 change: 1 addition & 0 deletions luacheck-dev-1.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ build = {
luacheck = "src/luacheck/init.lua",
["luacheck.builtin_standards"] = "src/luacheck/builtin_standards/init.lua",
["luacheck.builtin_standards.love"] = "src/luacheck/builtin_standards/love.lua",
["luacheck.builtin_standards.minetest"] = "src/luacheck/builtin_standards/minetest.lua",
["luacheck.builtin_standards.playdate"] = "src/luacheck/builtin_standards/playdate.lua",
["luacheck.builtin_standards.ngx"] = "src/luacheck/builtin_standards/ngx.lua",
["luacheck.cache"] = "src/luacheck/cache.lua",
Expand Down
22 changes: 18 additions & 4 deletions spec/cli_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ spec/samples/python_code.lua:1:6: (E011) expected '=' near '__future__'
end)

it("expands folders", function()
assert.matches("^Total: %d+ warnings / %d+ errors in 27 files\n$", get_output "spec/samples -qqq --no-config --exclude-files spec/samples/global_fields.lua")
assert.matches("^Total: %d+ warnings / %d+ errors in 28 files\n$", get_output "spec/samples -qqq --no-config --exclude-files spec/samples/global_fields.lua")
end)

it("uses --include-files when expanding folders", function()
Expand Down Expand Up @@ -1242,6 +1242,7 @@ Checking spec/samples/globals.lua 2 warnings
Checking spec/samples/indirect_globals.lua 3 warnings
Checking spec/samples/inline_options.lua 7 warnings / 2 errors
Checking spec/samples/line_length.lua 8 warnings
Checking spec/samples/minetest.lua 2 warnings
Checking spec/samples/python_code.lua 1 error
Checking spec/samples/read_globals.lua 5 warnings
Checking spec/samples/read_globals_inline_options.lua 3 warnings
Expand All @@ -1252,7 +1253,7 @@ Checking spec/samples/unused_secondaries.lua 4 warnings
Checking spec/samples/utf8.lua 4 warnings
Checking spec/samples/utf8_error.lua 1 error
Total: 73 warnings / 9 errors in 20 files
Total: 75 warnings / 9 errors in 21 files
]]):gsub("(spec/samples)/", "%1"..package.config:sub(1, 1)),
get_output "spec/samples --config=spec/configs/exclude_files_config.luacheckrc -qq --exclude-files spec/samples/global_fields.lua")
end)
Expand All @@ -1268,6 +1269,7 @@ Checking globals.lua 2 warnings
Checking indirect_globals.lua 3 warnings
Checking inline_options.lua 7 warnings / 2 errors
Checking line_length.lua 8 warnings
Checking minetest.lua 2 warnings
Checking python_code.lua 1 error
Checking read_globals.lua 5 warnings
Checking read_globals_inline_options.lua 3 warnings
Expand All @@ -1278,7 +1280,7 @@ Checking unused_secondaries.lua 4 warnings
Checking utf8.lua 4 warnings
Checking utf8_error.lua 1 error
Total: 73 warnings / 9 errors in 20 files
Total: 75 warnings / 9 errors in 21 files
]], get_output(". --config=spec/configs/exclude_files_config.luacheckrc -qq --exclude-files global_fields.lua", "spec/samples/"))
end)

Expand All @@ -1293,6 +1295,7 @@ Checking globals.lua 2 warnings
Checking indirect_globals.lua 3 warnings
Checking inline_options.lua 7 warnings / 2 errors
Checking line_length.lua 8 warnings
Checking minetest.lua 2 warnings
Checking python_code.lua 1 error
Checking redefined.lua 7 warnings
Checking reversed_fornum.lua 1 warning
Expand All @@ -1301,7 +1304,7 @@ Checking unused_secondaries.lua 4 warnings
Checking utf8.lua 4 warnings
Checking utf8_error.lua 1 error
Total: 65 warnings / 9 errors in 18 files
Total: 67 warnings / 9 errors in 19 files
]], get_output(". --config=spec/configs/exclude_files_config.luacheckrc -qq --exclude-files global_fields.lua --exclude-files " .. quote("./read*"), "spec/samples/"))
end)

Expand Down Expand Up @@ -1351,6 +1354,17 @@ Total: 1 warning / 0 errors in 1 file
]], get_output "spec/samples/globals.lua --config=spec/configs/import_config.luacheckrc")
end)

describe("responds to builtin std preset", function()
it("minetest", function()
-- make sure minetest sample has something that normally throws a lint error
assert.equal(1, get_exitcode "spec/samples/minetest.lua --no-config")
-- turning on minetest std should pass all lints
assert.equal(0, get_exitcode "spec/samples/minetest.lua --no-config --std minetest")
-- confirm minetest std set isn't just blindly allowing anything
assert.equal(1, get_exitcode "spec/samples/sample.rockspec --no-config --std minetest")
end)
end)

describe("global path", function()
setup(function()
os.rename(".luacheckrc", ".luacheckrc.bak")
Expand Down
2 changes: 2 additions & 0 deletions spec/samples/minetest.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
local _ = minetest
local _ = minetest.get_current_modname()
3 changes: 3 additions & 0 deletions src/luacheck/builtin_standards/init.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
local love = require "luacheck.builtin_standards.love"
local minetest = require "luacheck.builtin_standards.minetest"
local playdate = require "luacheck.builtin_standards.playdate"
local ngx = require "luacheck.builtin_standards.ngx"
local standards = require "luacheck.standards"
Expand Down Expand Up @@ -296,6 +297,8 @@ builtin_standards.busted = {

builtin_standards.love = love

builtin_standards.minetest = minetest

builtin_standards.playdate = playdate

builtin_standards.rockspec = {
Expand Down
Loading

0 comments on commit 7897788

Please sign in to comment.