From d5986005977a8f423ae7ef27b82184cead3087e9 Mon Sep 17 00:00:00 2001 From: Frank Staals Date: Thu, 2 Feb 2023 21:06:28 +0100 Subject: [PATCH 1/3] fixing loading libraries when there are multiple targets --- haskell-cabal.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/haskell-cabal.el b/haskell-cabal.el index 99a07e94..8eeb10f8 100644 --- a/haskell-cabal.el +++ b/haskell-cabal.el @@ -515,9 +515,9 @@ PROCESS-TYPE determines the format of the returned target." (val (car (split-string (haskell-cabal-section-value section))))) (if (equal (downcase component-type) "library") - (let ((lib-target (if (eq 'stack-ghci process-type) - (concat package-name ":lib") - (concat "lib:" package-name)))) + (let* ((lib-name (if (eq 'val "") package-name val)) + (lib-target (concat package-name ":" lib-name)) + ) (push lib-target matches)) (push (concat (when (eq 'stack-ghci process-type) (concat package-name ":")) From f95b818662b625af6d7210d1451e1bb1fcbb455b Mon Sep 17 00:00:00 2001 From: Frank Staals Date: Thu, 2 Feb 2023 21:37:34 +0100 Subject: [PATCH 2/3] fixed stack syntax --- haskell-cabal.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/haskell-cabal.el b/haskell-cabal.el index 8eeb10f8..79758ae6 100644 --- a/haskell-cabal.el +++ b/haskell-cabal.el @@ -515,7 +515,9 @@ PROCESS-TYPE determines the format of the returned target." (val (car (split-string (haskell-cabal-section-value section))))) (if (equal (downcase component-type) "library") - (let* ((lib-name (if (eq 'val "") package-name val)) + (let* ((lib-name (if (not val) + (if (eq 'stack-ghci process-type) "lib" package-name) + val)) (lib-target (concat package-name ":" lib-name)) ) (push lib-target matches)) From 5d7fd54aec72031d78910411816d5619425a6ec5 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Wed, 22 Mar 2023 00:26:28 +1300 Subject: [PATCH 3/3] Tidy up conditional --- haskell-cabal.el | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/haskell-cabal.el b/haskell-cabal.el index 79758ae6..bd341376 100644 --- a/haskell-cabal.el +++ b/haskell-cabal.el @@ -515,11 +515,8 @@ PROCESS-TYPE determines the format of the returned target." (val (car (split-string (haskell-cabal-section-value section))))) (if (equal (downcase component-type) "library") - (let* ((lib-name (if (not val) - (if (eq 'stack-ghci process-type) "lib" package-name) - val)) - (lib-target (concat package-name ":" lib-name)) - ) + (let* ((lib-name (or val (if (eq 'stack-ghci process-type) "lib" package-name))) + (lib-target (concat package-name ":" lib-name))) (push lib-target matches)) (push (concat (when (eq 'stack-ghci process-type) (concat package-name ":"))