fix: don't depend on the java extension

Signed-off-by: Fred Bricon <fbricon@gmail.com>
angelozerr · Jan 10, 2024 · a846eeb · a846eeb
1 parent 7d9c260
commit a846eeb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 36 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ platformType=IC
 platformVersion=2022.2.3
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins=com.intellij.java, com.redhat.devtools.intellij.telemetry:1.0.0.44
+platformPlugins=com.redhat.devtools.intellij.telemetry:1.1.0.52
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion=8.4
 channel=nightly

diff --git a/src/main/java/com/redhat/devtools/lsp4ij/LSPIJUtils.java b/src/main/java/com/redhat/devtools/lsp4ij/LSPIJUtils.java
@@ -28,10 +28,8 @@
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.*;
-import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.impl.light.LightRecordField;
 import com.redhat.devtools.lsp4ij.internal.StringUtils;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.*;
@@ -289,36 +287,6 @@ public static Range toRange(TextRange range, Document document) {
         }
     }
 
-    public static Location toLocation(PsiElement psiMember) {
-        PsiElement sourceElement = getNavigationElement(psiMember);
-
-        if (sourceElement != null) {
-            PsiFile file = sourceElement.getContainingFile();
-            Document document = PsiDocumentManager.getInstance(psiMember.getProject()).getDocument(file);
-            if (document != null) {
-                TextRange range = sourceElement.getTextRange();
-                return toLocation(file, toRange(range, document));
-            }
-        }
-        return null;
-    }
-
-    private static @Nullable PsiElement getNavigationElement(PsiElement psiMember) {
-        //FIXME LightRecordField depends on the com.intellij.java plugin
-        if (psiMember instanceof LightRecordField) {
-            psiMember = ((LightRecordField) psiMember).getRecordComponent();
-        }
-        return psiMember.getNavigationElement();
-    }
-
-    public static Location toLocation(PsiFile file, Range range) {
-        return toLocation(file.getVirtualFile(), range);
-    }
-
-    public static Location toLocation(VirtualFile file, Range range) {
-        return new Location(toUriAsString(file), range);
-    }
-
     public static void applyWorkspaceEdit(WorkspaceEdit edit) {
         applyWorkspaceEdit(edit, null);
     }

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -47,11 +47,8 @@
     </description>
 
     <depends>com.intellij.modules.platform</depends>
-    <!-- FIXME we shouldn't have a dependency to Java, this is caused by using 'LightRecordField' (e.g. in LSPIJUtils.getNavigationElement(PsiElement)) -->
-    <depends>com.intellij.modules.java</depends>
     <depends>com.redhat.devtools.intellij.telemetry</depends>
 
-
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
     <idea-version since-build="223"/>