Change haskell-cabal-enum-targets

Author: vlatkoB

haskell-cabal.el

@@ -445,23 +445,19 @@ OTHER-WINDOW use `find-file-other-window'."
   (plist-get section :data-start-column))
 
 (defun haskell-cabal-enum-targets ()
-  "Enumerate targets from .cabal file."
-  (defvar haskell-cabal-source-bearing-sections)
+  "Enumerate .cabal targets."
   (let ((cabal-file (haskell-cabal-find-file)))
     (when (and cabal-file (file-readable-p cabal-file))
       (with-temp-buffer
 	(insert-file-contents cabal-file)
-	(let* ((targets (mapcar (lambda (arg) (haskell-cabal--all-instances arg))
-				haskell-cabal-source-bearing-sections)))
-	  (apply #'append targets))))))
-
-(defun haskell-cabal--all-instances (target)
-  "Return list of all instances of TARGET section."
-  (goto-char (point-min))
-  (let (matches)
-    (while (re-search-forward (concat target " +\\([[:word:]-]+\\)") nil t)
-      (push (match-string 1) matches))
-    (sort matches 'string<)))
+	(haskell-cabal-mode)
+	(let (matches)
+	  (goto-char (point-min))
+	  (haskell-cabal-next-section)
+	  (while (not (eobp))
+	    (push (haskell-cabal-section-value (haskell-cabal-section)) matches)
+	    (haskell-cabal-next-section))
+	  (reverse matches))))))
 
 (defmacro haskell-cabal-with-subsection (subsection replace &rest funs)
   "Copy subsection data into a temporary buffer, save indentation