feat(cache): Store cached luacheck values per-version in case of changes

lunarmodules · Aug 4, 2022 · 88d127d · 88d127d
1 parent 815cf79
commit 88d127d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/spec/config_spec.lua b/spec/config_spec.lua
@@ -1,10 +1,12 @@
 local lfs = require "lfs"
 
+local luacheck = require "luacheck"
 local config = require "luacheck.config"
 local fs = require "luacheck.fs"
 local cur_dir = lfs.currentdir()
 local P = fs.normalize
 local function AP(p) return P(fs.join(cur_dir, p)) end
+local function cache_dir(p) return P(fs.join(cur_dir, p, luacheck._VERSION)) end
 
 local function nest(dir, func)
    local backed = false
@@ -172,7 +174,7 @@ describe("config", function()
             formatter = "helper.fmt",
             formatter_anchor_dir = P(cur_dir),
             jobs = false,
-            cache = AP("something.luacheckcache"),
+            cache = cache_dir("something.luacheckcache"),
             include_files = {
                AP("foo"),
                AP("bar")
@@ -197,7 +199,7 @@ describe("config", function()
             formatter = "helper.fmt2",
             formatter_anchor_dir = P(cur_dir),
             jobs = false,
-            cache = AP("something.luacheckcache"),
+            cache = cache_dir("something.luacheckcache"),
             include_files = {
                AP("foo"),
                AP("bar"),

diff --git a/src/luacheck/config.lua b/src/luacheck/config.lua
@@ -5,6 +5,7 @@ local fs = require "luacheck.fs"
 local globbing = require "luacheck.globbing"
 local standards = require "luacheck.standards"
 local utils = require "luacheck.utils"
+local luacheck = require "luacheck"
 
 local config = {}
 
@@ -475,12 +476,16 @@ function ConfigStack:get_top_options()
       if conf.options.cache ~= nil then
          if conf.options.cache == true then
             if not res.cache then
-               res.cache = fs.normalize(fs.join(last_anchor_dir or current_dir, cache.get_default_dir()))
+               res.cache = fs.normalize(fs.join(
+                  last_anchor_dir or current_dir,
+                  cache.get_default_dir(),
+                  luacheck._VERSION
+               ))
             end
          elseif conf.options.cache == false then
             res.cache = false
          else
-            res.cache = fs.normalize(fs.join(anchor_dir, conf.options.cache))
+            res.cache = fs.normalize(fs.join(anchor_dir, conf.options.cache, luacheck._VERSION))
          end
       end
    end