Skip to content

Commit f65a8da

Browse files
committed
Merge branch 'master' into lsp4ij
2 parents c8bf771 + af82d97 commit f65a8da

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## [Unreleased]
44

55
- Fix brace matcher to insert closing brace for some missing cases.
6+
- Add imcompatible tag with Cursive and Clojure-Kit plugins.
67

78
## 2.6.4
89

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
class="com.github.clojure_lsp.intellij.extension.ClojureSemanticTokensColorsProvider" />
2424
</extensions>
2525

26+
<incompatible-with>org.jetbrains.idea.clojure</incompatible-with>
27+
<incompatible-with>com.cursiveclojure.cursive</incompatible-with>
28+
2629
<extensions defaultExtensionNs="com.intellij">
2730
<fileType name="clojure" language="clojure" extensions="clj;cljs;cljc;cljd;edn;bb;clj_kondo"
2831
implementationClass="com.github.clojure_lsp.intellij.ClojureFileType" fieldName="INSTANCE"/>

0 commit comments

Comments
 (0)