Skip to content

Declaration or Usages #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ intellij {
updateSinceUntilBuild.set(false)

val platformPlugins = ArrayList<Any>()
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*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 5 additions & 1 deletion src/main/kotlin/psi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<!-- Clojure language / lexer, syntax parser -->
<fileType name="clojure" language="clojure" extensions="clj;cljs;cljc;cljd;edn;bb;clj_kondo"
implementationClass="com.github.clojure_lsp.intellij.ClojureFileType" fieldName="INSTANCE"/>
<lang.fileViewProviderFactory language="clojure" implementationClass="com.redhat.devtools.lsp4ij.features.semanticTokens.viewProvider.LSPSemanticTokensFileViewProviderFactory"/>

<lang.parserDefinition language="clojure" implementationClass="com.github.clojure_lsp.intellij.language.parser.ClojureParserDefinition"/>
<lang.syntaxHighlighterFactory language="clojure" implementationClass="com.github.clojure_lsp.intellij.extension.syntax_highlighter.ClojureSyntaxHighlighter"/>
Expand Down
Loading