From 90fa6923031a2aad6e6ee5e4cd8167c9e7a33e29 Mon Sep 17 00:00:00 2001
From: Sage Vaillancourt <sage@sagev.space>
Date: Sun, 9 Feb 2025 14:47:37 -0500
Subject: [PATCH] Fix linting

Use .styluaignore instead of Makefile hacks to ignore generated files.
---
 .styluaignore        | 1 +
 Makefile             | 5 ++---
 src/action-queue.lua | 7 ++-----
 src/ball.lua         | 1 -
 src/baserunning.lua  | 2 +-
 src/draw/overlay.lua | 7 +------
 src/fielding.lua     | 4 ++--
 src/main.lua         | 1 -
 src/utils.lua        | 2 +-
 9 files changed, 10 insertions(+), 20 deletions(-)
 create mode 100644 .styluaignore

diff --git a/.styluaignore b/.styluaignore
new file mode 100644
index 0000000..c7a9bba
--- /dev/null
+++ b/.styluaignore
@@ -0,0 +1 @@
+src/assets.lua
diff --git a/Makefile b/Makefile
index 5bee817..4f2c077 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 SOURCE_FILES := $(shell grep "import '" src/main.lua | grep -v CoreLibs | sed "s/.*'\(.*\)'.*/src\/\1/") src/main.lua
-GENERATED_FILES := src/assets.lua
 
 all:
 	pdc --skip-unknown src BatterUp.pdx
@@ -8,11 +7,11 @@ assets:
 	lua lib/preprocess-cl.lua src/assets.lua2p
 
 check: assets
-	stylua -c --indent-type Spaces -g "*.lua" -g "!${GENERATEED_FILES}" src/
+	stylua -c --indent-type Spaces src/
 	cat __stub.ext.lua <(sed 's/^function/-- selene: allow(unused_variable)\nfunction/' ${PLAYDATE_SDK_PATH}/CoreLibs/__types.lua) ${SOURCE_FILES} | grep -v '^import' | sed 's/<const>//g' | selene -
 
 test: check
 	(cd src; find ./test -name '*lua' | xargs -L1 lua)
 
 lint:
-	stylua --indent-type Spaces -g "*.lua" -g "!${GENERATEED_FILES}" src/
+	stylua --indent-type Spaces src/
diff --git a/src/action-queue.lua b/src/action-queue.lua
index f239475..2cfcb5e 100644
--- a/src/action-queue.lua
+++ b/src/action-queue.lua
@@ -41,11 +41,8 @@ function actionQueue:runWaiting(deltaSeconds)
     local currentTimeMs = playdate.getCurrentTimeMilliseconds()
     for name, actionObject in pairs(self.queue) do
         local result = actionObject.action(deltaSeconds)
-        if
-            result ~= ActionResult.NeedsMoreTime
-            or currentTimeMs > actionObject.expireTimeMs
-        then
+        if result ~= ActionResult.NeedsMoreTime or currentTimeMs > actionObject.expireTimeMs then
             self.queue[name] = nil
         end
     end
-end
\ No newline at end of file
+end
diff --git a/src/ball.lua b/src/ball.lua
index dbaeb72..fa24d5b 100644
--- a/src/ball.lua
+++ b/src/ball.lua
@@ -59,4 +59,3 @@ function Ball:launch(destX, destY, easingFunc, flyTimeMs, floaty, customBallScal
         self.floatAnimator:reset(flyTimeMs)
     end
 end
-
diff --git a/src/baserunning.lua b/src/baserunning.lua
index 705e58f..abe4c06 100644
--- a/src/baserunning.lua
+++ b/src/baserunning.lua
@@ -27,7 +27,7 @@ function Baserunning.new(announcer)
         --- Since this object is what ultimately *mutates* the out count,
         --- it seems sensible to store the value here.
         outs = 0,
-        announcer = announcer
+        announcer = announcer,
     }, { __index = Baserunning })
 
     o.batter = o:newRunner()
diff --git a/src/draw/overlay.lua b/src/draw/overlay.lua
index 4d88162..df970ac 100644
--- a/src/draw/overlay.lua
+++ b/src/draw/overlay.lua
@@ -28,12 +28,7 @@ function drawMinimap(runners, fielders)
     for _, fielder in pairs(fielders) do
         local x = (MinimapMultX * fielder.x) + MinimapOffsetX
         local y = (MinimapMultY * fielder.y) + MinimapOffsetY
-        if
-            x > MinimapPosX
-            and x < MinimapBoundX
-            and y > MinimapPosY
-            and y < MinimapBoundY
-        then
+        if x > MinimapPosX and x < MinimapBoundX and y > MinimapPosY and y < MinimapBoundY then
             gfx.drawCircleAtPoint(x, y, FielderCircleRadius)
         end
     end
diff --git a/src/fielding.lua b/src/fielding.lua
index a2cdda5..5362618 100644
--- a/src/fielding.lua
+++ b/src/fielding.lua
@@ -144,7 +144,7 @@ end
 ---@param throwFlyMs number
 function Fielding:playerThrowTo(targetBase, launchBall, throwFlyMs)
     local maxTryTimeMs = 5000
-    actionQueue:upsert('playerThrowTo', maxTryTimeMs, function()
+    actionQueue:upsert("playerThrowTo", maxTryTimeMs, function()
         return playerThrowToImpl(self, targetBase, launchBall, throwFlyMs)
     end)
-end
\ No newline at end of file
+end
diff --git a/src/main.lua b/src/main.lua
index cc6cbaa..f76c36a 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -200,7 +200,6 @@ local function outRunner(runner, message)
             end
         end
     end)
-
 end
 
 ---@param scoredRunCount number
diff --git a/src/utils.lua b/src/utils.lua
index 8e9a1f7..8300750 100644
--- a/src/utils.lua
+++ b/src/utils.lua
@@ -31,7 +31,7 @@ function utils.staticAnimator(value)
         currentValue = function(_)
             return value
         end,
-        reset = function(_) end
+        reset = function(_) end,
     }
 end