Fix markdown-clj

Author: ericdallo

build.gradle.kts

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    implementation ("org.clojure:clojure:1.11.1")
+    implementation ("org.clojure:clojure:1.12.0")
     implementation ("com.github.ericdallo:clj4intellij:0.5.4")
     implementation ("seesaw:seesaw:1.5.0")
     implementation ("camel-snake-kebab:camel-snake-kebab:0.4.3")
@@ -36,7 +36,10 @@ 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") {
+        exclude("clj-commons", "clj-yaml")
+    }
+    implementation ("clj-commons:clj-yaml:1.0.29")
 }
 
 sourceSets {

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

@@ -17,7 +17,11 @@
    [com.intellij.openapi.module ModifiableModuleModel ModuleType]
    [com.intellij.openapi.project Project]
    [com.intellij.openapi.roots ModifiableRootModel]
-   [java.io File]))
+   [java.io File]
+   [java.net JarURLConnection]
+   [java.util.jar JarEntry]))
+
+(set! *warn-on-reflection* true)
 
 (def clojure-module
   (proxy+ ClojureModuleType ["CLOJURE_MODULE"] ModuleType
@@ -77,8 +81,7 @@
           (updateDataModel [_]
             (swap! wizard* assoc :project-type (s/id-of (s/selection (:button-group @wizard*)))))))
 
-(defn -setupRootModel [^ModuleBuilder this ^ModifiableRootModel model]
-  (.doAddContentEntry this model))
+(defn -setupRootModel [^ModuleBuilder _ ^ModifiableRootModel _])
 
 (defn ^:private normalize-entry-name [entry-name project-template project-name]
   (-> entry-name
@@ -98,10 +101,10 @@
   ;; We need to update current thread class loader to be able to
   ;; load resource-paths from our plugin.
   (.setContextClassLoader (Thread/currentThread) (.getClassLoader clojure.lang.Symbol))
-  (let [connection (.openConnection (io/resource project-template))
+  (let [connection ^JarURLConnection (.openConnection (io/resource project-template))
         project-root-entry (.getJarEntry connection)]
     (with-open [jar (.getJarFile connection)]
-      (doseq [entry (enumeration-seq (.entries jar))]
+      (doseq [^JarEntry entry (enumeration-seq (.entries jar))]
         (when (and (not (.isDirectory entry))
                    (string/starts-with? (str entry) (str project-root-entry)))
           (with-open [stream (.getInputStream jar entry)]
@@ -110,9 +113,13 @@
               (io/make-parents new-file)
               (spit new-file content))))))))
 
+(set! *warn-on-reflection* false)
+
 (defn -commitModule [this ^Project project ^ModifiableModuleModel model]
   (let [project-path (.getBasePath project)
         project-name (.getName project)
         template (project-template (:project-type @wizard*))]
     (copy-template template project-path project-name)
     (.superCommitModule this project model)))
+
+(set! *warn-on-reflection* true)

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

@@ -5,14 +5,14 @@
   (: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.github.clojure_lsp.intellij ClojureLanguage]
+   [com.intellij.openapi.editor.colors EditorColorsManager]
+   [com.intellij.openapi.fileTypes SyntaxHighlighterFactory]
    [com.intellij.openapi.util.text StringUtil]
    [com.intellij.openapi.util.text HtmlBuilder]
    [com.intellij.psi PsiDocumentManager PsiElement PsiFile]
-   [com.intellij.openapi.fileTypes SyntaxHighlighterFactory]
-   [com.intellij.openapi.editor.colors EditorColorsManager]
-   [com.github.clojure_lsp.intellij ClojureLanguage]
    [java.awt Color]))
 
 (set! *warn-on-reflection* true)
@@ -57,10 +57,10 @@
                 foreground-color (some-> highlight-attrs .getForegroundColor)
                 background-color (some-> highlight-attrs .getBackgroundColor)
                 font-type        (some-> highlight-attrs .getFontType (#(case (int %)
-                                                                         1 :bold
-                                                                         2 :italic
-                                                                         3 :bold-italic
-                                                                         nil)))]
+                                                                          1 :bold
+                                                                          2 :italic
+                                                                          3 :bold-italic
+                                                                          nil)))]
             (if (some some? [foreground-color background-color font-type])
               (recur (str highlighted-code (highlight-html-text text {:foreground-color foreground-color
                                                                       :background-color background-color
@@ -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/listener/file.clj

@@ -8,14 +8,6 @@
 
 (set! *warn-on-reflection* true)
 
-(def ^:private client-capabilities
-  {:text-document {:hover {:content-format ["markdown"]}
-                   :implementation {}}
-   :workspace {:workspace-edit {:document-changes true
-                                :resource-operations ["create" "rename"]}
-               :file-operations {:will-rename true}}
-   :window {:show-document true}})
-
 (defn start-server! [^Project project]
   (when-let [item ^LanguageServerItem @(db/get-in project [:server])]
     (when-let [server ^LanguageServerManager (.getServer item)]

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

@@ -121,13 +121,7 @@
     </applicationListeners>
 
     <projectListeners>
-        <!-- <listener topic="com.intellij.openapi.fileEditor.FileEditorManagerListener" -->
-        <!--           class="com.github.clojure_lsp.intellij.listener.FileListener"/> -->
         <listener topic="com.intellij.openapi.project.ProjectManagerListener"
                   class="com.github.clojure_lsp.intellij.listener.ProjectManagerListener"/>
-        <!-- TODO listen to vfs events outside editor -->
-        <!-- <listener topic="com.intellij.openapi.vfs.newvfs.BulkFileListener" -->
-        <!--           class="com.github.clojure_lsp.intellij.listener.FileListener"/> -->
-
     </projectListeners>
 </idea-plugin>

src/main/resources/META-INF/plugin.xml

@@ -3,5 +3,5 @@
   :url "http://example.com/FIXME"
   :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
             :url "https://www.eclipse.org/legal/epl-2.0/"}
-  :dependencies [[org.clojure/clojure "1.11.1"]]
+  :dependencies [[org.clojure/clojure "1.12.0"]]
   :repl-options {:init-ns project-name.core})