forked from redhat-developer/lsp4ij
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Open references if definition result has the same range than
clicked offset Fixes redhat-developer#531 Signed-off-by: azerr <[email protected]>
- Loading branch information
1 parent
eca7ca6
commit 639a767
Showing
9 changed files
with
253 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
src/main/java/com/redhat/devtools/lsp4ij/features/definition/LSPDefinitionParams.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Red Hat, Inc. | ||
| * Distributed under license by Red Hat, Inc. All rights reserved. | ||
| * This program is made available under the terms of the | ||
| * Eclipse Public License v2.0 which accompanies this distribution, | ||
| * and is available at https://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * Contributors: | ||
| * Red Hat, Inc. - initial API and definition | ||
| ******************************************************************************/ | ||
| package com.redhat.devtools.lsp4ij.features.definition; | ||
|
|
||
| import org.eclipse.lsp4j.DefinitionParams; | ||
| import org.eclipse.lsp4j.Position; | ||
| import org.eclipse.lsp4j.TextDocumentIdentifier; | ||
|
|
||
| /** | ||
| * LSP definition parameters which hosts the offset where definition has been triggered. | ||
| */ | ||
| public class LSPDefinitionParams extends DefinitionParams { | ||
|
|
||
| // Use transient to avoid serializing the fields when GSON will be processed | ||
| private transient final int offset; | ||
|
|
||
| public LSPDefinitionParams(TextDocumentIdentifier textDocument, Position position, int offset) { | ||
| super.setTextDocument(textDocument); | ||
| super.setPosition(position); | ||
| this.offset = offset; | ||
| } | ||
|
|
||
| public int getOffset() { | ||
| return offset; | ||
| } | ||
| } |
108 changes: 108 additions & 0 deletions
108
src/main/java/com/redhat/devtools/lsp4ij/features/definition/LSPDefinitionSupport.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Red Hat, Inc. | ||
| * Distributed under license by Red Hat, Inc. All rights reserved. | ||
| * This program is made available under the terms of the | ||
| * Eclipse Public License v2.0 which accompanies this distribution, | ||
| * and is available at http://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * Contributors: | ||
| * Red Hat, Inc. - initial API and definition | ||
| ******************************************************************************/ | ||
| package com.redhat.devtools.lsp4ij.features.definition; | ||
|
|
||
| import com.intellij.openapi.project.Project; | ||
| import com.intellij.openapi.vfs.VirtualFile; | ||
| import com.intellij.psi.PsiFile; | ||
| import com.redhat.devtools.lsp4ij.LSPRequestConstants; | ||
| import com.redhat.devtools.lsp4ij.LanguageServerItem; | ||
| import com.redhat.devtools.lsp4ij.LanguageServiceAccessor; | ||
| import com.redhat.devtools.lsp4ij.features.AbstractLSPDocumentFeatureSupport; | ||
| import com.redhat.devtools.lsp4ij.internal.CancellationSupport; | ||
| import com.redhat.devtools.lsp4ij.internal.CompletableFutures; | ||
| import org.eclipse.lsp4j.Location; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| /** | ||
| * LSP definition support which collect: | ||
| * | ||
| * <ul> | ||
| * <li>textDocument/definition</li> | ||
| * </ul> | ||
| */ | ||
| public class LSPDefinitionSupport extends AbstractLSPDocumentFeatureSupport<LSPDefinitionParams, List<Location>> { | ||
|
|
||
| private Integer previousOffset; | ||
|
|
||
| public LSPDefinitionSupport(@NotNull PsiFile file) { | ||
| super(file); | ||
| } | ||
|
|
||
| public CompletableFuture<List<Location>> getDefinitions(LSPDefinitionParams params) { | ||
| int offset = params.getOffset(); | ||
| if (previousOffset != null && !previousOffset.equals(offset)) { | ||
| super.cancel(); | ||
| } | ||
| previousOffset = offset; | ||
| return super.getFeatureData(params); | ||
| } | ||
|
|
||
| @Override | ||
| protected CompletableFuture<List<Location>> doLoad(LSPDefinitionParams params, CancellationSupport cancellationSupport) { | ||
| PsiFile file = super.getFile(); | ||
| return collectTypeDefinitions(file.getVirtualFile(), file.getProject(), params, cancellationSupport); | ||
| } | ||
|
|
||
| private static @NotNull CompletableFuture<List<Location>> collectTypeDefinitions(@NotNull VirtualFile file, | ||
| @NotNull Project project, | ||
| @NotNull LSPDefinitionParams params, | ||
| @NotNull CancellationSupport cancellationSupport) { | ||
| return LanguageServiceAccessor.getInstance(project) | ||
| .getLanguageServers(file, LanguageServerItem::isTypeDefinitionSupported) | ||
| .thenComposeAsync(languageServers -> { | ||
| // Here languageServers is the list of language servers which matches the given file | ||
| // and which have definition capability | ||
| if (languageServers.isEmpty()) { | ||
| return CompletableFuture.completedFuture(null); | ||
| } | ||
|
|
||
| // Collect list of textDocument/definition future for each language servers | ||
| List<CompletableFuture<List<Location>>> definitionsPerServerFutures = languageServers | ||
| .stream() | ||
| .map(languageServer -> getTypeDefinitionFor(params, languageServer, cancellationSupport)) | ||
| .toList(); | ||
|
|
||
| // Merge list of textDocument/definition future in one future which return the list of definition ranges | ||
| return CompletableFutures.mergeInOneFuture(definitionsPerServerFutures, cancellationSupport); | ||
| }); | ||
| } | ||
|
|
||
| private static CompletableFuture<List<Location>> getTypeDefinitionFor(LSPDefinitionParams params, | ||
| LanguageServerItem languageServer, | ||
| CancellationSupport cancellationSupport) { | ||
| return cancellationSupport.execute(languageServer | ||
| .getTextDocumentService() | ||
| .definition(params), languageServer, LSPRequestConstants.TEXT_DOCUMENT_DEFINITION) | ||
| .thenApplyAsync(locations -> { | ||
| if (locations == null) { | ||
| // textDocument/definition may return null | ||
| return Collections.emptyList(); | ||
| } | ||
| if (locations.isLeft()) { | ||
| return locations.getLeft() | ||
| .stream() | ||
| .map(l -> new Location(l.getUri(), l.getRange())) | ||
| .toList(); | ||
|
|
||
| } | ||
| return locations.getRight() | ||
| .stream() | ||
| .map(l -> new Location(l.getTargetUri(), l.getTargetRange())) | ||
| .toList(); | ||
| }); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.