Skip to content

Commit e11c1cb

Browse files
committed
Extract Clojure intellij integration to separated lib clj4intellij
1 parent 90c9d32 commit e11c1cb

File tree

9 files changed

+7
-44
lines changed

9 files changed

+7
-44
lines changed

.lsp/config.edn

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
{:project-specs [{:project-path "build.gradle.kts"
2-
:classpath-cmd ["./gradlew" "classpath" "--quiet"]}]
3-
:cljfmt {:indents {proxy+ [[:block 2] [:inner 1]]}}}
1+
{:cljfmt {:indents {proxy+ [[:block 2] [:inner 1]]}}}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- Fix language attribute in intentionAction from plugin.xml. #18
66
- Fix documentationProvider plugin.xml. #19
7+
- Extract Clojure intellij integration to separated lib clj4intellij.
78

89
## 0.10.1
910

build.gradle.kts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ repositories {
2424

2525
dependencies {
2626
implementation ("org.clojure:clojure:1.11.1")
27+
implementation ("com.github.ericdallo:clj4intellij:0.1.3")
2728
implementation ("seesaw:seesaw:1.5.0")
2829
implementation ("camel-snake-kebab:camel-snake-kebab:0.4.3")
2930
implementation ("org.clojure:core.async:1.5.648") {
@@ -65,12 +66,6 @@ changelog {
6566
groups.set(emptyList())
6667
}
6768

68-
tasks.register("classpath") {
69-
val classpath = project.configurations.getByName("runtimeClasspath").files
70-
val clojureClasspath = clojure.builds.named("main").get().sourceRoots.files
71-
println(clojureClasspath.plus(classpath).joinToString(":"))
72-
}
73-
7469
java {
7570
targetCompatibility = JavaVersion.VERSION_11
7671
sourceCompatibility = JavaVersion.VERSION_11

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[com.github.clojure-lsp.intellij.server :as server]
1111
[com.github.clojure-lsp.intellij.tasks :as tasks])
1212
(:import
13-
[com.github.clojure_lsp.intellij ClojureClassLoader]
13+
[com.github.ericdallo.clj4intellij ClojureClassLoader]
1414
[com.github.clojure_lsp.intellij.extension SettingsState]
1515
[com.intellij.openapi.project Project]))
1616

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(ns com.github.clojure-lsp.intellij.logger
22
(:import
3-
(com.github.clojure_lsp.intellij ClojureClassLoader)
3+
(com.github.ericdallo.clj4intellij ClojureClassLoader)
44
(com.intellij.openapi.diagnostic Logger)))
55

66
(set! *warn-on-reflection* true)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[com.github.clojure-lsp.intellij.tasks :as tasks]
1111
[lsp4clj.server :as lsp4clj.server])
1212
(:import
13-
[com.github.clojure_lsp.intellij ClojureClassLoader]
13+
[com.github.ericdallo.clj4intellij ClojureClassLoader]
1414
[com.intellij.openapi.project Project]))
1515

1616
(def ^:private client-capabilities

src/main/kotlin/clojure-class-loader.kt

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
</actions>
361361
<applicationListeners>
362362
<listener topic="com.intellij.ide.AppLifecycleListener"
363-
class="com.github.clojure_lsp.intellij.listener.AppLifecycleListener"/>
363+
class="com.github.ericdallo.clj4intellij.listener.ClojureClassLoaderListener"/>
364364
</applicationListeners>
365365

366366
<projectListeners>

0 commit comments

Comments
 (0)