mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-06-16 18:19:55 +00:00
9b3cadf57c
The main purpose of this is to backport the improved parse/runtime errors to older versions. I think they're sufficiently useful that we should try to make it as widely available as possible. We've been running them for a week now on SC3 and the released version and not seen any issues, so I think it's probably stable enough. This is a pretty lazy commit: I ended up copying the whole ROM over and then picking up a few other related changes along the way. - Trim spaces from file paths (b8fce1eecc) - Correctly format 12AM/PM with %I (9f48395596) - Fix http.request and htpt.websocketAsync not handling a few failure edge-cases correctly (3b42f22a4f). - Move the internal modules into the main package path, hidden under cc.internal (34a31abd9c). - Gather code coverage in Java instead of Lua (28a55349a9). - Make error messages in edit more obvious (8cfbfe7ceb). - Make mcfly's test methods global. This means we don't need to pass stub everywhere (7335a892b5). - Improve runtime and parse errors. This comes from numerous commits, but chieflya12b405acf, and5502412181. - Hide the internal redirect methods in multishell (33b6f38339). Note this does /not/ include the shebang changes (sorry Emma!). I've tried to avoid adding any user-controllable features, mostly because I don't know how to handle the versioning otherwise :).
117 lines
3.3 KiB
Common Lisp
117 lines
3.3 KiB
Common Lisp
; -*- mode: Lisp;-*-
|
|
|
|
(sources
|
|
/doc/
|
|
/build/docs/luaJavadoc/
|
|
/src/main/resources/*/computercraft/lua/bios.lua
|
|
/src/main/resources/*/computercraft/lua/rom/
|
|
/src/test/resources/test-rom
|
|
/src/web/mount)
|
|
|
|
|
|
(doc
|
|
(destination build/illuaminate)
|
|
(index doc/index.md)
|
|
|
|
(site
|
|
(title "CC: Tweaked")
|
|
(logo src/main/resources/pack.png)
|
|
(url https://tweaked.cc/)
|
|
(source-link https://github.com/cc-tweaked/CC-Tweaked/blob/${commit}/${path}#L${line})
|
|
|
|
(styles src/web/styles.css)
|
|
(scripts build/rollup/index.js)
|
|
(head doc/head.html))
|
|
|
|
(module-kinds
|
|
(peripheral Peripherals)
|
|
(generic_peripheral "Generic Peripherals")
|
|
(event Events)
|
|
(guide Guides)
|
|
(reference Reference))
|
|
|
|
(library-path
|
|
/doc/stub/
|
|
/build/docs/luaJavadoc/
|
|
|
|
/src/main/resources/*/computercraft/lua/rom/apis/
|
|
/src/main/resources/*/computercraft/lua/rom/apis/command/
|
|
/src/main/resources/*/computercraft/lua/rom/apis/turtle/
|
|
|
|
/src/main/resources/*/computercraft/lua/rom/modules/main/
|
|
/src/main/resources/*/computercraft/lua/rom/modules/command/
|
|
/src/main/resources/*/computercraft/lua/rom/modules/turtle/))
|
|
|
|
(at /
|
|
(linters
|
|
syntax:string-index
|
|
|
|
;; It'd be nice to avoid this, but right now there's a lot of instances of
|
|
;; it.
|
|
-var:set-loop
|
|
|
|
;; It's useful to name arguments for documentation, so we allow this. It'd
|
|
;; be good to find a compromise in the future, but this works for now.
|
|
-var:unused-arg)
|
|
|
|
(lint
|
|
(bracket-spaces
|
|
(call no-space)
|
|
(function-args no-space)
|
|
(parens no-space)
|
|
(table space)
|
|
(index no-space))
|
|
|
|
(allow-clarifying-parens true)
|
|
|
|
;; colours imports from colors, and we don't handle that right now.
|
|
;; keys is entirely dynamic, so we skip it.
|
|
(dynamic-modules colours keys _G)
|
|
|
|
(globals
|
|
:max
|
|
_CC_DEFAULT_SETTINGS
|
|
_CC_DISABLE_LUA51_FEATURES
|
|
_HOST
|
|
;; Ideally we'd pick these up from bios.lua, but illuaminate currently
|
|
;; isn't smart enough.
|
|
sleep write printError read rs)))
|
|
|
|
;; We disable the unused global linter in bios.lua and the APIs. In the future
|
|
;; hopefully we'll get illuaminate to handle this.
|
|
(at
|
|
(/src/main/resources/*/computercraft/lua/bios.lua
|
|
/src/main/resources/*/computercraft/lua/rom/apis/)
|
|
(linters -var:unused-global)
|
|
(lint (allow-toplevel-global true)))
|
|
|
|
;; Silence some variable warnings in documentation stubs.
|
|
(at (/doc/stub/ /build/docs/luaJavadoc/)
|
|
(linters -var:unused-global)
|
|
(lint (allow-toplevel-global true)))
|
|
|
|
;; Suppress warnings for currently undocumented modules.
|
|
(at
|
|
(; Lua APIs
|
|
/src/main/resources/*/computercraft/lua/rom/apis/io.lua
|
|
/src/main/resources/*/computercraft/lua/rom/apis/window.lua)
|
|
|
|
(linters -doc:undocumented -doc:undocumented-arg -doc:undocumented-return))
|
|
|
|
;; Suppress warnings for various APIs using its own deprecated members.
|
|
(at
|
|
(/src/main/resources/*/computercraft/lua/bios.lua
|
|
/src/main/resources/*/computercraft/lua/rom/apis/turtle/turtle.lua)
|
|
(linters -var:deprecated))
|
|
|
|
(at /src/test/resources/test-rom
|
|
; We should still be able to test deprecated members.
|
|
(linters -var:deprecated)
|
|
|
|
(lint
|
|
(globals
|
|
:max sleep write
|
|
cct_test describe expect howlci fail it pending stub before_each)))
|
|
|
|
(at /src/web/mount/expr_template.lua (lint (globals :max __expr__)))
|