branch: elpa/haskell-tng-mode
commit ef7f335b3d86fe9ae3326fe1d7c957fe4d8b65a4
Author: Tseen She <ts33n....@gmail.com>
Commit: Tseen She <ts33n....@gmail.com>
note stack compatibility
---
README.md | 2 +-
haskell-tng-compile.el | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index f0b6db3..e55658c 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ This is the status of core features:
- [x] `stylish-haskell` support
- Compiling:
- [x] `haskell-tng-compile` for `cabal` batch commands
- - [x] `stack` support (via `stack2cabal`)
+ - [x] `stack` support (via `stack2cabal` or customise
`haskell-tng-compile:*`)
- [ ] `comint-mode` based `ghc` repl
Compatibility with `lsp-mode` /
[`haskell-ide-engine`](https://github.com/haskell/haskell-ide-engine) is
important for more advanced IDE features.
diff --git a/haskell-tng-compile.el b/haskell-tng-compile.el
index 6ae8360..b1147c0 100644
--- a/haskell-tng-compile.el
+++ b/haskell-tng-compile.el
@@ -12,6 +12,9 @@
(require 'compile)
(require 'ansi-color)
+(require 'subr-x)
+
+(require 'haskell-tng-util)
;; TODO prettify-symbol rules for home dirs, project dirs, and hide .o files,
etc
;; TODO set compilation-directory when opening the file
@@ -97,7 +100,8 @@ will cause the subsequent call to prompt."
(when-let (default-directory
(haskell-tng:locate-dominating-file
(rx (| "cabal.project" "cabal.project.local"
"cabal.project.freeze"
- (: (+ any) ".cabal")))))
+ (: (+ any) ".cabal")
+ "package.yaml" "stack.yaml"))))
(compilation-start
command
'haskell-tng-compilation-mode
