diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc50592..1f8f972 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,3 +37,11 @@ jobs: XDG_STATE_HOME: ${{ github.workspace }}/.local/state XDG_CACHE_HOME: ${{ github.workspace }}/.cache run: make test + + - name: Ensure No util.R in code + env: + XDG_CONFIG_HOME: ${{ github.workspace }}/.config + XDG_DATA_HOME: ${{ github.workspace }}/.local/share + XDG_STATE_HOME: ${{ github.workspace }}/.local/state + XDG_CACHE_HOME: ${{ github.workspace }}/.cache + run: make ensure-no-util-r diff --git a/Makefile b/Makefile index 3d8fa51..f562a80 100644 --- a/Makefile +++ b/Makefile @@ -15,3 +15,6 @@ test: test-watch: nodemon -e lua -x "$(MAKE) test || exit 1" + +ensure-no-util-r: + ! grep --exclude-dir=.git -r 'util.R' | grep -v '\-\-' diff --git a/TODO.md b/TODO.md index dcf7d59..2522e25 100644 --- a/TODO.md +++ b/TODO.md @@ -1,5 +1,4 @@ # TODO -* Check for errant util.log or util.R usages in CI/local * Get more languages into movement/highlight/swap specs * :help treesitter-parsers diff --git a/plugin/init.lua b/plugin/init.lua index 1b6f6fb..078ad1f 100644 --- a/plugin/init.lua +++ b/plugin/init.lua @@ -1,7 +1,7 @@ local function tw() - -- local util = require "treewalker.util" - -- return util.R('treewalker') - return require('treewalker') + local util = require "treewalker.util" + return util.R('treewalker') + -- return require('treewalker') end local subcommands = {