Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions fsharp-mode-completion.el
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,11 @@ If HOST is nil, check process on local system."
(interactive (list 'interactive))
(cl-case command
(interactive (company-begin-backend 'fsharp-ac/company-backend))
(prefix (or (fsharp-ac-get-prefix)
;; Don't pass to next backend if we are not inside a string or comment
(when (and (not (nth 3 (syntax-ppss))) (not (nth 4 (syntax-ppss))))
'stop)))
(prefix (when (not (company-in-string-or-comment))
;; Don't pass to next backend if we are not inside a string or comment
(-if-let (prefix (fsharp-ac-get-prefix))
(cons prefix t)
'stop)))
(ignore-case t)
(sorted t)
(candidates (cons :async 'fsharp-company-candidates))
Expand Down
2 changes: 0 additions & 2 deletions fsharp-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@
company-auto-complete
company-auto-complete-chars
company-idle-delay
company-minimum-prefix-length
company-require-match
company-tooltip-align-annotations
fsharp-ac-last-parsed-ticks
Expand Down Expand Up @@ -253,7 +252,6 @@
(setq company-auto-complete 't)
(setq company-auto-complete-chars ".")
(setq company-idle-delay 0.03)
(setq company-minimum-prefix-length 0)
(setq company-require-match 'nil)
(setq company-tooltip-align-annotations 't)

Expand Down