diff --git a/Makefile b/Makefile index 1ee8f8c..212b40e 100644 --- a/Makefile +++ b/Makefile @@ -6,18 +6,17 @@ EXE=fennel-ls SRC:=$(shell find src -name "*.fnl") -BUILD_DIR=./build - DESTDIR ?= PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin -FENNELFLAGS=--add-package-path "src/?.lua;deps/?.lua" --add-fennel-path "src/?.fnl;deps/?.fnl" +FENNELFLAGS=--add-package-path "deps/?.lua" --add-fennel-path "src/?.fnl;deps/?.fnl" REQUIRE_AS_INCLUDE_SETTINGS=$(shell $(FENNEL) tools/require-flags.fnl) ROCKSPEC_LATEST_SCM=rockspecs/fennel-ls-scm-$(shell ls rockspecs | grep -Eo 'scm-[0-9]+' | grep -Eo [0-9]+ | sort -n | tail -1).rockspec -.PHONY: all clean test repl install docs install-deps ci selflint count +.PHONY: all clean test repl install docs install-deps ci selflint \ + rm-docs rm-deps count all: $(EXE) diff --git a/src/fennel-ls/compiler.fnl b/src/fennel-ls/compiler.fnl index 4f8d43c..9809db3 100644 --- a/src/fennel-ls/compiler.fnl +++ b/src/fennel-ls/compiler.fnl @@ -365,9 +365,7 @@ identifiers are declared / referenced in which places." (λ parsed [ast] "runs on every ast tree that was parsed" - ;; TODO in fennel 1.5+, bug fennel#221 will be fixed, and all syms in the ast should have a bytestart - ;; the extra check can be removed - (if (and (sym? ast) ast.bytestart) + (if (sym? ast) (case (values (tostring ast) (file.text:sub ast.bytestart ast.bytestart)) (where (:hashfn "#")) (table.insert defer #(set ast.byteend ast.bytestart)) diff --git a/test/completion.fnl b/test/completion.fnl index cc9cf15..653eb4b 100644 --- a/test/completion.fnl +++ b/test/completion.fnl @@ -199,7 +199,7 @@ {:label #(= nil $)}]) (check "(let [x (fn x [a b c] - \"\"\"docstring\"\"\" + \"docstring\" nil) t {: x}] (t."