ReferenceData -> JavaReferenceData - also fix issue with not working reference insert due class loading problem (was broken due java moved to plugin from boot classloader)

Author: VISTALL

plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/CopyPasteReferenceProcessor.java

@@ -70,7 +70,7 @@ public List<ReferenceTransferableData> collectTransferableData(
             return Collections.emptyList();
         }
 
-        ArrayList<ReferenceData> array = new ArrayList<>();
+        ArrayList<JavaReferenceData> array = new ArrayList<>();
         for (int j = 0; j < startOffsets.length; j++) {
             int startOffset = startOffsets[j];
             for (PsiElement element : CollectHighlightsUtil.getElementsInRange(file, startOffset, endOffsets[j])) {
@@ -82,18 +82,18 @@ public List<ReferenceTransferableData> collectTransferableData(
             return Collections.emptyList();
         }
 
-        return Collections.singletonList(new ReferenceTransferableData(array.toArray(new ReferenceData[array.size()])));
+        return Collections.singletonList(new ReferenceTransferableData(array.toArray(new JavaReferenceData[array.size()])));
     }
 
-    protected abstract void addReferenceData(PsiFile file, int startOffset, PsiElement element, ArrayList<ReferenceData> to);
+    protected abstract void addReferenceData(PsiFile file, int startOffset, PsiElement element, ArrayList<JavaReferenceData> to);
 
     @Nonnull
     @Override
     public List<ReferenceTransferableData> extractTransferableData(Transferable content) {
         ReferenceTransferableData referenceData = null;
         if (CodeInsightSettings.getInstance().ADD_IMPORTS_ON_PASTE != CodeInsightSettings.NO) {
             try {
-                DataFlavor flavor = ReferenceData.getDataFlavor();
+                DataFlavor flavor = JavaReferenceData.getDataFlavor();
                 if (flavor != null) {
                     referenceData = (ReferenceTransferableData)content.getTransferData(flavor);
                 }
@@ -131,7 +131,7 @@ public void processTransferableData(
 
         PsiDocumentManager.getInstance(project).commitAllDocuments();
         assert values.size() == 1;
-        ReferenceData[] referenceData = values.get(0).getData();
+        JavaReferenceData[] referenceData = values.get(0).getData();
         TRef[] refs = findReferencesToRestore(file, bounds, referenceData);
         if (CodeInsightSettings.getInstance().ADD_IMPORTS_ON_PASTE == CodeInsightSettings.ASK) {
             askReferencesToRestore(project, refs, referenceData);
@@ -143,21 +143,21 @@ public void processTransferableData(
     @RequiredReadAction
     protected static void addReferenceData(
         PsiElement element,
-        ArrayList<ReferenceData> array,
+        ArrayList<JavaReferenceData> array,
         int startOffset,
         String qClassName,
         @Nullable String staticMemberName
     ) {
         TextRange range = element.getTextRange();
-        array.add(new ReferenceData(
+        array.add(new JavaReferenceData(
             range.getStartOffset() - startOffset,
             range.getEndOffset() - startOffset,
             qClassName,
             staticMemberName
         ));
     }
 
-    protected abstract TRef[] findReferencesToRestore(PsiFile file, RangeMarker bounds, ReferenceData[] referenceData);
+    protected abstract TRef[] findReferencesToRestore(PsiFile file, RangeMarker bounds, JavaReferenceData[] referenceData);
 
     @RequiredReadAction
     protected PsiElement resolveReferenceIgnoreOverriding(PsiPolyVariantReference reference) {
@@ -171,10 +171,10 @@ protected PsiElement resolveReferenceIgnoreOverriding(PsiPolyVariantReference re
         return referent;
     }
 
-    protected abstract void restoreReferences(ReferenceData[] referenceData, TRef[] refs);
+    protected abstract void restoreReferences(JavaReferenceData[] referenceData, TRef[] refs);
 
     @RequiredUIAccess
-    private static void askReferencesToRestore(Project project, PsiElement[] refs, ReferenceData[] referenceData) {
+    private static void askReferencesToRestore(Project project, PsiElement[] refs, JavaReferenceData[] referenceData) {
         PsiManager manager = PsiManager.getInstance(project);
 
         ArrayList<Object> array = new ArrayList<>();
@@ -183,7 +183,7 @@ private static void askReferencesToRestore(Project project, PsiElement[] refs, R
             PsiElement ref = refs[i];
             if (ref != null) {
                 LOG.assertTrue(ref.isValid());
-                ReferenceData data = referenceData[i];
+                JavaReferenceData data = referenceData[i];
                 PsiClass refClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(data.qClassName, ref.getResolveScope());
                 if (refClass == null) {
                     continue;

plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java

@@ -36,7 +36,7 @@ public class JavaCopyPasteReferenceProcessor extends CopyPasteReferenceProcessor
   private static final Logger LOG = Logger.getInstance(JavaCopyPasteReferenceProcessor.class);
 
   @Override
-  protected void addReferenceData(PsiFile file, int startOffset, PsiElement element, ArrayList<ReferenceData> to) {
+  protected void addReferenceData(PsiFile file, int startOffset, PsiElement element, ArrayList<JavaReferenceData> to) {
     if (element instanceof PsiJavaCodeReferenceElement) {
       if (!((PsiJavaCodeReferenceElement)element).isQualified()) {
         JavaResolveResult resolveResult = ((PsiJavaCodeReferenceElement)element).advancedResolve(false);
@@ -65,13 +65,13 @@ else if (resolveResult.getCurrentFileResolveScope() instanceof PsiImportStaticSt
 
 
   @Override
-  protected PsiJavaCodeReferenceElement[] findReferencesToRestore(PsiFile file, RangeMarker bounds, ReferenceData[] referenceData) {
+  protected PsiJavaCodeReferenceElement[] findReferencesToRestore(PsiFile file, RangeMarker bounds, JavaReferenceData[] referenceData) {
     PsiManager manager = file.getManager();
     JavaPsiFacade facade = JavaPsiFacade.getInstance(manager.getProject());
     PsiResolveHelper helper = facade.getResolveHelper();
     PsiJavaCodeReferenceElement[] refs = new PsiJavaCodeReferenceElement[referenceData.length];
     for (int i = 0; i < referenceData.length; i++) {
-      ReferenceData data = referenceData[i];
+      JavaReferenceData data = referenceData[i];
 
       PsiClass refClass = facade.findClass(data.qClassName, file.getResolveScope());
       if (refClass == null) {
@@ -110,15 +110,15 @@ protected PsiJavaCodeReferenceElement[] findReferencesToRestore(PsiFile file, Ra
   }
 
   @Override
-  protected void restoreReferences(ReferenceData[] referenceData, PsiJavaCodeReferenceElement[] refs) {
+  protected void restoreReferences(JavaReferenceData[] referenceData, PsiJavaCodeReferenceElement[] refs) {
     for (int i = 0; i < refs.length; i++) {
       PsiJavaCodeReferenceElement reference = refs[i];
       if (reference == null || !reference.isValid()) {
         continue;
       }
       try {
         PsiManager manager = reference.getManager();
-        ReferenceData refData = referenceData[i];
+        JavaReferenceData refData = referenceData[i];
         PsiClass refClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(refData.qClassName, reference.getResolveScope());
         if (refClass != null) {
           if (refData.staticMemberName == null) {

plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/JavaReferenceData.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.java.impl.codeInsight.editorActions;
+
+import consulo.logging.Logger;
+import consulo.util.lang.lazy.LazyValue;
+import jakarta.annotation.Nullable;
+
+import java.awt.datatransfer.DataFlavor;
+import java.io.Serializable;
+import java.util.function.Supplier;
+
+/**
+ * @author Denis Fokin
+ */
+public class JavaReferenceData implements Cloneable, Serializable {
+    private static final Supplier<DataFlavor> DATA_FLAVOR = LazyValue.nullable(() -> {
+        try {
+            return new DataFlavor(
+                DataFlavor.javaJVMLocalObjectMimeType + ";class=" + JavaReferenceData.class.getName(),
+                "JavaReferenceData",
+                JavaReferenceData.class.getClassLoader()
+            );
+        }
+        catch (NoClassDefFoundError | IllegalArgumentException | ClassNotFoundException e) {
+            Logger.getInstance(JavaReferenceData.class).warn("Fail to initialized JavaReferenceData", e);
+            return null;
+        }
+    });
+
+    @Nullable
+    public static DataFlavor getDataFlavor() {
+        return DATA_FLAVOR.get();
+    }
+
+    public int startOffset;
+    public int endOffset;
+    public final String qClassName;
+    public final String staticMemberName;
+
+    public JavaReferenceData(int startOffset, int endOffset, String qClassName, String staticMemberDescriptor) {
+        this.startOffset = startOffset;
+        this.endOffset = endOffset;
+        this.qClassName = qClassName;
+        this.staticMemberName = staticMemberDescriptor;
+    }
+
+    @Override
+    public Object clone() {
+        try {
+            return super.clone();
+        }
+        catch (CloneNotSupportedException e) {
+            throw new RuntimeException();
+        }
+    }
+}

plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/ReferenceData.java

@@ -24,15 +24,15 @@
  * @author yole
  */
 public class ReferenceTransferableData implements TextBlockTransferableData, Cloneable, Serializable {
-  private final ReferenceData[] myReferenceDatas;
+  private final JavaReferenceData[] myReferenceDatas;
 
-  public ReferenceTransferableData(ReferenceData[] referenceDatas) {
+  public ReferenceTransferableData(JavaReferenceData[] referenceDatas) {
     myReferenceDatas = referenceDatas;
   }
 
   @Override
   public DataFlavor getFlavor() {
-    return ReferenceData.getDataFlavor();
+    return JavaReferenceData.getDataFlavor();
   }
 
   @Override
@@ -42,7 +42,7 @@ public int getOffsetCount() {
 
   @Override
   public int getOffsets(int[] offsets, int index) {
-    for (ReferenceData data : myReferenceDatas) {
+    for (JavaReferenceData data : myReferenceDatas) {
       offsets[index++] = data.startOffset;
       offsets[index++] = data.endOffset;
     }
@@ -51,7 +51,7 @@ public int getOffsets(int[] offsets, int index) {
 
   @Override
   public int setOffsets(int[] offsets, int index) {
-    for (ReferenceData data : myReferenceDatas) {
+    for (JavaReferenceData data : myReferenceDatas) {
       data.startOffset = offsets[index++];
       data.endOffset = offsets[index++];
     }
@@ -60,14 +60,14 @@ public int setOffsets(int[] offsets, int index) {
 
   @Override
   public ReferenceTransferableData clone() {
-    ReferenceData[] newReferenceData = new ReferenceData[myReferenceDatas.length];
+    JavaReferenceData[] newReferenceData = new JavaReferenceData[myReferenceDatas.length];
     for (int i = 0; i < myReferenceDatas.length; i++) {
-      newReferenceData[i] = (ReferenceData) myReferenceDatas[i].clone();
+      newReferenceData[i] = (JavaReferenceData) myReferenceDatas[i].clone();
     }
     return new ReferenceTransferableData(newReferenceData);
   }
 
-  public ReferenceData[] getData() {
+  public JavaReferenceData[] getData() {
     return myReferenceDatas;
   }
 }