From ebd429bcd9bdbbb6ae8e1be8899325374dfa547f Mon Sep 17 00:00:00 2001 From: Louis Vignier Date: Thu, 11 Sep 2025 17:32:47 +0200 Subject: [PATCH] [javadoc] Move JavaDocFragmentAnchorCache to java.psi.impl IJ-MR-174748 GitOrigin-RevId: d858bf5ed540278c07f72da72847ca76e1ddfe54 --- .../daemon/impl/analysis/JavaNamesHighlightVisitor.java | 4 ++-- .../completion/JavaDocCompletionContributor.java | 4 ++-- .../intellij/psi/impl/JavaPsiImplementationHelperImpl.java | 6 +----- .../codeInsight/javadoc}/JavaDocFragmentAnchorCache.kt | 2 +- .../java/indexing/JavaDocFragmentAnchorCacheTest.java | 4 ++-- 5 files changed, 8 insertions(+), 12 deletions(-) rename java/{java-indexing-impl/src/com/intellij/codeInsight/javadoc/index => java-psi-impl/src/com/intellij/codeInsight/javadoc}/JavaDocFragmentAnchorCache.kt (98%) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaNamesHighlightVisitor.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaNamesHighlightVisitor.java index 388af092ebf9..6f110ed0e287 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaNamesHighlightVisitor.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaNamesHighlightVisitor.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.analysis; import com.intellij.codeInsight.daemon.impl.HighlightVisitor; -import com.intellij.codeInsight.javadoc.index.JavaDocFragmentAnchorCacheKt; -import com.intellij.codeInsight.javadoc.index.JavaDocFragmentData; +import com.intellij.codeInsight.javadoc.JavaDocFragmentAnchorCacheKt; +import com.intellij.codeInsight.javadoc.JavaDocFragmentData; import com.intellij.java.codeserver.highlighting.JavaErrorCollector; import com.intellij.openapi.editor.colors.TextAttributesScheme; import com.intellij.openapi.project.DumbAware; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java index f12b9256e714..cb9765619ce9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java @@ -5,10 +5,10 @@ import com.intellij.application.options.CodeStyle; import com.intellij.codeInsight.TailTypes; import com.intellij.codeInsight.completion.scope.JavaCompletionProcessor; import com.intellij.codeInsight.editorActions.wordSelection.DocTagSelectioner; +import com.intellij.codeInsight.javadoc.JavaDocFragmentAnchorCacheKt; +import com.intellij.codeInsight.javadoc.JavaDocFragmentData; import com.intellij.codeInsight.javadoc.JavaDocUtil; import com.intellij.codeInsight.javadoc.SnippetMarkup; -import com.intellij.codeInsight.javadoc.index.JavaDocFragmentAnchorCacheKt; -import com.intellij.codeInsight.javadoc.index.JavaDocFragmentData; import com.intellij.codeInsight.lookup.*; import com.intellij.codeInsight.template.TemplateManager; import com.intellij.codeInsight.template.impl.ConstantNode; diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java index 467d56813adc..643ac0d69058 100644 --- a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java @@ -2,11 +2,7 @@ package com.intellij.psi.impl; import com.intellij.application.options.CodeStyle; -import com.intellij.codeInsight.javadoc.JavaDocInfoGenerator; -import com.intellij.codeInsight.javadoc.JavaSuperTypeSearchUtil; -import com.intellij.codeInsight.javadoc.SnippetMarkup; -import com.intellij.codeInsight.javadoc.index.JavaDocFragmentAnchorCacheKt; -import com.intellij.codeInsight.javadoc.index.JavaDocFragmentData; +import com.intellij.codeInsight.javadoc.*; import com.intellij.ide.fileTemplates.FileTemplate; import com.intellij.ide.fileTemplates.FileTemplateManager; import com.intellij.ide.fileTemplates.JavaTemplateUtil; diff --git a/java/java-indexing-impl/src/com/intellij/codeInsight/javadoc/index/JavaDocFragmentAnchorCache.kt b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocFragmentAnchorCache.kt similarity index 98% rename from java/java-indexing-impl/src/com/intellij/codeInsight/javadoc/index/JavaDocFragmentAnchorCache.kt rename to java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocFragmentAnchorCache.kt index 7472fbe385a3..995d0adff01d 100644 --- a/java/java-indexing-impl/src/com/intellij/codeInsight/javadoc/index/JavaDocFragmentAnchorCache.kt +++ b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocFragmentAnchorCache.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.codeInsight.javadoc.index +package com.intellij.codeInsight.javadoc import com.intellij.openapi.components.Service import com.intellij.openapi.components.service diff --git a/java/java-tests/testSrc/com/intellij/java/indexing/JavaDocFragmentAnchorCacheTest.java b/java/java-tests/testSrc/com/intellij/java/indexing/JavaDocFragmentAnchorCacheTest.java index e59d1e74cd12..cfbc41919395 100644 --- a/java/java-tests/testSrc/com/intellij/java/indexing/JavaDocFragmentAnchorCacheTest.java +++ b/java/java-tests/testSrc/com/intellij/java/indexing/JavaDocFragmentAnchorCacheTest.java @@ -1,8 +1,8 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.java.indexing; -import com.intellij.codeInsight.javadoc.index.JavaDocFragmentAnchorCacheKt; -import com.intellij.codeInsight.javadoc.index.JavaDocFragmentData; +import com.intellij.codeInsight.javadoc.JavaDocFragmentAnchorCacheKt; +import com.intellij.codeInsight.javadoc.JavaDocFragmentData; import com.intellij.openapi.project.Project; import com.intellij.testFramework.LightJavaCodeInsightTestCase; import org.intellij.lang.annotations.Language;