From 98cd94d2124e0da91af7c7bad28333f1e431f350 Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Wed, 26 Feb 2025 01:38:58 -0800 Subject: [PATCH] Add aliases for lua-versions. Now you can specify "lua54" OR "lua5.4" and get what you need. --- docs/manual.md | 2 +- src/fennel-ls/docs.fnl | 14 ++++++++++---- test/diagnostic.fnl | 5 ++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/manual.md b/docs/manual.md index 6aa1573..5d6ad2e 100644 --- a/docs/manual.md +++ b/docs/manual.md @@ -104,7 +104,7 @@ The default `flsproject.fnl` settings are: ```fnl {:fennel-path "./?.fnl;./?/init.fnl;src/?.fnl;src/?/init.fnl" :macro-path "./?.fnl;./?/init-macros.fnl;./?/init.fnl;src/?.fnl;src/?/init-macros.fnl;src/?/init.fnl" - :lua-version "lua54" + :lua-version "lua5.4" :libraries {:love2d false ; requires building with love2d support :tic-80 false} :extra-globals "" diff --git a/src/fennel-ls/docs.fnl b/src/fennel-ls/docs.fnl index 4a92cf4..24c477d 100644 --- a/src/fennel-ls/docs.fnl +++ b/src/fennel-ls/docs.fnl @@ -13,10 +13,16 @@ name {:binding name :metadata (. METADATA value)})) (local lua-versions - {:lua51 (require :fennel-ls.docs.generated.lua51) - :lua52 (require :fennel-ls.docs.generated.lua52) - :lua53 (require :fennel-ls.docs.generated.lua53) - :lua54 (require :fennel-ls.docs.generated.lua54)}) + {:lua5.1 (require :fennel-ls.docs.generated.lua51) + :lua5.2 (require :fennel-ls.docs.generated.lua52) + :lua5.3 (require :fennel-ls.docs.generated.lua53) + :lua5.4 (require :fennel-ls.docs.generated.lua54)}) + +;; aliases +(set lua-versions.lua51 (. lua-versions "lua5.1")) +(set lua-versions.lua52 (. lua-versions "lua5.2")) +(set lua-versions.lua53 (. lua-versions "lua5.3")) +(set lua-versions.lua54 (. lua-versions "lua5.4")) (fn get-lua-version [version] (when (not (. lua-versions version)) diff --git a/test/diagnostic.fnl b/test/diagnostic.fnl index 5c55448..56dcf4b 100644 --- a/test/diagnostic.fnl +++ b/test/diagnostic.fnl @@ -139,7 +139,10 @@ (fn test-lua-versions [] (check "(local t (unpack []))" [] [{:message "unknown identifier: unpack"}] - {:lua-version "lua51"}) + {:lua-version "lua5.1"}) + (check "(local t (unpack []))" + [{:message "unknown identifier: unpack"}] [] + {:lua-version "lua5.2"}) (check "(local t (unpack []))" [{:message "unknown identifier: unpack"}] [] {:lua-version "lua52"})