Merge pull request emacs-lsp#164 from glyn/163-depend-on-haskell-mode

Depend on haskell-mode

Author: michaelpj

Eask

@@ -1,5 +1,5 @@
 (package "lsp-haskell"
-         "1.0"
+         "1.1"
          "Haskell support for lsp-mode")
 
 (website-url "https://github.com/emacs-lsp/lsp-haskell")
@@ -14,13 +14,13 @@
 
 (depends-on "emacs" "24.3")
 (depends-on "lsp-mode")
+(depends-on "haskell-mode")
 
 (development
  (depends-on "f")
  (depends-on "ecukes")
  (depends-on "ert-runner")
  (depends-on "el-mock")
- (depends-on "spinner")
- (depends-on "haskell-mode"))
+ (depends-on "spinner"))
 
 (setq network-security-level 'low)  ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

README.md

@@ -23,6 +23,7 @@ Do not skip this!
 It has important information.
 
 `lsp-mode` automatically requires the `lsp-haskell` package , so you do not need to `require` `lsp-haskell` unless you like being explicit.
+Similarly, `lsp-haskell` automatically requires the `haskell-mode` package, so you do not need to `require` `haskell-mode`.
 
 You will need to set some hooks to ensure that `lsp-mode` is triggered when the `haskell-mode` major mode is entered.
 

lsp-haskell.el

@@ -1,7 +1,7 @@
 ;;; lsp-haskell.el --- Haskell support for lsp-mode
 
-;; Version: 1.0
-;; Package-Requires: ((emacs "24.3") (lsp-mode "3.0"))
+;; Version: 1.1
+;; Package-Requires: ((emacs "24.3") (lsp-mode "3.0") (haskell-mode "16.1"))
 ;; Keywords: haskell
 ;; URL: https://github.com/emacs-lsp/lsp-haskell
 
@@ -29,6 +29,7 @@
 ;;; Code:
 
 (require 'lsp-mode)
+(require 'haskell-mode)
 
 ;; ---------------------------------------------------------------------
 ;; Configuration