Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'fix-request-error'

 of github.com:chrisbarrett/fsharpbinding into chrisbarrett-fix-request-error

Conflicts:
	emacs/fsharp-mode-completion.el
  • Loading branch information...
commit 3425f02b08695fe7dbaa043e3c7deb6d328bdda0 2 parents feb2d62 + bf7f308
@rneatherway rneatherway authored
Showing with 9 additions and 7 deletions.
  1. +9 −7 emacs/fsharp-mode-completion.el
View
16 emacs/fsharp-mode-completion.el
@@ -272,14 +272,16 @@ display in a help buffer instead.")
(when (eq ?\. c)
(point)))))
-
(defun fsharp-ac-can-make-request ()
- (and (fsharp-ac--process-live-p)
- (not ac-completing)
- (or
- (member (expand-file-name (buffer-file-name)) fsharp-ac-project-files)
- (string-match-p (rx (or "fsx" "fsscript"))
- (file-name-extension (buffer-file-name))))))
+ "Test whether it is possible to make a request with the compiler binding.
+The current buffer must be an F# file that exists on disk."
+ (let ((file (buffer-file-name)))
+ (and file
+ (fsharp-ac--process-live-p)
+ (not ac-completing)
+ (or (member (expand-file-name file) fsharp-ac-project-files)
+ (string-match-p (rx (or "fsx" "fsscript"))
+ (file-name-extension file))))))
(defvar fsharp-ac-awaiting-tooltip nil)
Please sign in to comment.
Something went wrong with that request. Please try again.