WIP

Author: ericdallo

build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
         exclude("org.clojure", "core.async")
     }
     implementation ("com.rpl:proxy-plus:0.0.9")
-    implementation ("markdown-clj:markdown-clj:1.12.1")
+    // implementation ("markdown-clj:markdown-clj:1.12.1")
 }
 
 sourceSets {
@@ -70,16 +70,16 @@ changelog {
 }
 
 java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 tasks {
     compileKotlin {
         kotlinOptions {
-            jvmTarget = "11"
-            apiVersion = "1.5"
-            languageVersion = "1.5"
+            jvmTarget = "17"
+            apiVersion = "1.9"
+            languageVersion = "1.9"
             freeCompilerArgs = listOf("-Xjvm-default=all")
         }
     }

gradle.properties

@@ -7,19 +7,19 @@ pluginVersion = 2.6.4
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 213
+pluginSinceBuild = 233
 
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions = 2021.3.3, 2022.1, 2022.2, 2022.3, 2023.1, 2023.2
+pluginVerifierIdeVersions = 2023.3
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IC
-platformVersion = 2021.3
+platformVersion = 2023.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = com.intellij.java
+platformPlugins = com.intellij.java, com.redhat.devtools.lsp4ij:0.9.0
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion = 7.6.1

src/main/clojure/com/github/clojure_lsp/intellij/extension/documentation.clj

@@ -5,7 +5,7 @@
   (:require
    [com.github.clojure-lsp.intellij.client :as lsp-client]
    [com.github.clojure-lsp.intellij.db :as db]
-   [markdown.core :as markdown])
+   #_[markdown.core :as markdown])
   (:import
    [com.intellij.openapi.util.text StringUtil]
    [com.intellij.openapi.util.text HtmlBuilder]
@@ -80,7 +80,7 @@
                                                               :position {:line (.line line-col)
                                                                          :character (.column line-col)}}])]
 
-        (when-let [html (markdown/md-to-html-string (:value contents)
+        (when-let [html "" #_(markdown/md-to-html-string (:value contents)
                                                     :codeblock-no-escape? true
                                                     :codeblock-callback (fn [code language]
                                                                           (if (= language "clojure")

src/main/clojure/com/github/clojure_lsp/intellij/extension/general_settings.clj

@@ -89,7 +89,7 @@
                                                        :listen [:action (fn [_]
                                                                           (doseq [project (db/all-projects)]
                                                                             (server/shutdown! project)
-                                                                            (server/start-server! project)))]) "wrap"]]) "span"]
+                                                                            #_(server/start-server! project)))]) "wrap"]]) "span"]
                   [(s/label :text "*  requires LSP restart"
                             :font (s.font/font  :size 14)
                             :foreground (s.color/color 110 110 110)) "wrap"]]

src/main/clojure/com/github/clojure_lsp/intellij/extension/init_db_startup.clj

@@ -8,11 +8,13 @@
    [com.github.ericdallo.clj4intellij.logger :as logger])
   (:import
    [com.github.clojure_lsp.intellij.extension SettingsState]
-   [com.intellij.openapi.project Project]))
+   [com.intellij.openapi.project Project]
+   [com.redhat.devtools.lsp4ij LanguageServerManager LanguageServerManager$StartOptions]))
 
 (set! *warn-on-reflection* true)
 
 (defn -runActivity [_this ^Project project]
   (db/init-db-for-project project)
   (db/load-settings-from-state! project (SettingsState/get))
+  #_(.start (LanguageServerManager/getInstance (first (db/all-projects))) "clojure-lsp" )
   (logger/info "Loaded settings to memory:" (db/get-in project [:settings])))

src/main/clojure/com/github/clojure_lsp/intellij/extension/language_server_factory.clj

@@ -0,0 +1,26 @@
+(ns com.github.clojure-lsp.intellij.extension.language-server-factory
+  (:gen-class
+   :name com.github.clojure_lsp.intellij.extension.LanguageServerFactory
+   :implements [com.redhat.devtools.lsp4ij.LanguageServerFactory])
+  (:require
+   [com.github.ericdallo.clj4intellij.logger :as logger]
+   [com.rpl.proxy-plus :refer [proxy+]])
+  (:import
+   [com.intellij.execution.configurations GeneralCommandLine]
+   [com.intellij.openapi.project Project]
+   [com.redhat.devtools.lsp4ij.server OSProcessStreamConnectionProvider]))
+
+(defn -createConnectionProvider [_ ^Project project]
+  (logger/info "------->")
+  (doto (proxy+
+          []
+          OSProcessStreamConnectionProvider)
+    (.setCommandLine (GeneralCommandLine. ["/home/greg/dev/clojure-lsp/clojure-lsp" "listen"]))))
+
+;; TODO custom commands
+;; (defn -createLanguageClient [_ ^Project project]
+;;   )
+
+;; TODO customer server methods
+;; (defn -getServerInterface [_]
+;;   )

src/main/clojure/com/github/clojure_lsp/intellij/extension/status_bar_factory.clj

@@ -60,7 +60,7 @@
    DumbAwareAction
     (actionPerformed [_ _event]
       (server/shutdown! project)
-      (server/start-server! project))))
+      #_(server/start-server! project))))
 
 (defn ^:private status-bar-title [project]
   (str "Clojure LSP: " (name (db/get-in project [:status] "disconnected"))))

src/main/clojure/com/github/clojure_lsp/intellij/listener/file.clj

@@ -38,7 +38,7 @@
     (do
       (db/init-db-for-project project)
       (db/load-settings-from-state! project (SettingsState/get))
-      (server/start-server! project))))
+      #_(server/start-server! project))))
 
 (defn -fileOpened [_this ^FileEditorManager source ^VirtualFile file]
   (let [project (.getProject source)]

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

@@ -2,7 +2,6 @@
   (: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]

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

@@ -133,7 +133,7 @@
             (logger/info "Checking if server initialized, try number:" count)
             (recur (inc count))))))))
 
-(defn start-server! [^Project project]
+#_(defn start-server! [^Project project]
   (db/assoc-in project [:status] :connecting)
   (run! #(% project :connecting) (:on-status-changed-fns @db/db*))
   (tasks/run-background-task!