From 95794c70e4bb4999a94df6ceb4ed575e09d4e86c Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Mon, 9 Sep 2024 16:17:30 +0200 Subject: [PATCH] IJPL-161819 move InlinePromptManager to inlinePrompt package GitOrigin-RevId: ced69f25b85257cd8188cbf3e1d12924bf05e9f0 --- platform/analysis-api/api-dump-unreviewed.txt | 8 ++++---- .../intellij/{ai => inlinePrompt}/InlinePromptManager.kt | 5 +++-- .../src/com/intellij/ai/EmptyInlinePromptManager.kt | 1 + .../intention/impl/IntentionHintComponent.java | 2 +- .../inline/completion/InlineCompletionHandler.kt | 2 +- .../platform-resources/src/META-INF/LangExtensions.xml | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) rename platform/analysis-api/src/com/intellij/{ai => inlinePrompt}/InlinePromptManager.kt (95%) diff --git a/platform/analysis-api/api-dump-unreviewed.txt b/platform/analysis-api/api-dump-unreviewed.txt index efad35594ce3..256850f02818 100644 --- a/platform/analysis-api/api-dump-unreviewed.txt +++ b/platform/analysis-api/api-dump-unreviewed.txt @@ -1,7 +1,3 @@ -f:com.intellij.ai.InlinePrompt -- *sf:isInlinePromptShown(com.intellij.openapi.editor.Editor):Z -- *sf:isInlinePromptShown(com.intellij.openapi.editor.Editor,com.intellij.openapi.project.Project):Z -- *bs:isInlinePromptShown$default(com.intellij.openapi.editor.Editor,com.intellij.openapi.project.Project,I,java.lang.Object):Z f:com.intellij.analysis.AnalysisBundle - sf:BUNDLE:java.lang.String - s:message(java.lang.String,java.lang.Object[]):java.lang.String @@ -2249,6 +2245,10 @@ e:com.intellij.ide.scratch.ScratchFileService$Option f:com.intellij.ide.scratch.ScratchUtil - s:getRelativePath(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile):java.lang.String - s:isScratch(com.intellij.openapi.vfs.VirtualFile):Z +f:com.intellij.inlinePrompt.InlinePrompt +- *sf:isInlinePromptShown(com.intellij.openapi.editor.Editor):Z +- *sf:isInlinePromptShown(com.intellij.openapi.editor.Editor,com.intellij.openapi.project.Project):Z +- *bs:isInlinePromptShown$default(com.intellij.openapi.editor.Editor,com.intellij.openapi.project.Project,I,java.lang.Object):Z f:com.intellij.lang.BracePair - (com.intellij.psi.tree.IElementType,com.intellij.psi.tree.IElementType,Z):V - getLeftBraceType():com.intellij.psi.tree.IElementType diff --git a/platform/analysis-api/src/com/intellij/ai/InlinePromptManager.kt b/platform/analysis-api/src/com/intellij/inlinePrompt/InlinePromptManager.kt similarity index 95% rename from platform/analysis-api/src/com/intellij/ai/InlinePromptManager.kt rename to platform/analysis-api/src/com/intellij/inlinePrompt/InlinePromptManager.kt index 2a825124e3fa..e25a04cf2567 100644 --- a/platform/analysis-api/src/com/intellij/ai/InlinePromptManager.kt +++ b/platform/analysis-api/src/com/intellij/inlinePrompt/InlinePromptManager.kt @@ -1,8 +1,9 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. @file:JvmName("InlinePrompt") -package com.intellij.ai -import com.intellij.ai.InlinePromptManager.Companion.getInstance +package com.intellij.inlinePrompt + +import com.intellij.inlinePrompt.InlinePromptManager.Companion.getInstance import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import org.jetbrains.annotations.ApiStatus.Experimental diff --git a/platform/analysis-impl/src/com/intellij/ai/EmptyInlinePromptManager.kt b/platform/analysis-impl/src/com/intellij/ai/EmptyInlinePromptManager.kt index ee68895bbf33..2caeb0cea19b 100644 --- a/platform/analysis-impl/src/com/intellij/ai/EmptyInlinePromptManager.kt +++ b/platform/analysis-impl/src/com/intellij/ai/EmptyInlinePromptManager.kt @@ -1,6 +1,7 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ai +import com.intellij.inlinePrompt.InlinePromptManager import com.intellij.openapi.editor.Editor import javax.swing.Icon diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java index 586056452eda..c6113e9483ac 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java @@ -1,7 +1,6 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.ai.InlinePrompt; import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.daemon.impl.IntentionsUIImpl; import com.intellij.codeInsight.hint.*; @@ -19,6 +18,7 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.actions.ActionsCollector; import com.intellij.ide.plugins.DynamicPlugins; import com.intellij.ide.ui.UISettingsUtils; +import com.intellij.inlinePrompt.InlinePrompt; import com.intellij.internal.statistic.IntentionFUSCollector; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.openapi.Disposable; diff --git a/platform/platform-impl/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt b/platform/platform-impl/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt index ddbc27fb1b00..4f5615e5393e 100644 --- a/platform/platform-impl/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt +++ b/platform/platform-impl/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt @@ -1,7 +1,7 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.inline.completion -import com.intellij.ai.isInlinePromptShown +import com.intellij.inlinePrompt.isInlinePromptShown import com.intellij.codeInsight.inline.completion.elements.InlineCompletionElement import com.intellij.codeInsight.inline.completion.listeners.InlineCompletionTypingTracker import com.intellij.codeInsight.inline.completion.listeners.InlineSessionWiseCaretListener diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index f3fdaec99221..b3db683a2231 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -363,7 +363,7 @@ -