diff --git a/CHANGELOG.md b/CHANGELOG.md index 16136cc..7ba58f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +- Fix go to declaration or usages. #70 + ## 3.3.0 - Add support for `forward`, `backward`, `forward-select`, `backward-select` paredit actions. #72 @@ -14,9 +16,6 @@ ## 3.1.1 - Remove `:` lexer check since this is delegated to clojure-lsp/clj-kondo already. - -## 3.1.0 - - Fix comment form complain about missing paren. - Improve server installation fixing concurrency bugs + using lsp4ij install API. diff --git a/build.gradle.kts b/build.gradle.kts index 131a52b..35734a6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -63,7 +63,7 @@ intellij { updateSinceUntilBuild.set(false) val platformPlugins = ArrayList() - val localLsp4ij = file("../lsp4ij/build/idea-sandbox/plugins/LSP4IJ").absoluteFile + val localLsp4ij = file("../lsp4ij/build/idea-sandbox/IC-2023.3/plugins/lsp4ij").absoluteFile if (localLsp4ij.isDirectory) { // In case Gradle fails to build because it can't find some missing jar, try deleting // ~/.gradle/caches/modules-2/files-2.1/com.jetbrains.intellij.idea/unzipped.com.jetbrains.plugins/com.redhat.devtools.lsp4ij* diff --git a/src/main/clojure/com/github/clojure_lsp/intellij/extension/language_server_factory.clj b/src/main/clojure/com/github/clojure_lsp/intellij/extension/language_server_factory.clj index 1284729..4892184 100644 --- a/src/main/clojure/com/github/clojure_lsp/intellij/extension/language_server_factory.clj +++ b/src/main/clojure/com/github/clojure_lsp/intellij/extension/language_server_factory.clj @@ -18,7 +18,7 @@ [com.intellij.openapi.vfs LocalFileSystem VirtualFile] [com.redhat.devtools.lsp4ij LSPIJUtils LanguageServerFactory ServerStatus] [com.redhat.devtools.lsp4ij.client LanguageClientImpl] - [com.redhat.devtools.lsp4ij.client.features LSPClientFeatures LSPProgressFeature] + [com.redhat.devtools.lsp4ij.client.features EditorBehaviorFeature LSPClientFeatures LSPProgressFeature] [com.redhat.devtools.lsp4ij.installation LanguageServerInstallerBase] [com.redhat.devtools.lsp4ij.server OSProcessStreamConnectionProvider] [java.io File] diff --git a/src/main/kotlin/psi.kt b/src/main/kotlin/psi.kt index 4554188..d1a9c37 100644 --- a/src/main/kotlin/psi.kt +++ b/src/main/kotlin/psi.kt @@ -31,7 +31,11 @@ class ClojureTokenType(name: String) : IElementType(name, ClojureLanguage), ILea override fun createLeafNode(leafText: CharSequence) = CToken(this, leafText) } class ClojureNodeType(name: String) : IElementType(name, ClojureLanguage), ClojureElementType -class CToken(tokenType: ClojureTokenType, text: CharSequence) : LeafPsiElement(tokenType, text) +class CToken(tokenType: ClojureTokenType, text: CharSequence) : LeafPsiElement(tokenType, text), PsiNameIdentifierOwner { + override fun getNameIdentifier() = this + override fun getName() = this.getText() + override fun setName(name: String) = this +} open class CFileImpl(viewProvider: FileViewProvider, language: Language) : PsiFileBase(viewProvider, language), PsiFile { diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index bd99f12..4311b65 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -30,6 +30,7 @@ +