Skip to content

Commit 4e05b47

Browse files
authored
Declaration or Usages (#69)
* add lang.fileViewProviderFactory * orverride isEnableSemanticTokensFileViewProvider * Implement PsiNameIdentifierOwner * CHANGELOG * remove the need to set flag
1 parent 6a488c1 commit 4e05b47

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## [Unreleased]
44

5+
- Fix go to declaration or usages. #70
6+
57
## 3.3.0
68

79
- Add support for `forward`, `backward`, `forward-select`, `backward-select` paredit actions. #72
@@ -14,9 +16,6 @@
1416
## 3.1.1
1517

1618
- Remove `:` lexer check since this is delegated to clojure-lsp/clj-kondo already.
17-
18-
## 3.1.0
19-
2019
- Fix comment form complain about missing paren.
2120
- Improve server installation fixing concurrency bugs + using lsp4ij install API.
2221

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ intellij {
6363
updateSinceUntilBuild.set(false)
6464

6565
val platformPlugins = ArrayList<Any>()
66-
val localLsp4ij = file("../lsp4ij/build/idea-sandbox/plugins/LSP4IJ").absoluteFile
66+
val localLsp4ij = file("../lsp4ij/build/idea-sandbox/IC-2023.3/plugins/lsp4ij").absoluteFile
6767
if (localLsp4ij.isDirectory) {
6868
// In case Gradle fails to build because it can't find some missing jar, try deleting
6969
// ~/.gradle/caches/modules-2/files-2.1/com.jetbrains.intellij.idea/unzipped.com.jetbrains.plugins/com.redhat.devtools.lsp4ij*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[com.intellij.openapi.vfs LocalFileSystem VirtualFile]
1919
[com.redhat.devtools.lsp4ij LSPIJUtils LanguageServerFactory ServerStatus]
2020
[com.redhat.devtools.lsp4ij.client LanguageClientImpl]
21-
[com.redhat.devtools.lsp4ij.client.features LSPClientFeatures LSPProgressFeature]
21+
[com.redhat.devtools.lsp4ij.client.features EditorBehaviorFeature LSPClientFeatures LSPProgressFeature]
2222
[com.redhat.devtools.lsp4ij.installation LanguageServerInstallerBase]
2323
[com.redhat.devtools.lsp4ij.server OSProcessStreamConnectionProvider]
2424
[java.io File]

src/main/kotlin/psi.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ class ClojureTokenType(name: String) : IElementType(name, ClojureLanguage), ILea
3131
override fun createLeafNode(leafText: CharSequence) = CToken(this, leafText)
3232
}
3333
class ClojureNodeType(name: String) : IElementType(name, ClojureLanguage), ClojureElementType
34-
class CToken(tokenType: ClojureTokenType, text: CharSequence) : LeafPsiElement(tokenType, text)
34+
class CToken(tokenType: ClojureTokenType, text: CharSequence) : LeafPsiElement(tokenType, text), PsiNameIdentifierOwner {
35+
override fun getNameIdentifier() = this
36+
override fun getName() = this.getText()
37+
override fun setName(name: String) = this
38+
}
3539

3640
open class CFileImpl(viewProvider: FileViewProvider, language: Language) :
3741
PsiFileBase(viewProvider, language), PsiFile {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<!-- Clojure language / lexer, syntax parser -->
3131
<fileType name="clojure" language="clojure" extensions="clj;cljs;cljc;cljd;edn;bb;clj_kondo"
3232
implementationClass="com.github.clojure_lsp.intellij.ClojureFileType" fieldName="INSTANCE"/>
33+
<lang.fileViewProviderFactory language="clojure" implementationClass="com.redhat.devtools.lsp4ij.features.semanticTokens.viewProvider.LSPSemanticTokensFileViewProviderFactory"/>
3334

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

0 commit comments

Comments
 (0)