Support starting plugin even with network issues to download latest server when one is already present.

Fixes #56

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+- Support starting plugin even with network issues to download latest server when one is already present. #56
+
 ## 2.6.0
 
 - Support Create workspace edit operation. Fixes #51

src/main/clojure/com/github/clojure_lsp/intellij/psi.clj

@@ -2,6 +2,7 @@
   (:require
    [clojure.string :as string]
    [com.github.clojure-lsp.intellij.editor :as editor]
+   [com.github.ericdallo.clj4intellij.logger :as logger]
    [com.github.ericdallo.clj4intellij.util :as util])
   (:import
    [com.github.clojure_lsp.intellij ClojureLanguage]
@@ -11,7 +12,6 @@
    [com.intellij.openapi.fileEditor FileEditorManager]
    [com.intellij.openapi.project Project]
    [com.intellij.openapi.util TextRange]
-   [com.intellij.openapi.vfs VirtualFile]
    [com.intellij.psi
     PsiElement
     PsiElementVisitor
@@ -22,21 +22,20 @@
 
 (set! *warn-on-reflection* true)
 
-VirtualFile
-
 (defn ->LSPPsiElement
-  [^String name ^Project project ^PsiFile file
+  [^String text ^Project project ^PsiFile file
    ^Integer start-offset ^Integer end-offset
    ^Integer start-line]
   (let [psi-manager (PsiManager/getInstance project)
         file-editor-manager (FileEditorManager/getInstance project)]
     (reify
       PsiNameIdentifierOwner
-      (getName [_] (str  (editor/filename->project-relative-filename
-                          (.getCanonicalPath (.getVirtualFile file))
-                          project)
-                         "  "
-                         start-line))
+      (getName [_]
+        (str (editor/filename->project-relative-filename
+               (.getCanonicalPath (.getVirtualFile file))
+               project)
+             "  "
+             start-line))
       (setName [_ _])
       (getNameIdentifier [this] this)
       (getIdentifyingElement [this] this)
@@ -55,7 +54,7 @@ VirtualFile
       (getTextLength [_] (- end-offset start-offset))
       (findElementAt [_ _])
       (findReferenceAt [_ _])
-      (textToCharArray [_] (char-array name))
+      (textToCharArray [_] (char-array text))
       (getNavigationElement [this] this)
       (getOriginalElement [this] this)
       (^boolean textMatches [this ^CharSequence text]
@@ -64,7 +63,7 @@ VirtualFile
         (.equals (.getText this) (.getText element)))
       (^boolean textContains [this ^char c]
         (string/includes? (.getText this) (str c)))
-      (getText [_] name)
+      (getText [_] text)
       (^void accept [this ^PsiElementVisitor visitor]
         (.visitElement visitor this))
       (acceptChildren [_ _])
@@ -91,7 +90,7 @@ VirtualFile
       (getUseScope [this] (.getResolveScope (.getContainingFile this)))
       (getNode [_])
       (isEquivalentTo [this other] (= this other))
-      (toString [_] (str name ":" start-offset ":" end-offset))
+      (toString [_] (str text ":" start-offset ":" end-offset))
       (getContainingFile [_] file)
 
       PsiElementNavigationItem

src/main/clojure/com/github/clojure_lsp/intellij/server.clj

@@ -83,12 +83,12 @@
         dest-server-file download-path
         dest-path (.getCanonicalPath dest-server-file)]
     (logger/info "Downloading clojure-lsp from" uri)
-    (spit server-version-path latest-version)
     (unzip-file (io/input-stream uri) dest-server-file)
     (doto (io/file dest-server-file)
       (.setWritable true)
       (.setReadable true)
       (.setExecutable true))
+    (spit server-version-path latest-version)
     (db/assoc-in project [:downloaded-server-path] dest-path)
     (logger/info "Downloaded clojure-lsp to" dest-path)))
 
@@ -143,21 +143,27 @@
      (ClojureClassLoader/bind)
      (let [download-path (config/download-server-path)
            server-version-path (config/download-server-version-path)
-           latest-version* (delay (try (string/trim (slurp latest-version-uri)) (catch Exception _ :error-checking-latest-version)))
+           latest-version* (delay (try (string/trim (slurp latest-version-uri)) (catch Exception _ nil)))
            custom-server-path (db/get-in project [:settings :server-path])]
        (cond
          custom-server-path
          (spawn-server! project indicator custom-server-path)
 
          (and (.exists download-path)
-              (or (not @latest-version*) ;; on internet connection issues we use any downloaded server
+              (or (not @latest-version*) ;; on network connection issues we use any downloaded server
                   (= (try (slurp server-version-path) (catch Exception _ :error-checking-local-version))
                      @latest-version*)))
          (spawn-server! project indicator download-path)
 
-         :else
+         @latest-version*
          (do (download-server! project indicator download-path server-version-path @latest-version*)
-             (spawn-server! project indicator download-path)))
+             (spawn-server! project indicator download-path))
+
+         :else
+         (notification/show-notification! {:project project
+                                           :type :error
+                                           :title "Clojure LSP download error"
+                                           :message "There is no server downloaded and there was a network issue to download the latest one"}))
 
        (db/assoc-in project [:status] :connected)
        (run! #(% project :connected) (:on-status-changed-fns @db/db*))