diff --git a/java/java-tests/testSrc/com/intellij/lang/documentation/DocumentationTest.java b/java/java-tests/testSrc/com/intellij/lang/documentation/DocumentationTest.java index 188a0e59b8a5..5ca63b4aca6a 100644 --- a/java/java-tests/testSrc/com/intellij/lang/documentation/DocumentationTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/documentation/DocumentationTest.java @@ -14,8 +14,8 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.List; -import static com.intellij.lang.documentation.ide.actions.ActionsKt.DOCUMENTATION_TARGETS; import static com.intellij.openapi.actionSystem.impl.Utils.wrapToAsyncDataContext; +import static com.intellij.platform.ide.documentation.ActionsKt.DOCUMENTATION_TARGETS; public final class DocumentationTest extends LightJavaCodeInsightTestCase { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.kt b/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.kt index a3a1299d5c87..b1abf9660edc 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.documentation.actions @@ -7,11 +7,11 @@ import com.intellij.codeInsight.documentation.QuickDocUtil.isDocumentationV2Enab import com.intellij.codeInsight.hint.HintManagerImpl.ActionToIgnore import com.intellij.codeInsight.lookup.LookupManager import com.intellij.featureStatistics.FeatureUsageTracker -import com.intellij.lang.documentation.ide.actions.DOCUMENTATION_TARGETS import com.intellij.lang.documentation.ide.impl.DocumentationManager.Companion.instance import com.intellij.openapi.actionSystem.* import com.intellij.openapi.editor.EditorGutter import com.intellij.openapi.project.DumbAware +import com.intellij.platform.ide.documentation.DOCUMENTATION_TARGETS import com.intellij.psi.PsiDocumentManager import com.intellij.psi.util.PsiUtilBase diff --git a/platform/lang-impl/src/com/intellij/lang/documentation/ide/actions/actions.kt b/platform/lang-impl/src/com/intellij/lang/documentation/ide/actions/actions.kt index 98cea3c8283c..619fefceba76 100644 --- a/platform/lang-impl/src/com/intellij/lang/documentation/ide/actions/actions.kt +++ b/platform/lang-impl/src/com/intellij/lang/documentation/ide/actions/actions.kt @@ -4,7 +4,6 @@ package com.intellij.lang.documentation.ide.actions import com.intellij.codeInsight.lookup.LookupManager import com.intellij.ide.impl.dataRules.GetDataRule -import com.intellij.lang.documentation.ide.DocumentationBrowserFacade import com.intellij.lang.documentation.ide.IdeDocumentationTargetProvider import com.intellij.lang.documentation.ide.impl.DocumentationBrowser import com.intellij.lang.documentation.ide.impl.DocumentationHistory @@ -17,18 +16,13 @@ import com.intellij.openapi.keymap.KeymapUtil import com.intellij.openapi.project.Project import com.intellij.openapi.ui.popup.JBPopup import com.intellij.platform.documentation.DocumentationTarget +import com.intellij.platform.ide.documentation.DOCUMENTATION_BROWSER import com.intellij.psi.util.PsiUtilBase import com.intellij.util.containers.ContainerUtil import com.intellij.util.ui.accessibility.ScreenReader import org.jetbrains.annotations.ApiStatus import javax.swing.JComponent -@JvmField -val DOCUMENTATION_TARGETS: DataKey> = DataKey.create("documentation.targets") - -@JvmField -val DOCUMENTATION_BROWSER: DataKey = DataKey.create("documentation.browser") - internal val DOCUMENTATION_POPUP: DataKey = DataKey.create("documentation.popup") internal const val PRIMARY_GROUP_ID: String = "Documentation.PrimaryGroup" diff --git a/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationBrowser.kt b/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationBrowser.kt index 160b144643a2..5e05abe9901d 100644 --- a/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationBrowser.kt +++ b/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationBrowser.kt @@ -2,7 +2,6 @@ package com.intellij.lang.documentation.ide.impl -import com.intellij.lang.documentation.ide.DocumentationBrowserFacade import com.intellij.lang.documentation.ide.ui.DocumentationUI import com.intellij.lang.documentation.ide.ui.UISnapshot import com.intellij.model.Pointer @@ -15,6 +14,7 @@ import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService import com.intellij.platform.documentation.DocumentationTarget import com.intellij.platform.documentation.impl.DocumentationRequest import com.intellij.platform.documentation.impl.InternalLinkResult +import com.intellij.platform.ide.documentation.DocumentationBrowserFacade import com.intellij.util.lateinitVal import kotlinx.coroutines.* import kotlinx.coroutines.channels.BufferOverflow diff --git a/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationManagementHelper.kt b/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationManagementHelper.kt index 319c4829d9a2..cc59abcb6fe1 100644 --- a/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationManagementHelper.kt +++ b/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationManagementHelper.kt @@ -1,7 +1,6 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.lang.documentation.ide.impl -import com.intellij.lang.documentation.ide.actions.DOCUMENTATION_TARGETS import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.components.Service @@ -9,6 +8,7 @@ import com.intellij.openapi.components.service import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.platform.documentation.DocumentationTarget +import com.intellij.platform.ide.documentation.DOCUMENTATION_TARGETS @Service class DocumentationManagementHelper(private val project: Project) { diff --git a/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationManager.kt b/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationManager.kt index 8321f0dfbe06..ef024e850581 100644 --- a/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationManager.kt +++ b/platform/lang-impl/src/com/intellij/lang/documentation/ide/impl/DocumentationManager.kt @@ -9,7 +9,6 @@ import com.intellij.codeInsight.lookup.LookupEx import com.intellij.codeInsight.lookup.LookupListener import com.intellij.codeInsight.lookup.impl.LookupManagerImpl import com.intellij.ide.util.propComponentProperty -import com.intellij.lang.documentation.ide.actions.DOCUMENTATION_TARGETS import com.intellij.lang.documentation.ide.ui.toolWindowUI import com.intellij.openapi.Disposable import com.intellij.openapi.actionSystem.CommonDataKeys @@ -27,6 +26,7 @@ import com.intellij.platform.documentation.impl.DocumentationRequest import com.intellij.platform.documentation.impl.InternalResolveLinkResult import com.intellij.platform.documentation.impl.documentationRequest import com.intellij.platform.documentation.impl.resolveLink +import com.intellij.platform.ide.documentation.DOCUMENTATION_TARGETS import com.intellij.ui.popup.AbstractPopup import com.intellij.util.ui.EDT import kotlinx.coroutines.* diff --git a/platform/lang-impl/src/com/intellij/lang/documentation/ide/ui/DocumentationToolWindowUpdater.kt b/platform/lang-impl/src/com/intellij/lang/documentation/ide/ui/DocumentationToolWindowUpdater.kt index abbb46ee1275..f0a7ffc59f84 100644 --- a/platform/lang-impl/src/com/intellij/lang/documentation/ide/ui/DocumentationToolWindowUpdater.kt +++ b/platform/lang-impl/src/com/intellij/lang/documentation/ide/ui/DocumentationToolWindowUpdater.kt @@ -4,7 +4,6 @@ package com.intellij.lang.documentation.ide.ui import com.intellij.ide.DataManager import com.intellij.ide.IdeEventQueue -import com.intellij.lang.documentation.ide.actions.DOCUMENTATION_TARGETS import com.intellij.lang.documentation.ide.impl.DocumentationBrowser import com.intellij.openapi.Disposable import com.intellij.openapi.actionSystem.AnActionEvent @@ -17,6 +16,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer import com.intellij.openapi.wm.IdeFocusManager import com.intellij.platform.documentation.impl.documentationRequest +import com.intellij.platform.ide.documentation.DOCUMENTATION_TARGETS import com.intellij.util.ui.EDT import com.intellij.util.ui.update.Activatable import kotlinx.coroutines.* diff --git a/platform/lang-impl/src/com/intellij/lang/documentation/ide/ui/DocumentationUI.kt b/platform/lang-impl/src/com/intellij/lang/documentation/ide/ui/DocumentationUI.kt index 97707e1ba900..28b73e06f149 100644 --- a/platform/lang-impl/src/com/intellij/lang/documentation/ide/ui/DocumentationUI.kt +++ b/platform/lang-impl/src/com/intellij/lang/documentation/ide/ui/DocumentationUI.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.lang.documentation.ide.ui @@ -10,7 +10,6 @@ import com.intellij.codeInsight.documentation.DocumentationManager.decorate import com.intellij.codeInsight.documentation.DocumentationScrollPane import com.intellij.ide.DataManager import com.intellij.lang.documentation.DocumentationImageResolver -import com.intellij.lang.documentation.ide.actions.DOCUMENTATION_BROWSER import com.intellij.lang.documentation.ide.actions.PRIMARY_GROUP_ID import com.intellij.lang.documentation.ide.actions.registerBackForwardActions import com.intellij.lang.documentation.ide.impl.DocumentationBrowser @@ -23,6 +22,7 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.text.HtmlChunk +import com.intellij.platform.ide.documentation.DOCUMENTATION_BROWSER import com.intellij.ui.FontSizeModel import com.intellij.ui.PopupHandler import com.intellij.util.flow.collectLatestUndispatched @@ -34,7 +34,6 @@ import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.flow.collect import org.jetbrains.annotations.Nls import java.awt.Color import java.awt.Rectangle diff --git a/platform/lang-impl/src/com/intellij/lang/documentation/ide/DocumentationBrowserFacade.kt b/platform/lang-impl/src/com/intellij/platform/ide/documentation/DocumentationBrowserFacade.kt similarity index 83% rename from platform/lang-impl/src/com/intellij/lang/documentation/ide/DocumentationBrowserFacade.kt rename to platform/lang-impl/src/com/intellij/platform/ide/documentation/DocumentationBrowserFacade.kt index 57e4a55d3532..7e5f1614e9f1 100644 --- a/platform/lang-impl/src/com/intellij/lang/documentation/ide/DocumentationBrowserFacade.kt +++ b/platform/lang-impl/src/com/intellij/platform/ide/documentation/DocumentationBrowserFacade.kt @@ -1,5 +1,5 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.lang.documentation.ide +package com.intellij.platform.ide.documentation import com.intellij.model.Pointer import com.intellij.platform.documentation.DocumentationTarget @@ -8,7 +8,7 @@ import org.jetbrains.annotations.ApiStatus.NonExtendable /** * Facade for consumption in actions. - * Use [com.intellij.lang.documentation.ide.actions.DOCUMENTATION_BROWSER] to obtain the current instance. + * Use [DOCUMENTATION_BROWSER] to obtain the current instance. * The instance must not be stored in a field or elsewhere. */ @Experimental diff --git a/platform/lang-impl/src/com/intellij/platform/ide/documentation/actions.kt b/platform/lang-impl/src/com/intellij/platform/ide/documentation/actions.kt new file mode 100644 index 000000000000..636aad03936c --- /dev/null +++ b/platform/lang-impl/src/com/intellij/platform/ide/documentation/actions.kt @@ -0,0 +1,11 @@ +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.ide.documentation + +import com.intellij.openapi.actionSystem.DataKey +import com.intellij.platform.documentation.DocumentationTarget + +@JvmField +val DOCUMENTATION_TARGETS: DataKey> = DataKey.create("documentation.targets") + +@JvmField +val DOCUMENTATION_BROWSER: DataKey = DataKey.create("documentation.browser")