Skip to content

Introduce completion candidates limit, minor fixes #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Introduce completion candidates limit, minor fixes #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
359f70d
Introduce completion candidates limit customization
geraldus Jul 23, 2015
196936e
Define a safe function to get completion candidates limit
geraldus Jul 23, 2015
a14f0c9
Take completion candidates limit into account
geraldus Jul 23, 2015
66e822a
Disable dabbrev completions mechanism
geraldus Jul 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 38 additions & 10 deletions haskell-completions.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
(require 'haskell-mode)
(require 'haskell-process)
(require 'haskell-interactive-mode)
(require 'haskell-customize)

(defvar haskell-completions-pragma-names
(list "DEPRECATED"
Expand Down Expand Up @@ -248,10 +249,10 @@ Returns nil if no completions available."
;; for completions list in case of module name or
;; identifier prefixes
(haskell-completions-sync-complete-repl pfx imp)))))
(when (or (equal '("") lst)
(eql nil lst))
;; complete things using dabbrev
(setq lst (haskell-completions-dabbrev-completions pfx)))
;; (when (or (equal '("") lst)
;; (eql nil lst))
;; ;; complete things using dabbrev
;; (setq lst (haskell-completions-dabbrev-completions pfx)))
(when lst
(list beg end lst)))))))

Expand All @@ -264,13 +265,40 @@ function is supposed for internal use."
(haskell-interactive-process)
(if import
(concat "import " prefix)
prefix)))
prefix)
(haskell-completions-get-candidates-limit)))

;; (defun haskell-completions-dabbrev-completions (prefix)
;; "Return completion list for PREFIX using dabbrev facility.
;; This function is supposed for internal use."
;; (let ((limit (haskell-completions-get-candidates-limit)))
;; (dabbrev--reset-global-variables)
;; (if limit
;; (haskell-completions-dabbrev-find-limit-expansions prefix limit)
;; (dabbrev--find-all-expansions prefix nil))))

;; (defun haskell-completions-dabbrev-find-limit-expansions (prefix limit)
;; "Search list of dabbrev expansions for PREFIX limited by LIMIT."
;; ;; The idea stolen from http://emacswiki.org/emacs/ac-dabbrev.el
;; (let ((i 0)
;; (all-expansions nil)
;; expansion)
;; (while (and (< i limit)
;; (setq expansion (dabbrev--find-expansion prefix -1 nil)))
;; (setq all-expansions (cons expansion all-expansions))
;; ;; Note: sometimes dabbrev expansions return such list:
;; ;; m ma map mapC ... mapConcat
;; ;; this is the best place to introduce workaround for this stuff.
;; (setq i (+ i 1)))
;; all-expansions))

(defun haskell-completions-get-candidates-limit ()
"Return valid completion candidates limit."
(if (and haskell-completion-candidates-limit
(< haskell-completion-candidates-limit 1))
nil
haskell-completion-candidates-limit))

(defun haskell-completions-dabbrev-completions (prefix)
"Return completion list for PREFIX using dabbrev facility.
This function is supposed for internal use."
(dabbrev--reset-global-variables)
(dabbrev--find-all-expansions prefix nil))

(provide 'haskell-completions)
;;; haskell-completions.el ends here
9 changes: 9 additions & 0 deletions haskell-customize.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,15 @@ same vein as `haskell-indent-spaces'."
:group 'haskell
:type '(repeat 'string))

(defcustom haskell-completion-candidates-limit
100
"Maximum number of completion candidates. Value must be
positive integer to take effect. In othercase completion
candidates count supposed to be unlimited. Some predifed
completions sources (e.g. pragma completions) currently ignore
this option."
:group 'haskell
:type '(integer))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Accessor functions
Expand Down