Merge pull request #227 from juergenhoetzel/LSP-part2

Lsp part2

Author: juergenhoetzel

.travis.yml

@@ -28,6 +28,7 @@ before_install:
   - sudo dpkg -i packages-microsoft-prod.deb
   - sudo apt-get update
   - sudo apt-get install apt-transport-https
+  - sudo apt-get update
   - sudo apt-get install dotnet-sdk-2.1
   - export PATH="$HOME/bin:$PATH"
   - export EMACS=$EMACS_VERSION

Makefile

@@ -21,11 +21,12 @@ build: elpa version
 version:
 	$(EMACS) --version
 
-test/Test1/project.assets.json:
+test/Test1/restored:
 	dotnet restore test/Test1
+	touch test/Test1/restored
 
-test: version build test/eglot-tests.el test/Test1/project.assets.json
-	$(CASK) exec buttercup -L . -L ./test
+test: version build test/eglot-tests.el test/Test1/restored
+	$(CASK) exec buttercup -L . -L ./test --traceback full
 
 clean:
 	rm -f .depend elpa-$(EMACS) $(OBJECTS) $(PKG)-autoloads.el

eglot-fsharp.el

@@ -107,6 +107,18 @@ Ensure FsAutoComplete is installed (when called INTERACTIVE)."
   "Passes through required FsAutoComplete initialization options."
   '(:automaticWorkspaceInit t))
 
+;; FIXME: this should be fixed in FsAutocomplete
+(cl-defmethod xref-backend-definitions :around ((type symbol) _identifier)
+  "FsAutoComplete breaks spec and and returns error instead of empty list."
+  (if (eq major-mode 'fsharp-mode)
+      (condition-case err
+	  (cl-call-next-method)
+	(jsonrpc-error
+	 (when (equal (cadddr err) '(jsonrpc-error-message . "Could not find declaration"))
+	   nil)))
+    (when (cl-next-method-p)
+      (cl-call-next-method))))
+
 (add-to-list 'eglot-server-programs `(fsharp-mode . eglot-fsharp))
 
 (provide 'eglot-fsharp)

test/Test1/Error.fs

@@ -0,0 +1,4 @@
+module Error
+
+let x = nonexisting()
+

test/Test1/Test1.fsproj

@@ -6,8 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Error.fs" />
     <Compile Include="FileTwo.fs" />
+    <Compile Include="Program.fs" />
   </ItemGroup>
 
 </Project>

test/integration-tests.el

@@ -28,28 +28,58 @@
 (require 'eglot-fsharp)
 (require 'eglot-tests)
 
+(defun eglot-fsharp--sniff-diagnostics ()
+  (eglot--sniffing (:server-notifications s-notifs)
+    (eglot--wait-for (s-notifs 20)
+	(&key _id method &allow-other-keys)
+      (string= method "textDocument/publishDiagnostics"))))
+
 (describe "F# LSP server"
   (it "Can be installed"
     (eglot-fsharp--maybe-install)
     (expect (file-exists-p  (eglot-fsharp--path-to-server)) :to-be t))
+  (it "shows flymake errors"
+    (with-current-buffer (eglot--find-file-noselect "test/Test1/Error.fs")
+      (eglot--tests-connect 10)
+      (search-forward "nonexisting")
+      (flymake-mode t)
+      (flymake-start)
+      (goto-char (point-min))
+      (eglot-fsharp--sniff-diagnostics)
+      (flymake-goto-next-error 1 '() t)
+      (expect (face-at-point) :to-be 'flymake-error )))
   (it "is enabled on F# Files"
     (with-current-buffer (eglot--find-file-noselect "test/Test1/FileTwo.fs")
-      (eglot--tests-connect 30)
       (expect (type-of (eglot--current-server-or-lose)) :to-be 'eglot-fsautocomplete)))
   (it "provides completion"
     (with-current-buffer (eglot--find-file-noselect "test/Test1/FileTwo.fs")
+      (eglot-fsharp--sniff-diagnostics)
       (expect (plist-get (eglot--capabilities (eglot--current-server-or-lose)) :completionProvider) :not :to-be nil)))
   (it "completes function in other modules"
     (with-current-buffer (eglot--find-file-noselect "test/Test1/Program.fs")
       (search-forward "X.func")
       (delete-char -3)
       ;; ERROR in fsautocomplet.exe?  Should block instead of "no type check results"
-      (eglot--sniffing (:server-notifications s-notifs)
-        (eglot--wait-for (s-notifs 90)
-            (&key _id method &allow-other-keys)
-          (string= method "textDocument/publishDiagnostics")))
+      (eglot-fsharp--sniff-diagnostics)
       (completion-at-point)
-      (expect (looking-back "X\\.func") :to-be t))))
+      (expect (looking-back "X\\.func") :to-be t)))
+  (it "doesn't throw error when definition does not exist"
+    (with-current-buffer (eglot--find-file-noselect "test/Test1/Program.fs")
+      (eglot-fsharp--sniff-diagnostics)
+      (goto-char 253)
+      (expect (current-word) :to-equal "printfn") ;sanity check
+      (expect
+       (condition-case err
+	   (call-interactively #'xref-find-definitions)
+	 (user-error
+	  (cadr err)))
+       :to-equal "No definitions found for: LSP identifier at point.")))
+  (it "finds definitions in other files of Project"
+    (with-current-buffer (eglot--find-file-noselect "test/Test1/Program.fs")
+      (goto-char 150)
+      (expect (current-word) :to-equal "NewObjectType") ;sanity check
+      (call-interactively #'xref-find-definitions)
+      (expect (file-name-nondirectory (buffer-file-name)) :to-equal "FileTwo.fs"))))
 
 (provide 'integration-tests)
 ;;; integration-tests.el ends here