From 7ae9d9feec5d2fff25d79981c53073170c61b506 Mon Sep 17 00:00:00 2001
From: Bart van Helvert <bart.vanhelvert@jetbrains.com>
Date: Fri, 13 Feb 2026 14:29:39 +0100
Subject: [PATCH] [java] Store name in implicit class stub index

Otherwise, implicit class (compact source file) stub indices won't be updated on operations like rename because the name of the implicit class is not encoded in the serialized index. #IDEA-385917 Fixed


(cherry picked from commit 531b7245cddac513e5f6a732c99a3a51771e1682)

IJ-MR-191658

GitOrigin-RevId: 544e7f127fb5cd852c65adec87aa3d6a4ffde114
---
 .../serializers/JavaClassStubSerializer.java      |  6 +++---
 .../stubs/factories/JavaClassStubFactory.java     |  9 +++++++++
 .../psi/impl/source/JavaFileElementType.java      |  2 +-
 .../com/intellij/java/psi/JavaStubsTest.java      | 15 +++++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/serializers/JavaClassStubSerializer.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/serializers/JavaClassStubSerializer.java
index 4b75bea503e6..c98a297f8b2d 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/serializers/JavaClassStubSerializer.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/serializers/JavaClassStubSerializer.java
@@ -71,9 +71,9 @@ public class JavaClassStubSerializer implements StubSerializer<PsiClassStub<PsiC
   @Override
   public void indexStub(@NotNull PsiClassStub<PsiClass> stub, @NotNull IndexSink sink) {
     if (stub.isImplicit()) {
-      StubElement<?> parent = stub.getParentStub();
-      if (parent instanceof PsiJavaFileStub) {
-        sink.occurrence(JavaStubIndexKeys.IMPLICIT_CLASSES, JavaImplicitClassUtil.getJvmName(((PsiJavaFileStub)parent).getPsi().getName()));
+      String name = stub.getName();
+      if (name != null) {
+        sink.occurrence(JavaStubIndexKeys.IMPLICIT_CLASSES, name);
       }
       return;
     }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/factories/JavaClassStubFactory.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/factories/JavaClassStubFactory.java
index 0280d1ddd41d..bce02e138158 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/factories/JavaClassStubFactory.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/factories/JavaClassStubFactory.java
@@ -5,6 +5,7 @@ import com.intellij.lang.LighterAST;
 import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.JavaTokenType;
 import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiJavaFile;
 import com.intellij.psi.impl.cache.RecordUtil;
 import com.intellij.psi.impl.java.stubs.JavaClassElementType;
 import com.intellij.psi.impl.java.stubs.JavaStubElementType;
@@ -18,6 +19,7 @@ import com.intellij.psi.impl.source.tree.LightTreeUtil;
 import com.intellij.psi.stubs.LightStubElementFactory;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.util.JavaImplicitClassUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -107,6 +109,13 @@ public class JavaClassStubFactory implements LightStubElementFactory<PsiClassStu
 
 
     boolean isImplicit = node.getTokenType() == JavaElementType.IMPLICIT_CLASS;
+    if (isImplicit && parentStub instanceof PsiJavaFileStub) {
+      PsiJavaFile psiFile = ((PsiJavaFileStub)parentStub).getPsi();
+      if (psiFile != null) {
+        name = JavaImplicitClassUtil.getJvmName(psiFile.getName());
+      }
+    }
+
     final short flags = PsiClassStubImpl.packFlags(isDeprecatedByComment, isInterface, isEnum, isEnumConst, isAnonymous, isAnnotation,
                                                    isInQualifiedNew, hasDeprecatedAnnotation, false, false, hasDocComment, isRecord,
                                                    isImplicit, isValueClass);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
index f4638b0f22f2..732160849825 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 public class JavaFileElementType extends IFileElementType {
-  public static final int STUB_VERSION = 66;
+  public static final int STUB_VERSION = 67;
 
   public JavaFileElementType() {
     super("java.FILE", JavaLanguage.INSTANCE);
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/JavaStubsTest.java b/java/java-tests/testSrc/com/intellij/java/psi/JavaStubsTest.java
index 1bcefc9875f7..e5128be11d7d 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/JavaStubsTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/JavaStubsTest.java
@@ -6,6 +6,7 @@ import com.intellij.codeInspection.dataFlow.JavaMethodContractUtil;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ReadAction;
+import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.util.Computable;
@@ -30,6 +31,7 @@ import com.intellij.psi.PsiParameter;
 import com.intellij.psi.PsiParameterList;
 import com.intellij.psi.PsiReferenceExpression;
 import com.intellij.psi.PsiType;
+import com.intellij.psi.impl.java.stubs.index.JavaImplicitClassIndex;
 import com.intellij.psi.impl.source.PsiClassImpl;
 import com.intellij.psi.impl.source.PsiFieldImpl;
 import com.intellij.psi.impl.source.PsiFileImpl;
@@ -483,6 +485,19 @@ public class JavaStubsTest extends LightJavaCodeInsightFixtureTestCase {
     PsiTestUtil.checkStubsMatchText(psiFile);
   }
 
+  public void test_implicit_class_index_updated_after_file_rename() throws Exception {
+    PsiFile psiFile = myFixture.addFileToProject("Hello.java", "void main() {}");
+    GlobalSearchScope scope = GlobalSearchScope.allScope(getProject());
+
+    assertFalse(JavaImplicitClassIndex.getInstance().getElements("Hello", getProject(), scope).isEmpty());
+    assertTrue(JavaImplicitClassIndex.getInstance().getElements("World", getProject(), scope).isEmpty());
+
+    WriteAction.run(() -> psiFile.getVirtualFile().rename(this, "World.java"));
+
+    assertTrue(JavaImplicitClassIndex.getInstance().getElements("Hello", getProject(), scope).isEmpty());
+    assertFalse(JavaImplicitClassIndex.getInstance().getElements("World", getProject(), scope).isEmpty());
+  }
+
   public void test_array_type_use_annotation_stubbing() {
     myFixture.addClass("""
                          import java.lang.annotation.*;