From 59597eb18573efd134a4886a4cc2587c948d545f Mon Sep 17 00:00:00 2001 From: Yuriy Artamonov Date: Thu, 28 Mar 2024 16:50:12 +0100 Subject: [PATCH] [platform] IJPL-938 Deprecate public utils in `com.intellij.refactoring.suggested` Update usages GitOrigin-RevId: d56e13ad1631e92d900ded8d89edbed7bf214c41 --- .../testframework/JvmTestDiffProvider.kt | 2 +- .../suggested/JavaSuggestedRefactoringSupport.kt | 4 ++-- .../newImpl/ExtractMethodAnalyzer.kt | 6 +----- .../generation/GenerateLoggerHandler.kt | 2 +- .../src/com/intellij/psi/util/pointers.kt | 2 +- .../CompilerReferencesFindUsagesTest.java | 7 ++++--- ...JavaSuggestedRefactoringChangeListenerTest.kt | 2 +- .../impl/fixes/AddOptionalPropertiesIntention.kt | 2 +- .../impl/nestedCompletions/NestedCompletions.kt | 4 ++-- .../intellij/psi/util/PartiallyKnownString.kt | 1 - .../suggested/SuggestedRefactoringState.kt | 1 + .../SuggestedRefactoringStateChanges.kt | 3 ++- .../hint/ImplementationViewElement.kt | 6 +----- .../codeInsight/hints/InlayHintsUtils.kt | 4 ++-- .../hints/presentation/PresentationFactory.kt | 2 +- .../impl/PsiElementNavigationTarget.kt | 2 +- .../navigation/impl/PsiFileNavigationTarget.kt | 2 +- .../psi/PsiElementDocumentationTarget.kt | 2 +- .../IndentAwareInjectedFileChangesHandler.kt | 2 +- .../suggested/NewIdentifierWatcher.kt | 8 +++++++- .../suggested/PerformSuggestedRefactoring.kt | 1 + .../backend/src/DefaultNavBarItem.kt | 1 - .../toolwindow/StatisticsEventLogConsole.kt | 2 +- .../com/intellij/testFramework/PsiTestUtil.kt | 2 +- .../testframework/actions/TestDiffContent.kt | 2 +- .../VcsCodeVisionCurlyBracketLanguageContext.kt | 2 +- .../hints/VcsCodeVisionLanguageContext.kt | 4 ++-- .../WebSymbolsCompletionProviderBase.kt | 2 +- .../CodeCompletionWebSymbolWithDocumentation.kt | 2 +- ...edCodeCompletionWebSymbolWithDocumentation.kt | 2 +- .../impl/WebSymbolDocumentationTargetImpl.kt | 2 +- .../inspections/WebSymbolsInspectionsPass.kt | 2 +- .../search/PsiSourcedWebSymbolReference.kt | 10 ++-------- .../webSymbols/search/WebSymbolsUsageSearcher.kt | 2 +- .../intellij/webSymbols/utils/WebSymbolUtils.kt | 2 +- .../quickfix/ConvertToLightServiceFix.kt | 6 +----- .../src/util/BlockingContextInspections.kt | 2 +- .../writer/WorkspaceCodegenProblemsProvider.kt | 2 +- .../core/EditorConfigAutomatonBuilder.kt | 6 +----- .../KotlinLineCompletionEvaluationVisitor.kt | 2 +- .../PythonLineCompletionEvaluationVisitor.kt | 3 +-- .../visitor/PythonMultiLineEvaluationVisitor.kt | 4 ++-- .../visitor/LineCompletionEvaluationVisitor.kt | 7 ++----- .../ContextCollectionEvaluationCommand.kt | 9 +++------ .../com/intellij/grazie/text/CheckerRunner.kt | 2 +- .../intentions/GrReplaceReturnWithYield.kt | 4 ++-- .../type/highlighting/ParameterCastFix.kt | 2 +- .../CreateExecutableFromGroovyUsageRequest.kt | 8 ++------ .../GrInlineTransformationReferencesSearcher.kt | 8 +++----- .../CreateFieldFromConstructorLabelFix.java | 2 +- .../dynamic/DynamicPropertyFromLabelFix.java | 2 +- .../dynamic/DynamicPropertyFromRefFix.java | 4 ++-- .../intentions/elements/CreateMemberAction.kt | 2 +- .../GrRecursiveCallLineMarkerProvider.kt | 2 +- .../hint/GroovyImplicitNullArgumentCollector.kt | 2 +- .../bugs/AddClassToExtendsFix.java | 2 +- .../groovy/codeInspection/bugs/AddMethodFix.java | 2 +- .../resources/TypeCustomizerInspection.java | 2 +- .../ext/ginq/completion/GinqCompletionUtils.kt | 4 ++-- .../style/inference/InferenceProcessUtil.kt | 6 +----- .../suggesters/ReplaceCompletionSuggester.kt | 2 +- .../suggesters/SurroundWithSuggester.kt | 2 +- .../suggesters/UnwrapSuggester.kt | 4 ++-- ...avaFxEventHandlerReferenceQuickFixProvider.kt | 3 +-- .../kotlin/idea/editor/KotlinTypedHandler.kt | 11 ++--------- .../script/ucache/ScriptClassRootsUpdater.kt | 2 +- .../KotlinApplicableModCommandAction.kt | 2 +- .../fixes/AddFunModifierFixFactory.kt | 2 +- .../fixes/SuperClassNotInitializedFactories.kt | 2 +- .../k2/codeinsight/fixes/imprt/ImportQuickFix.kt | 2 +- .../idea/codeInsight/FoldInitializerAndIfUtil.kt | 2 +- .../KotlinSuperDeclarationsInfoService.kt | 6 +----- .../handlers/fixers/KtClassBodyFixer.kt | 2 +- .../expression/KotlinWhenSurrounder.kt | 2 +- .../impl/base/CallableReturnTypeUpdaterUtils.kt | 2 +- .../impl/base/JavaArgumentNameCommentUtils.kt | 2 +- .../impl/base/applicators/ApplicabilityRanges.kt | 4 ++-- .../impl/base/inspections/MergeIfsUtils.kt | 8 ++------ .../JoinDeclarationAndAssignmentInspection.kt | 1 - .../UsePropertyAccessSyntaxInspection.kt | 2 +- .../diagnosticBased/UnusedVariableInspection.kt | 2 +- .../expressions/WhenWithOnlyElseInspection.kt | 2 +- .../ConvertToStringTemplateInspection.kt | 2 +- .../ConvertToRawStringTemplateIntention.kt | 2 +- .../ConvertToStringTemplateIntention.kt | 2 +- .../intentions/InvertIfConditionIntention.kt | 1 - .../RemoveSingleArgumentNameIntention.kt | 4 ++-- ...ReplaceUnderscoreWithTypeArgumentIntention.kt | 2 +- .../shared/AddBracesToAllBranchesIntention.kt | 2 +- .../codeinsight/hints/KtLambdasHintsProvider.kt | 2 +- .../idea/k2/codeinsight/hints/printType.kt | 3 +-- .../quickDoc/KotlinDocumentationTarget.kt | 1 - .../codeInsight/lineMarkers/shared/Markers.kt | 2 +- .../KotlinRecursiveCallLineMarkerProvider.kt | 2 +- .../KotlinSuspendCallLineMarkerProvider.kt | 2 +- .../codeInsight/postfix/KotlinPostfixTemplate.kt | 2 +- .../idea/codeinsight/utils/AddQualifiersUtil.kt | 2 +- .../FirSuperMemberCompletionContributor.kt | 2 +- .../factories/ClassLookupElementFactory.kt | 16 ++++------------ .../factories/FunctionLookupElementFactory.kt | 2 +- .../idea/completion/impl/k2/lookups/utils.kt | 6 +----- .../idea/quickfix/RemoveUseSiteTargetFix.kt | 2 +- .../KotlinCopyPasteReferenceProcessor.kt | 1 + .../AbstractKotlinInlayHintsProvider.kt | 2 +- .../idea/inspections/UnusedSymbolInspection.kt | 1 + .../inspections/UnusedUnaryOperatorInspection.kt | 4 ++-- .../idea/intentions/AddFullQualifierIntention.kt | 2 +- .../kotlin/idea/quickfix/AbstractImportFix.kt | 1 + .../kotlin/idea/quickfix/AddFunModifierFix.kt | 2 +- .../callableBuilder/CallableBuilder.kt | 1 + .../cutPaste/MoveDeclarationsProcessor.kt | 4 ++-- .../KotlinIntroduceImportAliasHandler.kt | 14 +++++++------- .../AbstractKotlinInlayHintsProviderTest.kt | 2 +- .../AbstractCustomHighlightUsageHandlerTest.kt | 4 ++-- .../kotlin/j2k/inspectionLikePostProcessing.kt | 2 +- .../idea/searching/kmp/findAllActualForExpect.kt | 4 +--- ...bstractKotlinNavigationToLibrarySourceTest.kt | 4 ++-- .../introduce/KotlinIntroduceVariableContext.kt | 1 - .../refactoring/kotlinCommonRefactoringUtil.kt | 1 - .../refactoring/introduce/K2SemanticMatcher.kt | 2 +- .../extractFunction/ExtractionData.kt | 13 +++++-------- .../JavaKotlinSafeDeleteUsagesSearcher.kt | 1 - .../targetApiImpl/KotlinSafeDeleteTarget.kt | 2 +- .../KotlinSafeDeleteUsageSearcher.kt | 2 +- .../util/ConvertReferenceToLambdaUtil.kt | 2 +- .../FirMultiResolveTestInDifferentReadActions.kt | 2 +- ...MarkdownCodeSpanExtendWordSelectionHandler.kt | 4 ++-- .../headers/HeaderLevelInferenceTypedHandler.kt | 6 +----- .../lists/ListItemIndentUnindentHandlerBase.kt | 2 +- .../markdown/editor/lists/ListItemInfo.kt | 4 ++-- .../markdown/editor/lists/ListRenumberUtils.kt | 4 ++-- .../lists/MarkdownListEnterHandlerDelegate.kt | 6 +----- ...MarkdownListIndentBackspaceHandlerDelegate.kt | 2 +- ...rkdownListItemCreatingTypedHandlerDelegate.kt | 2 +- ...MarkdownListMarkerBackspaceHandlerDelegate.kt | 7 +------ .../markdown/editor/tables/ColumnSelection.kt | 4 ++-- .../editor/tables/TableFormattingUtils.kt | 2 +- .../editor/tables/TableModificationUtils.kt | 4 ++-- .../plugins/markdown/editor/tables/TableUtils.kt | 6 +----- .../tables/actions/InsertEmptyTableAction.kt | 2 +- .../tables/handlers/MarkdownTableTabHandler.kt | 2 +- .../tables/ui/MarkdownTableInlayProvider.kt | 2 +- .../ui/presentation/HorizontalBarPresentation.kt | 2 +- .../ui/presentation/VerticalBarPresentation.kt | 2 +- .../editor/toc/GenerateTableOfContentsAction.kt | 7 +------ .../CodeFenceDownloadLineMarkerProvider.kt | 4 ++-- .../actions/styling/MarkdownCreateLinkAction.kt | 4 ++-- .../ui/actions/styling/SetHeaderLevelImpl.kt | 4 ++-- .../markdown/model/psi/headers/HeaderSymbol.kt | 2 +- .../headers/html/HtmlAnchorSymbolDeclaration.kt | 2 +- .../html/HtmlAnchorVetoRenameCondition.kt | 2 +- .../markdown/model/psi/labels/LinkLabelSymbol.kt | 2 +- .../model/ProjectLevelHeaderFindUsagesTest.kt | 2 +- .../performancePlugin/commands/GoToPsiElement.kt | 4 ++-- .../intentions/TomlExpandInlineTableIntention.kt | 2 +- .../YAMLInvalidBlockChildrenErrorAnnotator.kt | 6 +----- .../HuggingFaceDocumentationTarget.kt | 3 +-- .../completion/PyRuntimeCompletionUtils.kt | 2 +- .../suggested/PySuggestedRefactoringSupport.kt | 1 + .../intellij/spellchecker/quickfixes/ChangeTo.kt | 2 +- .../WebSymbolsHtmlQueryConfigurator.kt | 2 +- ...bSymbolHtmlAttributeValueReferenceProvider.kt | 2 +- 162 files changed, 210 insertions(+), 303 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/testframework/JvmTestDiffProvider.kt b/java/execution/impl/src/com/intellij/execution/testframework/JvmTestDiffProvider.kt index c0ab5728486a..4db5dea9b209 100644 --- a/java/execution/impl/src/com/intellij/execution/testframework/JvmTestDiffProvider.kt +++ b/java/execution/impl/src/com/intellij/execution/testframework/JvmTestDiffProvider.kt @@ -11,7 +11,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiType import com.intellij.psi.search.GlobalSearchScope -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.util.asSafely import com.siyeh.ig.testFrameworks.UAssertHint import org.jetbrains.uast.* diff --git a/java/java-impl-refactorings/src/com/intellij/java/refactoring/suggested/JavaSuggestedRefactoringSupport.kt b/java/java-impl-refactorings/src/com/intellij/java/refactoring/suggested/JavaSuggestedRefactoringSupport.kt index f8c8568a6636..90068b2efa5d 100644 --- a/java/java-impl-refactorings/src/com/intellij/java/refactoring/suggested/JavaSuggestedRefactoringSupport.kt +++ b/java/java-impl-refactorings/src/com/intellij/java/refactoring/suggested/JavaSuggestedRefactoringSupport.kt @@ -7,10 +7,10 @@ import com.intellij.openapi.util.registry.Registry import com.intellij.psi.* import com.intellij.psi.impl.source.tree.ChildRole import com.intellij.psi.impl.source.tree.java.MethodElement +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import com.intellij.refactoring.suggested.SuggestedChangeSignatureData import com.intellij.refactoring.suggested.SuggestedRefactoringSupport -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset import com.siyeh.ig.psiutils.TypeUtils class JavaSuggestedRefactoringSupport : SuggestedRefactoringSupport { diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt index d88571cdfc44..d41e469d3902 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt @@ -10,10 +10,7 @@ import com.intellij.psi.* import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.searches.ReferencesSearch -import com.intellij.psi.util.PsiTreeUtil -import com.intellij.psi.util.PsiTypesUtil -import com.intellij.psi.util.PsiUtil -import com.intellij.psi.util.TypeConversionUtil +import com.intellij.psi.util.* import com.intellij.refactoring.extractMethod.newImpl.ExtractMethodHelper.findRequiredTypeParameters import com.intellij.refactoring.extractMethod.newImpl.ExtractMethodHelper.getExpressionType import com.intellij.refactoring.extractMethod.newImpl.ExtractMethodHelper.getReturnedExpression @@ -28,7 +25,6 @@ import com.intellij.refactoring.extractMethod.newImpl.structures.ExtractOptions import com.intellij.refactoring.extractMethod.newImpl.structures.FlowOutput import com.intellij.refactoring.extractMethod.newImpl.structures.FlowOutput.* import com.intellij.refactoring.extractMethod.newImpl.structures.InputParameter -import com.intellij.refactoring.suggested.startOffset import com.intellij.util.Processor import java.util.* diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt index 53d5a79e3f7c..623d5df4e2c4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt @@ -20,9 +20,9 @@ import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement import com.intellij.psi.PsiField import com.intellij.psi.PsiFile +import com.intellij.psi.util.endOffset import com.intellij.refactoring.IntroduceTargetChooser import com.intellij.refactoring.introduce.PsiIntroduceTarget -import com.intellij.refactoring.suggested.endOffset import com.intellij.refactoring.util.CommonRefactoringUtil import com.intellij.ui.logging.JvmLoggingSettingsStorage import org.jetbrains.java.generate.GenerationUtil diff --git a/java/java-impl/src/com/intellij/psi/util/pointers.kt b/java/java-impl/src/com/intellij/psi/util/pointers.kt index 4ec53263358d..d6d63f1a3100 100644 --- a/java/java-impl/src/com/intellij/psi/util/pointers.kt +++ b/java/java-impl/src/com/intellij/psi/util/pointers.kt @@ -21,6 +21,6 @@ import com.intellij.psi.SmartPointerManager import com.intellij.psi.SmartPsiElementPointer @JvmOverloads -fun T.createSmartPointer(theProject: Project = project): SmartPsiElementPointer { +internal fun T.createSmartPointer(theProject: Project = project): SmartPsiElementPointer { return SmartPointerManager.getInstance(theProject).createSmartPsiElementPointer(this) } diff --git a/java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesFindUsagesTest.java b/java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesFindUsagesTest.java index ffbb955dfc09..df4fd7181c87 100644 --- a/java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesFindUsagesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesFindUsagesTest.java @@ -18,7 +18,6 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.searches.FunctionalExpressionSearch; import com.intellij.psi.search.searches.MethodReferencesSearch; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.util.PointersKt; import com.intellij.testFramework.CompilerTester; import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.SkipSlowTestLocally; @@ -28,6 +27,8 @@ import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.Collection; +import static com.intellij.psi.SmartPointersKt.createSmartPointer; + @SkipSlowTestLocally public class CompilerReferencesFindUsagesTest extends DaemonAnalyzerTestCase { //TODO merge tests @@ -113,8 +114,8 @@ public class CompilerReferencesFindUsagesTest extends DaemonAnalyzerTestCase { private void assertSameUsageAfterRebuild(PsiElement target) { PsiReference ref1 = assertOneElement(searchReferences(target)); - SmartPsiElementPointer pRef = PointersKt.createSmartPointer(ref1.getElement()); - SmartPsiElementPointer pTarget = PointersKt.createSmartPointer(target); + SmartPsiElementPointer pRef = createSmartPointer(ref1.getElement()); + SmartPsiElementPointer pTarget = createSmartPointer(target); myCompilerTester.rebuild(); PsiReference ref2 = assertOneElement(searchReferences(pTarget.getElement())); diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/suggested/JavaSuggestedRefactoringChangeListenerTest.kt b/java/java-tests/testSrc/com/intellij/java/refactoring/suggested/JavaSuggestedRefactoringChangeListenerTest.kt index 9cb4fa139673..be2c8fc3d6e4 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/suggested/JavaSuggestedRefactoringChangeListenerTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/suggested/JavaSuggestedRefactoringChangeListenerTest.kt @@ -10,8 +10,8 @@ import com.intellij.psi.PsiElementFactory import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiLocalVariable import com.intellij.psi.util.descendantsOfType +import com.intellij.psi.util.endOffset import com.intellij.refactoring.suggested.BaseSuggestedRefactoringChangeListenerTest -import com.intellij.refactoring.suggested.endOffset class JavaSuggestedRefactoringChangeListenerTest : BaseSuggestedRefactoringChangeListenerTest() { override val fileType: FileType diff --git a/json/src/com/jetbrains/jsonSchema/impl/fixes/AddOptionalPropertiesIntention.kt b/json/src/com/jetbrains/jsonSchema/impl/fixes/AddOptionalPropertiesIntention.kt index 2724d2cb6a6a..04f038cae649 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/fixes/AddOptionalPropertiesIntention.kt +++ b/json/src/com/jetbrains/jsonSchema/impl/fixes/AddOptionalPropertiesIntention.kt @@ -16,8 +16,8 @@ import com.intellij.openapi.util.Ref import com.intellij.platform.ide.progress.runWithModalProgressBlocking import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.createSmartPointer import com.jetbrains.jsonSchema.extension.JsonLikeSyntaxAdapter import com.jetbrains.jsonSchema.impl.JsonCachedValues import com.jetbrains.jsonSchema.impl.JsonOriginalPsiWalker diff --git a/json/src/com/jetbrains/jsonSchema/impl/nestedCompletions/NestedCompletions.kt b/json/src/com/jetbrains/jsonSchema/impl/nestedCompletions/NestedCompletions.kt index bcb633fe2588..b4c7b4dadfc5 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/nestedCompletions/NestedCompletions.kt +++ b/json/src/com/jetbrains/jsonSchema/impl/nestedCompletions/NestedCompletions.kt @@ -8,9 +8,9 @@ import com.intellij.openapi.editor.* import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parents -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.jetbrains.jsonSchema.extension.JsonLikePsiWalker import com.jetbrains.jsonSchema.extension.adapters.JsonObjectValueAdapter import com.jetbrains.jsonSchema.extension.adapters.JsonValueAdapter diff --git a/platform/lang-api/src/com/intellij/psi/util/PartiallyKnownString.kt b/platform/lang-api/src/com/intellij/psi/util/PartiallyKnownString.kt index 5e96bc7418c1..12be55760863 100644 --- a/platform/lang-api/src/com/intellij/psi/util/PartiallyKnownString.kt +++ b/platform/lang-api/src/com/intellij/psi/util/PartiallyKnownString.kt @@ -9,7 +9,6 @@ import com.intellij.psi.ContributedReferenceHost import com.intellij.psi.ElementManipulators import com.intellij.psi.PsiElement import com.intellij.psi.PsiLanguageInjectionHost -import com.intellij.refactoring.suggested.startOffset import com.intellij.util.SmartList import com.intellij.util.containers.headTailOrNull import org.jetbrains.annotations.ApiStatus diff --git a/platform/lang-api/src/com/intellij/refactoring/suggested/SuggestedRefactoringState.kt b/platform/lang-api/src/com/intellij/refactoring/suggested/SuggestedRefactoringState.kt index 23e9373f9a80..b04585e012db 100644 --- a/platform/lang-api/src/com/intellij/refactoring/suggested/SuggestedRefactoringState.kt +++ b/platform/lang-api/src/com/intellij/refactoring/suggested/SuggestedRefactoringState.kt @@ -9,6 +9,7 @@ import com.intellij.refactoring.suggested.SuggestedRefactoringSupport.Signature import com.intellij.util.asSafely import com.intellij.util.keyFMap.KeyFMap import org.jetbrains.annotations.Nls +import com.intellij.psi.createSmartPointer private var nextFeatureUsageId = 0 diff --git a/platform/lang-api/src/com/intellij/refactoring/suggested/SuggestedRefactoringStateChanges.kt b/platform/lang-api/src/com/intellij/refactoring/suggested/SuggestedRefactoringStateChanges.kt index 95ca9022a0dd..26cd0e4254a6 100644 --- a/platform/lang-api/src/com/intellij/refactoring/suggested/SuggestedRefactoringStateChanges.kt +++ b/platform/lang-api/src/com/intellij/refactoring/suggested/SuggestedRefactoringStateChanges.kt @@ -10,6 +10,7 @@ import com.intellij.psi.PsiNamedElementWithCustomPresentation import com.intellij.refactoring.suggested.SuggestedRefactoringState.ErrorLevel import com.intellij.refactoring.suggested.SuggestedRefactoringState.ParameterMarker import com.intellij.refactoring.suggested.SuggestedRefactoringSupport.Signature +import com.intellij.openapi.editor.asTextRange /** * A service transforming a sequence of declaration states into [SuggestedRefactoringState]. @@ -145,7 +146,7 @@ abstract class SuggestedRefactoringStateChanges(protected val refactoringSupport } protected open fun guessParameterIdByMarkers(markerRange: TextRange, prevState: SuggestedRefactoringState): Any? { - return prevState.parameterMarkers.firstOrNull { it.rangeMarker.range == markerRange }?.parameterId + return prevState.parameterMarkers.firstOrNull { it.rangeMarker.asTextRange == markerRange }?.parameterId } /** diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewElement.kt b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewElement.kt index 7abbf33821d9..557f13488174 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewElement.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewElement.kt @@ -8,12 +8,8 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.util.Ref import com.intellij.openapi.vfs.VirtualFile -import com.intellij.psi.PsiBinaryFile -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiFile -import com.intellij.psi.PsiNamedElement +import com.intellij.psi.* import com.intellij.psi.util.PsiTreeUtil -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.usageView.UsageInfo import com.intellij.usages.Usage import com.intellij.usages.UsageInfo2UsageAdapter diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt b/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt index 51cf29f79a91..57d26750dd24 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt @@ -18,8 +18,8 @@ import com.intellij.openapi.util.Key import com.intellij.openapi.util.TextRange import com.intellij.psi.* import com.intellij.psi.util.PsiTreeUtil -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import com.intellij.util.SmartList import com.intellij.util.containers.ConcurrentIntObjectMap import com.intellij.util.ui.EDT diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/presentation/PresentationFactory.kt b/platform/lang-impl/src/com/intellij/codeInsight/hints/presentation/PresentationFactory.kt index 683fd65ac648..d8148cce3862 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hints/presentation/PresentationFactory.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/presentation/PresentationFactory.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.pom.Navigatable import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.ui.LightweightHint import com.intellij.util.ui.JBUI import org.jetbrains.annotations.ApiStatus diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/PsiElementNavigationTarget.kt b/platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/PsiElementNavigationTarget.kt index 9c914377820a..2a714b6797e8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/PsiElementNavigationTarget.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/PsiElementNavigationTarget.kt @@ -7,7 +7,7 @@ import com.intellij.platform.backend.navigation.NavigationRequest import com.intellij.platform.backend.navigation.NavigationTarget import com.intellij.platform.backend.presentation.TargetPresentation import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer internal class PsiElementNavigationTarget(private val myElement: PsiElement) : NavigationTarget { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/PsiFileNavigationTarget.kt b/platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/PsiFileNavigationTarget.kt index 81fd07d1d451..23460c5fb034 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/PsiFileNavigationTarget.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/PsiFileNavigationTarget.kt @@ -9,7 +9,7 @@ import com.intellij.platform.backend.navigation.NavigationRequest import com.intellij.platform.backend.navigation.NavigationTarget import com.intellij.platform.backend.presentation.TargetPresentation import com.intellij.psi.PsiFile -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer internal class PsiFileNavigationTarget( private val psiFile: PsiFile diff --git a/platform/lang-impl/src/com/intellij/lang/documentation/psi/PsiElementDocumentationTarget.kt b/platform/lang-impl/src/com/intellij/lang/documentation/psi/PsiElementDocumentationTarget.kt index b14d652bb7be..f4e66ae365ba 100644 --- a/platform/lang-impl/src/com/intellij/lang/documentation/psi/PsiElementDocumentationTarget.kt +++ b/platform/lang-impl/src/com/intellij/lang/documentation/psi/PsiElementDocumentationTarget.kt @@ -19,7 +19,7 @@ import com.intellij.platform.backend.presentation.TargetPresentation import com.intellij.pom.Navigatable import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import com.intellij.util.SlowOperations import com.intellij.util.concurrency.annotations.RequiresReadLock import org.jetbrains.annotations.Nls diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/changesHandler/IndentAwareInjectedFileChangesHandler.kt b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/changesHandler/IndentAwareInjectedFileChangesHandler.kt index 846a72aa6201..46ec9f4524f8 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/changesHandler/IndentAwareInjectedFileChangesHandler.kt +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/changesHandler/IndentAwareInjectedFileChangesHandler.kt @@ -18,9 +18,9 @@ import com.intellij.psi.ElementManipulators import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile import com.intellij.psi.PsiLanguageInjectionHost.Shred +import com.intellij.psi.createSmartPointer import com.intellij.psi.impl.PsiDocumentManagerBase import com.intellij.psi.impl.source.resolve.FileContextUtil -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.util.SmartList import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.tail diff --git a/platform/lang-impl/src/com/intellij/refactoring/suggested/NewIdentifierWatcher.kt b/platform/lang-impl/src/com/intellij/refactoring/suggested/NewIdentifierWatcher.kt index 656c027b4642..fb71168511bb 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/suggested/NewIdentifierWatcher.kt +++ b/platform/lang-impl/src/com/intellij/refactoring/suggested/NewIdentifierWatcher.kt @@ -93,4 +93,10 @@ class NewIdentifierWatcher(private val maxIdentifiers: Int) { private fun SuggestedRefactoringSupport.isIdentifierLike(text: CharSequence) = text.isNotEmpty() && isIdentifierStart(text[0]) && text.all { isIdentifierPart(it) } -} + + private val DocumentEvent.oldRange: TextRange + get() = TextRange(offset, offset + oldLength) + + private val DocumentEvent.newRange: TextRange + get() = TextRange(offset, offset + newLength) +} \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/refactoring/suggested/PerformSuggestedRefactoring.kt b/platform/lang-impl/src/com/intellij/refactoring/suggested/PerformSuggestedRefactoring.kt index cfa9a74c28bb..6a6a3a3d5e79 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/suggested/PerformSuggestedRefactoring.kt +++ b/platform/lang-impl/src/com/intellij/refactoring/suggested/PerformSuggestedRefactoring.kt @@ -33,6 +33,7 @@ import com.intellij.openapi.util.NlsContexts import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement +import com.intellij.psi.util.startOffset import com.intellij.refactoring.RefactoringBundle import com.intellij.refactoring.RefactoringFactory import com.intellij.refactoring.suggested.SuggestedRefactoringExecution.NewParameterValue diff --git a/platform/navbar.compatibility/backend/src/DefaultNavBarItem.kt b/platform/navbar.compatibility/backend/src/DefaultNavBarItem.kt index fd90c27ab396..cb52d2ad988e 100644 --- a/platform/navbar.compatibility/backend/src/DefaultNavBarItem.kt +++ b/platform/navbar.compatibility/backend/src/DefaultNavBarItem.kt @@ -30,7 +30,6 @@ import com.intellij.platform.navbar.backend.NavBarItem import com.intellij.pom.Navigatable import com.intellij.problems.WolfTheProblemSolver import com.intellij.psi.* -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.ui.SimpleTextAttributes import com.intellij.ui.SimpleTextAttributes.* import com.intellij.util.IconUtil diff --git a/platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/toolwindow/StatisticsEventLogConsole.kt b/platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/toolwindow/StatisticsEventLogConsole.kt index bd3f42482dbd..f1a03a662f77 100644 --- a/platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/toolwindow/StatisticsEventLogConsole.kt +++ b/platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/toolwindow/StatisticsEventLogConsole.kt @@ -17,7 +17,7 @@ import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.wm.ToolWindowManager import com.intellij.psi.PsiManager -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset internal class StatisticsEventLogConsole(private val project: Project, model: LogFilterModel, recorderId: String) : LogConsoleBase(project, null, eventLogToolWindowsId, false, model) { diff --git a/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.kt b/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.kt index b9b62cd593f4..9834e42be491 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.kt +++ b/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.kt @@ -6,7 +6,7 @@ import com.intellij.lang.injection.InjectedLanguageManager import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile import com.intellij.psi.PsiReference -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.util.asSafely import com.intellij.util.text.allOccurrencesOf diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffContent.kt b/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffContent.kt index cc3829f5334e..37f8e6a27b56 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffContent.kt +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffContent.kt @@ -21,7 +21,7 @@ import com.intellij.psi.ElementManipulators import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.util.concurrency.annotations.RequiresEdt import java.util.function.IntUnaryOperator diff --git a/platform/vcs-api/src/com/intellij/codeInsight/hints/VcsCodeVisionCurlyBracketLanguageContext.kt b/platform/vcs-api/src/com/intellij/codeInsight/hints/VcsCodeVisionCurlyBracketLanguageContext.kt index bae27ff04a98..4526b2ff5368 100644 --- a/platform/vcs-api/src/com/intellij/codeInsight/hints/VcsCodeVisionCurlyBracketLanguageContext.kt +++ b/platform/vcs-api/src/com/intellij/codeInsight/hints/VcsCodeVisionCurlyBracketLanguageContext.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.SyntaxTraverser -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset /** * This class is needed to compute effective range without trailing right braces and whitespaces. diff --git a/platform/vcs-api/src/com/intellij/codeInsight/hints/VcsCodeVisionLanguageContext.kt b/platform/vcs-api/src/com/intellij/codeInsight/hints/VcsCodeVisionLanguageContext.kt index 374936840919..4f8faec648d7 100644 --- a/platform/vcs-api/src/com/intellij/codeInsight/hints/VcsCodeVisionLanguageContext.kt +++ b/platform/vcs-api/src/com/intellij/codeInsight/hints/VcsCodeVisionLanguageContext.kt @@ -7,8 +7,8 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiNameIdentifierOwner -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import org.jetbrains.annotations.ApiStatus import java.awt.event.MouseEvent diff --git a/platform/webSymbols/src/com/intellij/webSymbols/completion/WebSymbolsCompletionProviderBase.kt b/platform/webSymbols/src/com/intellij/webSymbols/completion/WebSymbolsCompletionProviderBase.kt index 0de5206df577..885b7156029f 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/completion/WebSymbolsCompletionProviderBase.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/completion/WebSymbolsCompletionProviderBase.kt @@ -9,7 +9,7 @@ import com.intellij.lang.injection.InjectedLanguageManager import com.intellij.openapi.util.TextRange import com.intellij.patterns.StandardPatterns import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.util.ProcessingContext import com.intellij.webSymbols.FrameworkId import com.intellij.webSymbols.WebSymbolQualifiedKind diff --git a/platform/webSymbols/src/com/intellij/webSymbols/completion/impl/CodeCompletionWebSymbolWithDocumentation.kt b/platform/webSymbols/src/com/intellij/webSymbols/completion/impl/CodeCompletionWebSymbolWithDocumentation.kt index c7ce4a2b65d8..d3142819a485 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/completion/impl/CodeCompletionWebSymbolWithDocumentation.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/completion/impl/CodeCompletionWebSymbolWithDocumentation.kt @@ -5,7 +5,7 @@ import com.intellij.model.Pointer import com.intellij.platform.backend.documentation.DocumentationSymbol import com.intellij.platform.backend.documentation.DocumentationTarget import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import com.intellij.webSymbols.WebSymbol import com.intellij.webSymbols.WebSymbolDelegate diff --git a/platform/webSymbols/src/com/intellij/webSymbols/completion/impl/PsiSourcedCodeCompletionWebSymbolWithDocumentation.kt b/platform/webSymbols/src/com/intellij/webSymbols/completion/impl/PsiSourcedCodeCompletionWebSymbolWithDocumentation.kt index d4cbc7449ff1..f0e2962975a4 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/completion/impl/PsiSourcedCodeCompletionWebSymbolWithDocumentation.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/completion/impl/PsiSourcedCodeCompletionWebSymbolWithDocumentation.kt @@ -5,7 +5,7 @@ import com.intellij.model.Pointer import com.intellij.platform.backend.documentation.DocumentationSymbol import com.intellij.platform.backend.documentation.DocumentationTarget import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import com.intellij.webSymbols.PsiSourcedWebSymbol import com.intellij.webSymbols.PsiSourcedWebSymbolDelegate diff --git a/platform/webSymbols/src/com/intellij/webSymbols/documentation/impl/WebSymbolDocumentationTargetImpl.kt b/platform/webSymbols/src/com/intellij/webSymbols/documentation/impl/WebSymbolDocumentationTargetImpl.kt index b5fad64a8e43..43610359565c 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/documentation/impl/WebSymbolDocumentationTargetImpl.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/documentation/impl/WebSymbolDocumentationTargetImpl.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.platform.backend.documentation.DocumentationResult import com.intellij.platform.backend.documentation.DocumentationTarget import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import com.intellij.ui.scale.ScaleContext import com.intellij.ui.scale.ScaleType import com.intellij.util.IconUtil diff --git a/platform/webSymbols/src/com/intellij/webSymbols/inspections/WebSymbolsInspectionsPass.kt b/platform/webSymbols/src/com/intellij/webSymbols/inspections/WebSymbolsInspectionsPass.kt index 9dc6e759c669..f3bedcc4c03e 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/inspections/WebSymbolsInspectionsPass.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/inspections/WebSymbolsInspectionsPass.kt @@ -32,7 +32,7 @@ import com.intellij.psi.PsiFile import com.intellij.psi.SyntaxTraverser import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil import com.intellij.psi.impl.source.tree.injected.changesHandler.innerRange -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.util.containers.ContainerUtil import com.intellij.webSymbols.WebSymbolsBundle import com.intellij.webSymbols.inspections.impl.WebSymbolsInspectionToolMappingEP diff --git a/platform/webSymbols/src/com/intellij/webSymbols/search/PsiSourcedWebSymbolReference.kt b/platform/webSymbols/src/com/intellij/webSymbols/search/PsiSourcedWebSymbolReference.kt index 86e6ea4542aa..0eaf6f03264c 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/search/PsiSourcedWebSymbolReference.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/search/PsiSourcedWebSymbolReference.kt @@ -3,16 +3,12 @@ package com.intellij.webSymbols.search import com.intellij.model.psi.PsiExternalReferenceHost import com.intellij.openapi.util.Ref import com.intellij.openapi.util.TextRange -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiNamedElement -import com.intellij.psi.PsiReference -import com.intellij.psi.SmartPointerManager +import com.intellij.psi.* import com.intellij.psi.impl.FakePsiElement -import com.intellij.refactoring.suggested.createSmartPointer -import com.intellij.refactoring.suggested.startOffset import com.intellij.refactoring.util.NonCodeUsageInfo import com.intellij.webSymbols.WebSymbol import com.intellij.webSymbols.query.WebSymbolsQueryExecutorFactory +import com.intellij.psi.util.startOffset class PsiSourcedWebSymbolReference(private val symbol: WebSymbol, private val sourceElement: PsiElement, @@ -72,7 +68,5 @@ class PsiSourcedWebSymbolReference(private val symbol: WebSymbol, newName, file.text.substring(range.startOffset, range.endOffset))) } - } - } \ No newline at end of file diff --git a/platform/webSymbols/src/com/intellij/webSymbols/search/WebSymbolsUsageSearcher.kt b/platform/webSymbols/src/com/intellij/webSymbols/search/WebSymbolsUsageSearcher.kt index 1713aee86a1d..c1bf5162dfc3 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/search/WebSymbolsUsageSearcher.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/search/WebSymbolsUsageSearcher.kt @@ -16,8 +16,8 @@ import com.intellij.openapi.components.service import com.intellij.openapi.project.Project import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.psi.search.SearchScope +import com.intellij.psi.util.startOffset import com.intellij.psi.util.walkUp -import com.intellij.refactoring.suggested.startOffset import com.intellij.util.Query import com.intellij.webSymbols.PsiSourcedWebSymbol import com.intellij.webSymbols.WebSymbol diff --git a/platform/webSymbols/src/com/intellij/webSymbols/utils/WebSymbolUtils.kt b/platform/webSymbols/src/com/intellij/webSymbols/utils/WebSymbolUtils.kt index eea305f16d92..c2cb5372a28c 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/utils/WebSymbolUtils.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/utils/WebSymbolUtils.kt @@ -14,8 +14,8 @@ import com.intellij.openapi.util.ModificationTracker import com.intellij.platform.backend.navigation.NavigationTarget import com.intellij.pom.Navigatable import com.intellij.psi.PsiElement +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.PsiModificationTracker -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.util.containers.Stack import com.intellij.webSymbols.* import com.intellij.webSymbols.completion.WebSymbolCodeCompletionItem diff --git a/plugins/devkit/devkit-core/src/inspections/quickfix/ConvertToLightServiceFix.kt b/plugins/devkit/devkit-core/src/inspections/quickfix/ConvertToLightServiceFix.kt index b2cb35422f91..4c378e9fec3e 100644 --- a/plugins/devkit/devkit-core/src/inspections/quickfix/ConvertToLightServiceFix.kt +++ b/plugins/devkit/devkit-core/src/inspections/quickfix/ConvertToLightServiceFix.kt @@ -11,12 +11,8 @@ import com.intellij.lang.LanguageExtension import com.intellij.openapi.components.Service import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project -import com.intellij.psi.JavaPsiFacade -import com.intellij.psi.PsiClass -import com.intellij.psi.PsiElement -import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.* import com.intellij.psi.xml.XmlTag -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.util.xml.highlighting.RemoveDomElementQuickFix import org.jetbrains.idea.devkit.DevKitBundle import org.jetbrains.idea.devkit.inspections.getProjectLevelFQN diff --git a/plugins/devkit/devkit-core/src/util/BlockingContextInspections.kt b/plugins/devkit/devkit-core/src/util/BlockingContextInspections.kt index 0a5de97f15e9..ab978aec0162 100644 --- a/plugins/devkit/devkit-core/src/util/BlockingContextInspections.kt +++ b/plugins/devkit/devkit-core/src/util/BlockingContextInspections.kt @@ -10,8 +10,8 @@ import com.intellij.openapi.util.IntellijInternalApi import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.PsiTreeUtil -import com.intellij.psi.util.createSmartPointer import com.intellij.util.concurrency.annotations.RequiresBlockingContext import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.idea.devkit.inspections.DevKitInspectionUtil diff --git a/plugins/devkit/intellij.devkit.workspaceModel/src/codegen/writer/WorkspaceCodegenProblemsProvider.kt b/plugins/devkit/intellij.devkit.workspaceModel/src/codegen/writer/WorkspaceCodegenProblemsProvider.kt index 21f0e081dfe6..06b13a7cc3ed 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/src/codegen/writer/WorkspaceCodegenProblemsProvider.kt +++ b/plugins/devkit/intellij.devkit.workspaceModel/src/codegen/writer/WorkspaceCodegenProblemsProvider.kt @@ -15,7 +15,7 @@ import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiNameIdentifierOwner -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.workspaceModel.codegen.engine.GenerationProblem import com.intellij.workspaceModel.codegen.engine.ProblemLocation import org.jetbrains.kotlin.resolve.source.getPsi diff --git a/plugins/editorconfig/src/org/editorconfig/core/EditorConfigAutomatonBuilder.kt b/plugins/editorconfig/src/org/editorconfig/core/EditorConfigAutomatonBuilder.kt index f0f4daf6918f..7877f861c5e8 100644 --- a/plugins/editorconfig/src/org/editorconfig/core/EditorConfigAutomatonBuilder.kt +++ b/plugins/editorconfig/src/org/editorconfig/core/EditorConfigAutomatonBuilder.kt @@ -4,11 +4,7 @@ package org.editorconfig.core import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.progress.ProgressIndicatorProvider import com.intellij.openapi.util.Key -import com.intellij.psi.util.CachedValue -import com.intellij.psi.util.CachedValueProvider -import com.intellij.psi.util.CachedValuesManager -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import dk.brics.automaton.Automaton import dk.brics.automaton.BasicOperations import dk.brics.automaton.RegExp diff --git a/plugins/evaluation-plugin/languages/kotlin/src/com/intellij/cce/visitor/KotlinLineCompletionEvaluationVisitor.kt b/plugins/evaluation-plugin/languages/kotlin/src/com/intellij/cce/visitor/KotlinLineCompletionEvaluationVisitor.kt index e55f3c1eeab0..e5787f0b6b2b 100644 --- a/plugins/evaluation-plugin/languages/kotlin/src/com/intellij/cce/visitor/KotlinLineCompletionEvaluationVisitor.kt +++ b/plugins/evaluation-plugin/languages/kotlin/src/com/intellij/cce/visitor/KotlinLineCompletionEvaluationVisitor.kt @@ -8,7 +8,7 @@ import com.intellij.psi.PsiComment import com.intellij.psi.PsiElement import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.util.elementType -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* diff --git a/plugins/evaluation-plugin/languages/python/src/com/intellij/cce/visitor/PythonLineCompletionEvaluationVisitor.kt b/plugins/evaluation-plugin/languages/python/src/com/intellij/cce/visitor/PythonLineCompletionEvaluationVisitor.kt index aa4289257644..c45dd726cfcc 100644 --- a/plugins/evaluation-plugin/languages/python/src/com/intellij/cce/visitor/PythonLineCompletionEvaluationVisitor.kt +++ b/plugins/evaluation-plugin/languages/python/src/com/intellij/cce/visitor/PythonLineCompletionEvaluationVisitor.kt @@ -9,11 +9,10 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.util.elementType -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import com.jetbrains.python.PythonTokenSetContributor import com.jetbrains.python.psi.* - class PythonLineCompletionVisitorFactory : LineCompletionVisitorFactory { override val language: Language = Language.PYTHON override fun createVisitor(featureName: String, mode: CompletionGolfMode): LineCompletionEvaluationVisitor { diff --git a/plugins/evaluation-plugin/languages/python/src/com/intellij/cce/visitor/PythonMultiLineEvaluationVisitor.kt b/plugins/evaluation-plugin/languages/python/src/com/intellij/cce/visitor/PythonMultiLineEvaluationVisitor.kt index 3ae4dd5d7044..0c1ce9919c71 100644 --- a/plugins/evaluation-plugin/languages/python/src/com/intellij/cce/visitor/PythonMultiLineEvaluationVisitor.kt +++ b/plugins/evaluation-plugin/languages/python/src/com/intellij/cce/visitor/PythonMultiLineEvaluationVisitor.kt @@ -4,8 +4,8 @@ import com.intellij.cce.core.* import com.intellij.cce.visitor.exceptions.PsiConverterException import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiComment -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import com.jetbrains.python.psi.* class PythonMultiLineEvaluationVisitor : EvaluationVisitor, PyRecursiveElementVisitor() { diff --git a/plugins/evaluation-plugin/languages/src/com/intellij/cce/visitor/LineCompletionEvaluationVisitor.kt b/plugins/evaluation-plugin/languages/src/com/intellij/cce/visitor/LineCompletionEvaluationVisitor.kt index 35fae2878023..60435455a8a4 100644 --- a/plugins/evaluation-plugin/languages/src/com/intellij/cce/visitor/LineCompletionEvaluationVisitor.kt +++ b/plugins/evaluation-plugin/languages/src/com/intellij/cce/visitor/LineCompletionEvaluationVisitor.kt @@ -5,14 +5,12 @@ import com.intellij.cce.core.* import com.intellij.cce.util.CompletionGolfTextUtil.isValuableString import com.intellij.cce.visitor.exceptions.PsiConverterException import com.intellij.psi.* -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import kotlin.math.min - interface LineCompletionEvaluationVisitor : EvaluationVisitor - interface LineCompletionAllEvaluationVisitor : LineCompletionEvaluationVisitor { val processor: Processor @@ -73,7 +71,6 @@ interface LineCompletionAllEvaluationVisitor : LineCompletionEvaluationVisitor { } } - class Default(override val feature: String, override val language: Language = Language.ANOTHER) : LineCompletionAllEvaluationVisitor, PsiRecursiveElementVisitor() { override val processor = Processor() diff --git a/plugins/evaluation-plugin/src/com/intellij/cce/actions/ContextCollectionEvaluationCommand.kt b/plugins/evaluation-plugin/src/com/intellij/cce/actions/ContextCollectionEvaluationCommand.kt index 9dafd6d91f7b..4d9e8e0c03c4 100644 --- a/plugins/evaluation-plugin/src/com/intellij/cce/actions/ContextCollectionEvaluationCommand.kt +++ b/plugins/evaluation-plugin/src/com/intellij/cce/actions/ContextCollectionEvaluationCommand.kt @@ -32,12 +32,9 @@ import com.intellij.openapi.application.runInEdt import com.intellij.openapi.application.runReadAction import com.intellij.openapi.editor.Document import com.intellij.openapi.project.Project -import com.intellij.psi.PsiDocumentManager -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiFile -import com.intellij.psi.SyntaxTraverser -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.* +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import java.lang.reflect.Type import java.nio.file.Paths import java.util.* diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CheckerRunner.kt b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CheckerRunner.kt index b0cd259238fb..5aff009730be 100644 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CheckerRunner.kt +++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CheckerRunner.kt @@ -29,7 +29,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.SmartPointerManager import com.intellij.psi.util.parents -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import kotlinx.coroutines.* import org.jetbrains.annotations.ApiStatus diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/GrReplaceReturnWithYield.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/GrReplaceReturnWithYield.kt index 2e0be18dff82..969432e412fc 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/GrReplaceReturnWithYield.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/intentions/GrReplaceReturnWithYield.kt @@ -5,8 +5,8 @@ import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModPsiUpdater import com.intellij.modcommand.Presentation import com.intellij.modcommand.PsiUpdateModCommandAction -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import org.jetbrains.plugins.groovy.GroovyBundle import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrReturnStatement diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ParameterCastFix.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ParameterCastFix.kt index ed611dc85fdc..fe0d4a971388 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ParameterCastFix.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ParameterCastFix.kt @@ -7,7 +7,7 @@ import com.intellij.modcommand.ModCommandQuickFix import com.intellij.model.Pointer import com.intellij.openapi.project.Project import com.intellij.psi.PsiType -import com.intellij.psi.util.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.annotations.Nls import org.jetbrains.annotations.Nls.Capitalization.Sentence import org.jetbrains.plugins.groovy.GroovyBundle diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/requests/CreateExecutableFromGroovyUsageRequest.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/requests/CreateExecutableFromGroovyUsageRequest.kt index 77b015f85422..f5e03ed23aee 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/requests/CreateExecutableFromGroovyUsageRequest.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/requests/CreateExecutableFromGroovyUsageRequest.kt @@ -4,13 +4,9 @@ package org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.requ import com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageBaseFix.getTargetSubstitutor import com.intellij.lang.jvm.JvmModifier import com.intellij.lang.jvm.actions.* -import com.intellij.psi.PsiClassType -import com.intellij.psi.PsiJvmSubstitutor -import com.intellij.psi.PsiType -import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.* import com.intellij.psi.codeStyle.JavaCodeStyleManager import com.intellij.psi.codeStyle.VariableKind.PARAMETER -import com.intellij.psi.util.createSmartPointer import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCall import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrAnonymousClassDefinition @@ -27,7 +23,7 @@ internal abstract class CreateExecutableFromGroovyUsageRequest( private val psiManager = call.manager private val project = psiManager.project - private val callPointer: SmartPsiElementPointer = call.createSmartPointer(project) + private val callPointer: SmartPsiElementPointer = SmartPointerManager.getInstance(project).createSmartPsiElementPointer(call) protected val call: T get() = callPointer.element ?: error("dead pointer") abstract fun getArguments(): List? diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrInlineTransformationReferencesSearcher.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrInlineTransformationReferencesSearcher.kt index ec89e184e800..f03ffffc3989 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrInlineTransformationReferencesSearcher.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrInlineTransformationReferencesSearcher.kt @@ -4,12 +4,10 @@ package org.jetbrains.plugins.groovy.findUsages import com.intellij.openapi.application.QueryExecutorBase import com.intellij.openapi.application.runReadAction import com.intellij.openapi.util.TextRange -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiReference -import com.intellij.psi.PsiReferenceBase +import com.intellij.psi.* import com.intellij.psi.search.searches.ReferencesSearch -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import com.intellij.util.Processor import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateFieldFromConstructorLabelFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateFieldFromConstructorLabelFix.java index f933806f2635..5c0a3db435c6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateFieldFromConstructorLabelFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateFieldFromConstructorLabelFix.java @@ -19,7 +19,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefini import org.jetbrains.plugins.groovy.lang.psi.expectedTypes.SupertypeConstraint; import org.jetbrains.plugins.groovy.lang.psi.expectedTypes.TypeConstraint; -import static com.intellij.psi.util.PointersKt.createSmartPointer; +import static com.intellij.psi.SmartPointersKt.createSmartPointer; /** * @author Maxim.Medvedev diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicPropertyFromLabelFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicPropertyFromLabelFix.java index 679d6e81efdf..7d7927f8df63 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicPropertyFromLabelFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicPropertyFromLabelFix.java @@ -15,7 +15,7 @@ import org.jetbrains.plugins.groovy.annotator.intentions.dynamic.ui.DynamicEleme import org.jetbrains.plugins.groovy.annotator.intentions.dynamic.ui.DynamicPropertyDialog; import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentLabel; -import static com.intellij.psi.util.PointersKt.createSmartPointer; +import static com.intellij.psi.SmartPointersKt.createSmartPointer; public class DynamicPropertyFromLabelFix extends DynamicPropertyFix { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicPropertyFromRefFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicPropertyFromRefFix.java index 52ec66484ebd..9d51ee9a4802 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicPropertyFromRefFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicPropertyFromRefFix.java @@ -5,7 +5,6 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.SmartPsiElementPointer; -import com.intellij.psi.util.PointersKt; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -16,6 +15,7 @@ import org.jetbrains.plugins.groovy.annotator.intentions.dynamic.ui.DynamicEleme import org.jetbrains.plugins.groovy.annotator.intentions.dynamic.ui.DynamicPropertyDialog; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression; +import static com.intellij.psi.SmartPointersKt.createSmartPointer; import static org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil.isInStaticCompilationContext; public class DynamicPropertyFromRefFix extends DynamicPropertyFix { @@ -23,7 +23,7 @@ public class DynamicPropertyFromRefFix extends DynamicPropertyFix { private final SmartPsiElementPointer myReferenceExpressionPointer; public DynamicPropertyFromRefFix(GrReferenceExpression referenceExpression) { - myReferenceExpressionPointer = PointersKt.createSmartPointer(referenceExpression); + myReferenceExpressionPointer = createSmartPointer(referenceExpression); } @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/elements/CreateMemberAction.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/elements/CreateMemberAction.kt index 9c542fec8fef..e45c24d2c23b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/elements/CreateMemberAction.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/elements/CreateMemberAction.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import com.intellij.psi.util.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition internal abstract class CreateMemberAction( diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GrRecursiveCallLineMarkerProvider.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GrRecursiveCallLineMarkerProvider.kt index d0d642afa350..372c10d01095 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GrRecursiveCallLineMarkerProvider.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GrRecursiveCallLineMarkerProvider.kt @@ -9,8 +9,8 @@ import com.intellij.openapi.editor.markup.GutterIconRenderer import com.intellij.openapi.progress.ProgressManager import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.endOffset import com.intellij.util.FunctionUtil import com.intellij.util.asSafely import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethodCall diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/hint/GroovyImplicitNullArgumentCollector.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/hint/GroovyImplicitNullArgumentCollector.kt index aa7e477ee0e9..2a5b3feb4721 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/hint/GroovyImplicitNullArgumentCollector.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/hint/GroovyImplicitNullArgumentCollector.kt @@ -5,8 +5,8 @@ import com.intellij.codeInsight.hints.declarative.InlayTreeSink import com.intellij.codeInsight.hints.declarative.InlineInlayPosition import com.intellij.codeInsight.hints.declarative.SharedBypassCollector import com.intellij.psi.PsiElement +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.endOffset import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCall import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddClassToExtendsFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddClassToExtendsFix.java index 5b0e04daef10..5ea421737a54 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddClassToExtendsFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddClassToExtendsFix.java @@ -19,7 +19,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrReferenceL import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement; -import static com.intellij.psi.util.PointersKt.createSmartPointer; +import static com.intellij.psi.SmartPointersKt.createSmartPointer; public class AddClassToExtendsFix extends GroovyFix { private final SmartPsiElementPointer myPsiClassPointer; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddMethodFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddMethodFix.java index 7f5f7dc716a3..69fdc4aa5f46 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddMethodFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddMethodFix.java @@ -29,7 +29,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMe import java.io.IOException; import java.util.Properties; -import static com.intellij.psi.util.PointersKt.createSmartPointer; +import static com.intellij.psi.SmartPointersKt.createSmartPointer; public class AddMethodFix extends GroovyFix { private static final Logger LOG = Logger.getInstance(AddMethodFix.class); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/resources/TypeCustomizerInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/resources/TypeCustomizerInspection.java index 2c3553fb3e05..487ac68727e4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/resources/TypeCustomizerInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/resources/TypeCustomizerInspection.java @@ -28,7 +28,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrRefere import java.util.HashSet; -import static com.intellij.psi.util.PointersKt.createSmartPointer; +import static com.intellij.psi.SmartPointersKt.createSmartPointer; /** * @author Max Medvedev diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/ext/ginq/completion/GinqCompletionUtils.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/ext/ginq/completion/GinqCompletionUtils.kt index f5c9dad80c1b..337f7f2afd41 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/ext/ginq/completion/GinqCompletionUtils.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/ext/ginq/completion/GinqCompletionUtils.kt @@ -11,9 +11,9 @@ import com.intellij.codeInsight.template.TemplateManager import com.intellij.codeInsight.template.impl.VariableNode import com.intellij.psi.PsiElement import com.intellij.psi.util.PsiTreeUtil +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.util.asSafely import icons.JetgroovyIcons import org.jetbrains.plugins.groovy.ext.ginq.* diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/InferenceProcessUtil.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/InferenceProcessUtil.kt index 8f3422e24f55..7119f607c415 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/InferenceProcessUtil.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/InferenceProcessUtil.kt @@ -12,11 +12,7 @@ import com.intellij.psi.impl.source.resolve.graphInference.InferenceVariablesOrd import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.SearchScope -import com.intellij.psi.util.TypeConversionUtil -import com.intellij.psi.util.parentOfType -import com.intellij.psi.util.parentsOfType -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import org.jetbrains.plugins.groovy.intentions.style.inference.driver.getJavaLangObject import org.jetbrains.plugins.groovy.intentions.style.inference.graph.InferenceUnitNode import org.jetbrains.plugins.groovy.lang.psi.GroovyFile diff --git a/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/ReplaceCompletionSuggester.kt b/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/ReplaceCompletionSuggester.kt index b858f3b5cdc6..a9f46a77cb24 100644 --- a/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/ReplaceCompletionSuggester.kt +++ b/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/ReplaceCompletionSuggester.kt @@ -3,7 +3,7 @@ package training.featuresSuggester.suggesters import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiComment -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import training.featuresSuggester.* import training.featuresSuggester.actions.* diff --git a/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/SurroundWithSuggester.kt b/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/SurroundWithSuggester.kt index 918f5c401360..333b1d40598d 100644 --- a/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/SurroundWithSuggester.kt +++ b/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/SurroundWithSuggester.kt @@ -2,7 +2,7 @@ package training.featuresSuggester.suggesters import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import training.featuresSuggester.FeatureSuggesterBundle import training.featuresSuggester.NoSuggestion import training.featuresSuggester.SuggesterSupport diff --git a/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/UnwrapSuggester.kt b/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/UnwrapSuggester.kt index ca97785e7c39..016ce66ad722 100644 --- a/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/UnwrapSuggester.kt +++ b/plugins/ide-features-trainer/src/training/featuresSuggester/suggesters/UnwrapSuggester.kt @@ -1,8 +1,8 @@ package training.featuresSuggester.suggesters import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import training.featuresSuggester.* import training.featuresSuggester.actions.Action import training.featuresSuggester.actions.BeforeEditorTextRemovedAction diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt index 82239d210020..f8dc3cc4ea62 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt @@ -7,7 +7,6 @@ import com.intellij.lang.jvm.JvmModifier import com.intellij.lang.jvm.actions.* import com.intellij.psi.* import com.intellij.psi.codeStyle.JavaCodeStyleSettings -import com.intellij.psi.util.createSmartPointer import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.xml.XmlAttributeValue import com.intellij.util.VisibilityUtil @@ -31,7 +30,7 @@ class CreateEventHandlerRequest(element: XmlAttributeValue) : CreateMethodReques private val myProject = element.project private val myVisibility = getVisibility(element) - private val myPointer = element.createSmartPointer(myProject) + private val myPointer = SmartPointerManager.getInstance(myProject).createSmartPsiElementPointer(element) override fun isValid(): Boolean = myPointer.element.let { it != null && it.value.let { value -> diff --git a/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.kt b/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.kt index f4eea2604e97..75899c7c4e83 100644 --- a/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.kt +++ b/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.kt @@ -10,17 +10,12 @@ import com.intellij.openapi.editor.EditorModificationUtilEx import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.project.Project import com.intellij.openapi.util.Key -import com.intellij.psi.PsiDocumentManager -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiErrorElement -import com.intellij.psi.PsiFile -import com.intellij.psi.PsiWhiteSpace -import com.intellij.psi.TokenType +import com.intellij.psi.* import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.psi.impl.source.tree.LeafPsiElement import com.intellij.psi.tree.TokenSet import com.intellij.psi.util.PsiTreeUtil -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.util.DocumentUtil import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.idea.KotlinFileType @@ -28,8 +23,6 @@ import org.jetbrains.kotlin.kdoc.lexer.KDocTokens import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.utils.addToStdlib.safeAs -import kotlin.jvm.java -import kotlin.takeIf internal object KotlinTypedHandlerHelper { internal val PREVIOUS_IN_STRING_DOLLAR_TYPED_OFFSET_KEY = Key.create("PREVIOUS_IN_STRING_DOLLAR_TYPED_OFFSET_KEY") diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt index a972780fa851..2e25200ebaa8 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt @@ -18,7 +18,7 @@ import com.intellij.openapi.vfs.VirtualFileManager import com.intellij.platform.backend.workspace.WorkspaceModel import com.intellij.platform.backend.workspace.impl.WorkspaceModelInternal import com.intellij.psi.PsiManager -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import com.intellij.testFramework.LightVirtualFile import com.intellij.util.applyIf import com.intellij.util.ui.EDT.isCurrentThreadEdt diff --git a/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicable/intentions/KotlinApplicableModCommandAction.kt b/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicable/intentions/KotlinApplicableModCommandAction.kt index ef9bc35e1de9..754da9ebd2cf 100644 --- a/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicable/intentions/KotlinApplicableModCommandAction.kt +++ b/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicable/intentions/KotlinApplicableModCommandAction.kt @@ -4,7 +4,7 @@ package org.jetbrains.kotlin.idea.codeinsight.api.applicable.intentions import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModCommand import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisAllowanceManager import org.jetbrains.kotlin.idea.codeinsight.api.applicable.ApplicableRangesProvider import org.jetbrains.kotlin.psi.KtBlockExpression diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddFunModifierFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddFunModifierFixFactory.kt index 51771388aa5f..456e8830147f 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddFunModifierFixFactory.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddFunModifierFixFactory.kt @@ -4,7 +4,7 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.fixes import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModPsiUpdater import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KtFirDiagnostic import org.jetbrains.kotlin.analysis.api.symbols.KtClassKind diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SuperClassNotInitializedFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SuperClassNotInitializedFactories.kt index fbefd397c5a1..b3c057ea2723 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SuperClassNotInitializedFactories.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SuperClassNotInitializedFactories.kt @@ -4,8 +4,8 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.fixes import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModPsiUpdater +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.endOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KtFirDiagnostic import org.jetbrains.kotlin.analysis.api.symbols.KtClassKind diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/imprt/ImportQuickFix.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/imprt/ImportQuickFix.kt index 5688ebfa1479..71da2559aa38 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/imprt/ImportQuickFix.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/imprt/ImportQuickFix.kt @@ -14,7 +14,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.statistics.StatisticsInfo import com.intellij.psi.statistics.StatisticsManager import com.intellij.psi.util.PsiModificationTracker -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KtFirDiagnostic import org.jetbrains.kotlin.analysis.api.renderer.base.annotations.KtRendererAnnotationsFilter diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/FoldInitializerAndIfUtil.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/FoldInitializerAndIfUtil.kt index 8ff94c8c5201..809c6f8a5116 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/FoldInitializerAndIfUtil.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/FoldInitializerAndIfUtil.kt @@ -4,7 +4,7 @@ package org.jetbrains.kotlin.idea.codeInsight import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.searches.ReferencesSearch -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.types.KtErrorType import org.jetbrains.kotlin.analysis.api.types.KtTypeNullability diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/KotlinSuperDeclarationsInfoService.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/KotlinSuperDeclarationsInfoService.kt index 83914fa678fc..4cb54855b9a0 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/KotlinSuperDeclarationsInfoService.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/KotlinSuperDeclarationsInfoService.kt @@ -3,12 +3,8 @@ package org.jetbrains.kotlin.idea.codeInsight import com.intellij.ide.util.EditSourceUtil import com.intellij.pom.Navigatable -import com.intellij.psi.PsiClass -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiMethod -import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.* import com.intellij.psi.util.parents -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.util.concurrency.annotations.RequiresReadLock import org.jetbrains.annotations.ApiStatus import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisOnEdt diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/handlers/fixers/KtClassBodyFixer.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/handlers/fixers/KtClassBodyFixer.kt index 3ac0283aea3d..b3a259302627 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/handlers/fixers/KtClassBodyFixer.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/handlers/fixers/KtClassBodyFixer.kt @@ -6,7 +6,7 @@ import com.intellij.lang.SmartEnterProcessorWithFixers import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import org.jetbrains.kotlin.idea.base.codeInsight.handlers.fixers.end import org.jetbrains.kotlin.idea.base.codeInsight.handlers.fixers.range import org.jetbrains.kotlin.idea.codeInsight.handlers.KotlinSmartEnterHandler diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.kt index 4d2f881a8611..39ea479c5c5b 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.util.TextRange -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisFromWriteAction import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisOnEdt import org.jetbrains.kotlin.analysis.api.analyze diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/CallableReturnTypeUpdaterUtils.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/CallableReturnTypeUpdaterUtils.kt index c8e23a862575..bed5e6086d7b 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/CallableReturnTypeUpdaterUtils.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/CallableReturnTypeUpdaterUtils.kt @@ -13,7 +13,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiComment import com.intellij.psi.PsiDocumentManager -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import org.jetbrains.annotations.ApiStatus import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.renderer.types.impl.KtTypeRendererForSource diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/JavaArgumentNameCommentUtils.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/JavaArgumentNameCommentUtils.kt index c842d17d254a..2ea01086e6e9 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/JavaArgumentNameCommentUtils.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/JavaArgumentNameCommentUtils.kt @@ -4,9 +4,9 @@ package org.jetbrains.kotlin.idea.codeinsights.impl.base import com.intellij.psi.PsiComment import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.elementType import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.successfulFunctionCallOrNull import org.jetbrains.kotlin.analysis.api.calls.symbol diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/applicators/ApplicabilityRanges.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/applicators/ApplicabilityRanges.kt index ff058d97e49e..df8a87277049 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/applicators/ApplicabilityRanges.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/applicators/ApplicabilityRanges.kt @@ -4,8 +4,8 @@ package org.jetbrains.kotlin.idea.codeinsights.impl.base.applicators import com.intellij.openapi.util.TextRange import com.intellij.psi.tree.TokenSet -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.idea.codeinsight.api.applicators.ApplicabilityRange import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/inspections/MergeIfsUtils.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/inspections/MergeIfsUtils.kt index 14a1015310f7..a10926388c01 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/inspections/MergeIfsUtils.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/inspections/MergeIfsUtils.kt @@ -2,14 +2,10 @@ package org.jetbrains.kotlin.idea.codeinsights.impl.base.inspections import com.intellij.psi.PsiComment -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.idea.base.util.reformatted import org.jetbrains.kotlin.idea.codeinsight.utils.findExistingEditor -import org.jetbrains.kotlin.psi.KtBlockExpression -import org.jetbrains.kotlin.psi.KtExpression -import org.jetbrains.kotlin.psi.KtIfExpression -import org.jetbrains.kotlin.psi.KtPsiFactory -import org.jetbrains.kotlin.psi.createExpressionByPattern +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.allChildren import org.jetbrains.kotlin.utils.addToStdlib.safeAs diff --git a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/JoinDeclarationAndAssignmentInspection.kt b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/JoinDeclarationAndAssignmentInspection.kt index 14ce000f62b8..7119313ea3d7 100644 --- a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/JoinDeclarationAndAssignmentInspection.kt +++ b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/JoinDeclarationAndAssignmentInspection.kt @@ -14,7 +14,6 @@ import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.parentOfType import com.intellij.psi.util.parents -import com.intellij.refactoring.suggested.startOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.singleVariableAccessCall import org.jetbrains.kotlin.analysis.api.calls.symbol diff --git a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/UsePropertyAccessSyntaxInspection.kt b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/UsePropertyAccessSyntaxInspection.kt index ee3ef0c3360c..1c69b28b2ece 100644 --- a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/UsePropertyAccessSyntaxInspection.kt +++ b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/UsePropertyAccessSyntaxInspection.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiMethod import com.intellij.psi.impl.compiled.ClsMethodImpl import com.intellij.psi.impl.source.tree.SharedImplUtil import com.intellij.psi.util.PropertyUtilBase -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.jdom.Element import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.analyze diff --git a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/diagnosticBased/UnusedVariableInspection.kt b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/diagnosticBased/UnusedVariableInspection.kt index fc8c763e1ce9..6b5343105771 100644 --- a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/diagnosticBased/UnusedVariableInspection.kt +++ b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/diagnosticBased/UnusedVariableInspection.kt @@ -6,7 +6,7 @@ import com.intellij.codeInspection.ProblemsHolder import com.intellij.modcommand.ModPsiUpdater import com.intellij.openapi.project.Project import com.intellij.openapi.util.TextRange -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtDiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KtFirDiagnostic diff --git a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/expressions/WhenWithOnlyElseInspection.kt b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/expressions/WhenWithOnlyElseInspection.kt index 7ce8523251b8..e89bed13eb32 100644 --- a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/expressions/WhenWithOnlyElseInspection.kt +++ b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/expressions/WhenWithOnlyElseInspection.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.SmartPsiElementPointer import com.intellij.psi.search.searches.ReferencesSearch -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferencesInRange diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/ConvertToStringTemplateInspection.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/ConvertToStringTemplateInspection.kt index 67627832cb2b..11b462c4d9b1 100644 --- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/ConvertToStringTemplateInspection.kt +++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/ConvertToStringTemplateInspection.kt @@ -5,7 +5,7 @@ import com.intellij.codeInspection.ProblemsHolder import com.intellij.modcommand.ModPsiUpdater import com.intellij.openapi.project.Project import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.idea.base.psi.replaced import org.jetbrains.kotlin.idea.base.resources.KotlinBundle diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToRawStringTemplateIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToRawStringTemplateIntention.kt index 076c86a0ad8c..6d010821b057 100644 --- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToRawStringTemplateIntention.kt +++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToRawStringTemplateIntention.kt @@ -4,8 +4,8 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.intentions import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModPsiUpdater import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.descendantsOfType -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.idea.base.psi.replaced import org.jetbrains.kotlin.idea.base.resources.KotlinBundle diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToStringTemplateIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToStringTemplateIntention.kt index 76b653ce6633..9653e9f7afa4 100644 --- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToStringTemplateIntention.kt +++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ConvertToStringTemplateIntention.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.intentions import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModPsiUpdater import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.idea.base.psi.replaced import org.jetbrains.kotlin.idea.base.resources.KotlinBundle diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InvertIfConditionIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InvertIfConditionIntention.kt index d2e4bc8c483c..606c734e9922 100644 --- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InvertIfConditionIntention.kt +++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/InvertIfConditionIntention.kt @@ -5,7 +5,6 @@ import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModPsiUpdater import com.intellij.openapi.util.TextRange import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.codeinsight.api.applicable.intentions.KotlinApplicableModCommandAction diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveSingleArgumentNameIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveSingleArgumentNameIntention.kt index 7d8715689cfa..e4e7406ca1b6 100644 --- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveSingleArgumentNameIntention.kt +++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/RemoveSingleArgumentNameIntention.kt @@ -5,8 +5,8 @@ import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModPsiUpdater import com.intellij.openapi.util.TextRange import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.createSmartPointer +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.idea.base.projectStructure.languageVersionSettings diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ReplaceUnderscoreWithTypeArgumentIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ReplaceUnderscoreWithTypeArgumentIntention.kt index 61e31d3003a7..1de902fd0684 100644 --- a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ReplaceUnderscoreWithTypeArgumentIntention.kt +++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/ReplaceUnderscoreWithTypeArgumentIntention.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.intentions import com.intellij.modcommand.ActionContext import com.intellij.modcommand.ModPsiUpdater import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.singleFunctionCallOrNull import org.jetbrains.kotlin.analysis.api.types.KtType diff --git a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/AddBracesToAllBranchesIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/AddBracesToAllBranchesIntention.kt index 78d497813b76..042a692e50ee 100644 --- a/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/AddBracesToAllBranchesIntention.kt +++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/AddBracesToAllBranchesIntention.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.codeInsight.intentions.shared import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.psi.util.elementType -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import com.intellij.util.containers.addIfNotNull import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.codeInsight.intentions.shared.AddBracesToAllBranchesIntention.Util.allBranchExpressions diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/hints/KtLambdasHintsProvider.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/hints/KtLambdasHintsProvider.kt index baca8df2a1c9..ccce6ffc8a44 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/hints/KtLambdasHintsProvider.kt +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/hints/KtLambdasHintsProvider.kt @@ -7,7 +7,7 @@ import com.intellij.codeInsight.hints.declarative.InlineInlayPosition import com.intellij.codeInsight.hints.declarative.PsiPointerInlayActionNavigationHandler import com.intellij.codeInsight.hints.declarative.PsiPointerInlayActionPayload import com.intellij.psi.PsiElement -import com.intellij.psi.util.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.analysis.api.analyze import org.jetbrains.kotlin.analysis.api.symbols.KtAnonymousFunctionSymbol import org.jetbrains.kotlin.idea.codeInsight.hints.SHOW_IMPLICIT_RECEIVERS_AND_PARAMS diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/hints/printType.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/hints/printType.kt index f6fdf8481680..0e82f2f20a91 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/hints/printType.kt +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/hints/printType.kt @@ -1,13 +1,12 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.k2.codeinsight.hints - import com.intellij.codeInsight.hints.declarative.InlayActionData import com.intellij.codeInsight.hints.declarative.PresentationTreeBuilder import com.intellij.codeInsight.hints.declarative.PsiPointerInlayActionNavigationHandler import com.intellij.codeInsight.hints.declarative.PsiPointerInlayActionPayload import com.intellij.codeInsight.hints.declarative.StringInlayActionPayload -import com.intellij.psi.util.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.annotations.ApiStatus import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtStarTypeProjection diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinDocumentationTarget.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinDocumentationTarget.kt index 97f310bf3e13..9bb9834c9e17 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinDocumentationTarget.kt +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinDocumentationTarget.kt @@ -14,7 +14,6 @@ import com.intellij.pom.Navigatable import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.PsiWhiteSpace -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.annotations.Nls import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.analyze diff --git a/plugins/kotlin/code-insight/line-markers-shared/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/shared/Markers.kt b/plugins/kotlin/code-insight/line-markers-shared/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/shared/Markers.kt index 33fd4622c698..5c7321faa1a1 100644 --- a/plugins/kotlin/code-insight/line-markers-shared/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/shared/Markers.kt +++ b/plugins/kotlin/code-insight/line-markers-shared/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/shared/Markers.kt @@ -8,8 +8,8 @@ import com.intellij.openapi.roots.libraries.Library import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Nls import org.jetbrains.kotlin.analysis.api.analyze diff --git a/plugins/kotlin/code-insight/line-markers/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/KotlinRecursiveCallLineMarkerProvider.kt b/plugins/kotlin/code-insight/line-markers/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/KotlinRecursiveCallLineMarkerProvider.kt index 0c2eddcb8ce6..e734f886591d 100644 --- a/plugins/kotlin/code-insight/line-markers/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/KotlinRecursiveCallLineMarkerProvider.kt +++ b/plugins/kotlin/code-insight/line-markers/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/KotlinRecursiveCallLineMarkerProvider.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.editor.markup.GutterIconRenderer import com.intellij.openapi.util.NlsSafe import com.intellij.psi.PsiElement import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.KtExplicitReceiverValue import org.jetbrains.kotlin.analysis.api.calls.KtImplicitReceiverValue diff --git a/plugins/kotlin/code-insight/line-markers/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/KotlinSuspendCallLineMarkerProvider.kt b/plugins/kotlin/code-insight/line-markers/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/KotlinSuspendCallLineMarkerProvider.kt index 0fc1429d16d9..361576895367 100644 --- a/plugins/kotlin/code-insight/line-markers/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/KotlinSuspendCallLineMarkerProvider.kt +++ b/plugins/kotlin/code-insight/line-markers/src/org/jetbrains/kotlin/idea/codeInsight/lineMarkers/KotlinSuspendCallLineMarkerProvider.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.editor.markup.GutterIconRenderer import com.intellij.openapi.util.NlsSafe import com.intellij.psi.PsiElement import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol import org.jetbrains.kotlin.idea.KotlinIcons diff --git a/plugins/kotlin/code-insight/postfix-templates/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KotlinPostfixTemplate.kt b/plugins/kotlin/code-insight/postfix-templates/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KotlinPostfixTemplate.kt index 5bffa34d2305..a57090ba0f1e 100644 --- a/plugins/kotlin/code-insight/postfix-templates/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KotlinPostfixTemplate.kt +++ b/plugins/kotlin/code-insight/postfix-templates/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KotlinPostfixTemplate.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.editor.Document import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.util.PsiUtilCore -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import com.intellij.util.Function import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisFromWriteAction diff --git a/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/AddQualifiersUtil.kt b/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/AddQualifiersUtil.kt index f12441e8639c..1bb9951901f9 100644 --- a/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/AddQualifiersUtil.kt +++ b/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/AddQualifiersUtil.kt @@ -2,10 +2,10 @@ package org.jetbrains.kotlin.idea.codeinsight.utils import com.intellij.openapi.command.WriteCommandAction +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.descendantsOfType import com.intellij.psi.util.elementType import com.intellij.psi.util.prevLeaf -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisFromWriteAction import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisOnEdt import org.jetbrains.kotlin.analysis.api.KtAnalysisSession diff --git a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirSuperMemberCompletionContributor.kt b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirSuperMemberCompletionContributor.kt index e37a3262177f..eb34d178afa1 100644 --- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirSuperMemberCompletionContributor.kt +++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirSuperMemberCompletionContributor.kt @@ -2,8 +2,8 @@ package org.jetbrains.kotlin.idea.completion.contributors +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.parentsOfType -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtScopeKind import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeOwner diff --git a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/ClassLookupElementFactory.kt b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/ClassLookupElementFactory.kt index 33321cc7e913..21d40e4a720a 100644 --- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/ClassLookupElementFactory.kt +++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/ClassLookupElementFactory.kt @@ -9,27 +9,19 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.psi.util.elementType +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset -import org.jetbrains.kotlin.idea.completion.lookups.* -import org.jetbrains.kotlin.idea.completion.lookups.ImportStrategy -import org.jetbrains.kotlin.idea.completion.lookups.KotlinLookupObject -import org.jetbrains.kotlin.idea.completion.lookups.withClassifierSymbolInfo +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol import org.jetbrains.kotlin.analysis.api.symbols.nameOrAnonymous import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferencesInRange +import org.jetbrains.kotlin.idea.completion.lookups.* import org.jetbrains.kotlin.idea.completion.lookups.TailTextProvider.getTailText import org.jetbrains.kotlin.kdoc.psi.impl.KDocName import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.psi.KtCallableDeclaration -import org.jetbrains.kotlin.psi.KtContextReceiver -import org.jetbrains.kotlin.psi.KtContextReceiverList -import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.KtNameReferenceExpression +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.renderer.render internal class ClassLookupElementFactory { diff --git a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/FunctionLookupElementFactory.kt b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/FunctionLookupElementFactory.kt index a8ba4e347c72..90752f103b3c 100644 --- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/FunctionLookupElementFactory.kt +++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/FunctionLookupElementFactory.kt @@ -9,7 +9,7 @@ import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.signatures.KtFunctionLikeSignature import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol diff --git a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/utils.kt b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/utils.kt index 1220b69604ee..259a6f0478d8 100644 --- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/utils.kt +++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/utils.kt @@ -5,11 +5,7 @@ package org.jetbrains.kotlin.idea.completion.lookups import com.intellij.codeInsight.completion.InsertionContext import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.openapi.util.TextRange -import com.intellij.psi.util.elementType -import com.intellij.psi.util.nextLeaf -import com.intellij.psi.util.prevLeaf -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisFromWriteAction import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisOnEdt import org.jetbrains.kotlin.analysis.api.KtAnalysisSession diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveUseSiteTargetFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveUseSiteTargetFix.kt index 1820a76f0ed4..74cf44ad54d1 100644 --- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveUseSiteTargetFix.kt +++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveUseSiteTargetFix.kt @@ -7,9 +7,9 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiComment import com.intellij.psi.PsiElement import com.intellij.psi.PsiWhiteSpace +import com.intellij.psi.createSmartPointer import com.intellij.psi.impl.source.tree.LeafPsiElement import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.codeinsight.api.classic.quickfixes.KotlinPsiOnlyQuickFixAction import org.jetbrains.kotlin.idea.inspections.AbstractUseSiteGetDoesntHaveAnyEffectQuickFixesFactory diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 6368cdc474c0..e6c0dea2aa60 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -71,6 +71,7 @@ import java.awt.datatransfer.UnsupportedFlavorException import java.io.IOException import java.util.* import java.util.concurrent.Callable +import com.intellij.psi.createSmartPointer class KotlinCopyPasteReferenceProcessor : CopyPastePostProcessor() { diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/declarative/AbstractKotlinInlayHintsProvider.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/declarative/AbstractKotlinInlayHintsProvider.kt index 5e4870c7b815..7d6aea9f0fef 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/declarative/AbstractKotlinInlayHintsProvider.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/hints/declarative/AbstractKotlinInlayHintsProvider.kt @@ -15,7 +15,7 @@ import com.intellij.codeInsight.hints.declarative.StringInlayActionPayload import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.idea.codeInsight.hints.HintType import org.jetbrains.kotlin.idea.codeInsight.hints.InlayInfoDetail import org.jetbrains.kotlin.idea.codeInsight.hints.InlayInfoDetails diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index 4f95b12ca612..d05b7e4b52e0 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -88,6 +88,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyPublicApi import org.jetbrains.kotlin.resolve.isInlineClass import org.jetbrains.kotlin.resolve.isInlineClassType import org.jetbrains.kotlin.util.findCallableMemberBySignature +import com.intellij.psi.createSmartPointer class UnusedSymbolInspection : AbstractKotlinInspection() { companion object { diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedUnaryOperatorInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedUnaryOperatorInspection.kt index 009005982bd6..629ff95f7e28 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedUnaryOperatorInspection.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedUnaryOperatorInspection.kt @@ -13,9 +13,9 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.codeStyle.CodeStyleManager +import com.intellij.psi.util.endOffset import com.intellij.psi.util.prevLeafs -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.base.resources.KotlinBundle diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddFullQualifierIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddFullQualifierIntention.kt index 32cfd4b00a5e..f4615fa6c079 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddFullQualifierIntention.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddFullQualifierIntention.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.intentions import com.intellij.codeInsight.intention.LowPriorityAction import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import com.intellij.psi.util.createSmartPointer +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.descendantsOfType import com.intellij.psi.util.elementType import com.intellij.psi.util.prevLeaf diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractImportFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractImportFix.kt index 9555f8ef5c40..8f9ab6d2878b 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractImportFix.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractImportFix.kt @@ -20,6 +20,7 @@ import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.IntellijInternalApi import com.intellij.packageDependencies.DependencyValidationManager import com.intellij.psi.* +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.PsiModificationTracker import com.intellij.psi.util.elementType import com.intellij.util.Processors diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunModifierFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunModifierFix.kt index 92cffce0dde9..31be505d0dfc 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunModifierFix.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunModifierFix.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiFile import com.intellij.psi.SmartPsiElementPointer -import com.intellij.refactoring.suggested.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 43e1515feea9..d7b0a8526540 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -22,6 +22,7 @@ import com.intellij.openapi.util.UnfairTextRange import com.intellij.psi.* import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.psi.codeStyle.JavaCodeStyleManager +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsProcessor.kt index ae9b00c426bc..8a16ca56d293 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsProcessor.kt @@ -13,7 +13,6 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager import com.intellij.refactoring.RefactoringBundle -import com.intellij.refactoring.suggested.range import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.codeInsight.shorten.runRefactoringAndKeepDelayedRequests @@ -28,6 +27,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType import org.jetbrains.kotlin.psi.psiUtil.startOffset +import com.intellij.openapi.editor.asTextRange class MoveDeclarationsProcessor( val project: Project, @@ -41,7 +41,7 @@ class MoveDeclarationsProcessor( fun build(file: PsiFile, cookie: MoveDeclarationsEditorCookie): MoveDeclarationsProcessor? { val data = cookie.data val project = file.project - val range = cookie.bounds.range ?: return null + val range = cookie.bounds.asTextRange ?: return null val sourceFileUrl = data.sourceFileUrl val sourceFile = VirtualFileManager.getInstance().findFileByUrl(sourceFileUrl) ?: return null diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt index 167e3b93c2d5..bb60071b3431 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt @@ -6,29 +6,29 @@ import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project -import com.intellij.psi.* +import com.intellij.psi.PsiDocumentManager +import com.intellij.psi.PsiElement +import com.intellij.psi.PsiFile +import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.createSmartPointer import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.refactoring.RefactoringActionHandler import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.base.fe10.codeInsight.newDeclaration.Fe10KotlinNameSuggester +import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.base.util.fileScope import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference import org.jetbrains.kotlin.idea.core.moveCaret -import org.jetbrains.kotlin.idea.util.ElementKind import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.idea.refactoring.selectElement import org.jetbrains.kotlin.idea.references.findPsiDeclarations import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.references.resolveMainReferenceToDescriptors import org.jetbrains.kotlin.idea.search.isImportUsage -import org.jetbrains.kotlin.idea.util.ImportInsertHelperImpl +import org.jetbrains.kotlin.idea.util.* import org.jetbrains.kotlin.idea.util.application.executeCommand -import org.jetbrains.kotlin.idea.util.getAllAccessibleFunctions -import org.jetbrains.kotlin.idea.util.getAllAccessibleVariables -import org.jetbrains.kotlin.idea.util.getResolutionScope import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/AbstractKotlinInlayHintsProviderTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/AbstractKotlinInlayHintsProviderTest.kt index 6227d2c1acdb..d8f1a7650df0 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/AbstractKotlinInlayHintsProviderTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/AbstractKotlinInlayHintsProviderTest.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.platform.testFramework.core.FileComparisonFailedError -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.utils.inlays.declarative.DeclarativeInlayHintsProviderTestCase import com.intellij.util.ThrowableRunnable diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractCustomHighlightUsageHandlerTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractCustomHighlightUsageHandlerTest.kt index d71034bbe15b..06fe09e029c7 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractCustomHighlightUsageHandlerTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractCustomHighlightUsageHandlerTest.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.application.ReadAction import com.intellij.openapi.editor.colors.EditorColors import com.intellij.openapi.project.DumbService import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.range +import com.intellij.openapi.editor.asTextRange import com.intellij.testFramework.ExpectedHighlightingData import com.intellij.util.concurrency.AppExecutorUtil import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase @@ -53,7 +53,7 @@ abstract class AbstractCustomHighlightUsageHandlerTest : KotlinLightCodeInsightF val ranges = editor.markupModel.allHighlighters .filter { it.textAttributesKey == EditorColors.SEARCH_RESULT_ATTRIBUTES || it.textAttributesKey == EditorColors.WRITE_SEARCH_RESULT_ATTRIBUTES } - .mapNotNull { it.range } + .mapNotNull { it.asTextRange } val infos = ranges.toHashSet() .map { diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/inspectionLikePostProcessing.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/inspectionLikePostProcessing.kt index c4984ce9bcff..35cec6cafb2d 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/inspectionLikePostProcessing.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/inspectionLikePostProcessing.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.psi.SmartPsiElementPointer -import com.intellij.psi.util.createSmartPointer +import com.intellij.psi.createSmartPointer import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider import org.jetbrains.kotlin.j2k.InspectionLikeProcessingGroup.RangeFilterResult.* import org.jetbrains.kotlin.nj2k.NewJ2kConverterContext diff --git a/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/kmp/findAllActualForExpect.kt b/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/kmp/findAllActualForExpect.kt index f29684154175..81303ef2b107 100644 --- a/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/kmp/findAllActualForExpect.kt +++ b/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/kmp/findAllActualForExpect.kt @@ -3,10 +3,10 @@ package org.jetbrains.kotlin.idea.searching.kmp import com.intellij.openapi.application.runReadAction import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.createSmartPointer import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.SearchScope import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import org.jetbrains.kotlin.analysis.api.analyze import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol @@ -17,8 +17,6 @@ import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelPropertyFqnNameIndex import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelTypeAliasFqNameIndex import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* -import kotlin.collections.any -import kotlin.let @RequiresBackgroundThread(generateAssertion = false) fun KtDeclaration.findAllActualForExpect(searchScope: SearchScope = runReadAction { useScope }): Sequence> { diff --git a/plugins/kotlin/navigation/tests/test/org/jetbrains/kotlin/idea/k2/navigation/AbstractKotlinNavigationToLibrarySourceTest.kt b/plugins/kotlin/navigation/tests/test/org/jetbrains/kotlin/idea/k2/navigation/AbstractKotlinNavigationToLibrarySourceTest.kt index 3eaca8b5bbf9..d2f82d3ad73d 100644 --- a/plugins/kotlin/navigation/tests/test/org/jetbrains/kotlin/idea/k2/navigation/AbstractKotlinNavigationToLibrarySourceTest.kt +++ b/plugins/kotlin/navigation/tests/test/org/jetbrains/kotlin/idea/k2/navigation/AbstractKotlinNavigationToLibrarySourceTest.kt @@ -4,8 +4,8 @@ package org.jetbrains.kotlin.idea.k2.navigation import com.intellij.psi.PsiComment import com.intellij.psi.PsiElement import com.intellij.psi.PsiWhiteSpace -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import com.intellij.testFramework.UsefulTestCase import com.intellij.testFramework.common.runAll import org.jetbrains.kotlin.analysis.project.structure.KtLibrarySourceModule diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/introduce/KotlinIntroduceVariableContext.kt b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/introduce/KotlinIntroduceVariableContext.kt index 0e71669ccefc..d621715fdf1f 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/introduce/KotlinIntroduceVariableContext.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/introduce/KotlinIntroduceVariableContext.kt @@ -8,7 +8,6 @@ import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.SmartPointerManager import com.intellij.psi.SmartPsiElementPointer import com.intellij.psi.util.PsiTreeUtil -import com.intellij.psi.util.createSmartPointer import com.intellij.psi.util.parents import com.intellij.util.containers.addIfNotNull import org.jetbrains.kotlin.idea.base.psi.moveInsideParenthesesAndReplaceWith diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/kotlinCommonRefactoringUtil.kt b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/kotlinCommonRefactoringUtil.kt index 3619ab8ebca4..8e8a88839490 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/kotlinCommonRefactoringUtil.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/kotlinCommonRefactoringUtil.kt @@ -15,7 +15,6 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.elementType import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.refactoring.changeSignature.ChangeInfo -import com.intellij.refactoring.suggested.endOffset import com.intellij.refactoring.ui.ConflictsDialog import com.intellij.refactoring.util.ConflictsUtil import com.intellij.usageView.UsageInfo diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/introduce/K2SemanticMatcher.kt b/plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/introduce/K2SemanticMatcher.kt index 81d76e51fe70..171949c96d54 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/introduce/K2SemanticMatcher.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/introduce/K2SemanticMatcher.kt @@ -3,7 +3,7 @@ package org.jetbrains.kotlin.idea.k2.refactoring.introduce import com.intellij.psi.tree.IElementType import com.intellij.psi.util.elementType -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.* import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KtFirDiagnostic diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/extractFunction/ExtractionData.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/extractFunction/ExtractionData.kt index e60346692aff..826c399b0fe2 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/extractFunction/ExtractionData.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/extractFunction/ExtractionData.kt @@ -7,21 +7,18 @@ import com.intellij.openapi.util.Key import com.intellij.psi.PsiElement import com.intellij.psi.PsiMember import com.intellij.psi.util.PsiTreeUtil -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import org.jetbrains.kotlin.analysis.api.analyze import org.jetbrains.kotlin.idea.base.psi.unifier.KotlinPsiRange import org.jetbrains.kotlin.idea.refactoring.introduce.ExtractableSubstringInfo import org.jetbrains.kotlin.idea.refactoring.introduce.extractableSubstringInfo -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionOptions -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.IExtractionData -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ResolveResult -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.encodeReferences -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.unmarkReferencesInside +import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.* import org.jetbrains.kotlin.idea.refactoring.introduce.substringContextOrThis import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.* +import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType data class ExtractionData( override val originalFile: KtFile, diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/JavaKotlinSafeDeleteUsagesSearcher.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/JavaKotlinSafeDeleteUsagesSearcher.kt index 4ed75090f2d9..f379b5af66e4 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/JavaKotlinSafeDeleteUsagesSearcher.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/JavaKotlinSafeDeleteUsagesSearcher.kt @@ -13,7 +13,6 @@ import com.intellij.refactoring.safeDelete.api.PsiSafeDeleteUsage import com.intellij.refactoring.safeDelete.api.SafeDeleteSearchParameters import com.intellij.refactoring.safeDelete.api.SafeDeleteUsage import com.intellij.refactoring.safeDelete.api.SafeDeleteUsageSearcher -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.util.Query import org.jetbrains.kotlin.asJava.toPsiParameters import org.jetbrains.kotlin.asJava.toPsiTypeParameters diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/KotlinSafeDeleteTarget.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/KotlinSafeDeleteTarget.kt index d34d25ec4107..0be751a06c5c 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/KotlinSafeDeleteTarget.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/KotlinSafeDeleteTarget.kt @@ -5,10 +5,10 @@ import com.intellij.find.usages.api.PsiUsage import com.intellij.model.Pointer import com.intellij.openapi.util.NlsSafe import com.intellij.platform.backend.presentation.TargetPresentation +import com.intellij.psi.createSmartPointer import com.intellij.refactoring.safeDelete.api.PsiSafeDeleteDeclarationUsage import com.intellij.refactoring.safeDelete.api.SafeDeleteTarget import com.intellij.refactoring.safeDelete.impl.DefaultPsiSafeDeleteDeclarationUsage -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtNamed diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/KotlinSafeDeleteUsageSearcher.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/KotlinSafeDeleteUsageSearcher.kt index cca759b09918..82c86f1bce99 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/KotlinSafeDeleteUsageSearcher.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/targetApiImpl/KotlinSafeDeleteUsageSearcher.kt @@ -7,11 +7,11 @@ import com.intellij.model.search.LeafOccurrenceMapper import com.intellij.model.search.SearchContext import com.intellij.model.search.SearchService import com.intellij.openapi.application.runReadAction +import com.intellij.psi.createSmartPointer import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.util.walkUp import com.intellij.refactoring.safeDelete.api.* import com.intellij.refactoring.safeDelete.impl.DefaultPsiSafeDeleteUsage -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.util.AbstractQuery import com.intellij.util.Processor import com.intellij.util.Query diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/ConvertReferenceToLambdaUtil.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/ConvertReferenceToLambdaUtil.kt index 1aa3d105de97..ef1d9aa99ec7 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/ConvertReferenceToLambdaUtil.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/ConvertReferenceToLambdaUtil.kt @@ -1,8 +1,8 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.k2.refactoring.util +import com.intellij.psi.createSmartPointer import com.intellij.psi.util.elementType -import com.intellij.refactoring.suggested.createSmartPointer import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.successfulFunctionCallOrNull diff --git a/plugins/kotlin/uast/uast-kotlin-fir/tests/test/org/jetbrains/fir/uast/test/FirMultiResolveTestInDifferentReadActions.kt b/plugins/kotlin/uast/uast-kotlin-fir/tests/test/org/jetbrains/fir/uast/test/FirMultiResolveTestInDifferentReadActions.kt index 39600a92ddfb..19a9ca0834ad 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/tests/test/org/jetbrains/fir/uast/test/FirMultiResolveTestInDifferentReadActions.kt +++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/test/org/jetbrains/fir/uast/test/FirMultiResolveTestInDifferentReadActions.kt @@ -3,7 +3,7 @@ package org.jetbrains.fir.uast.test import com.intellij.openapi.application.runReadAction import com.intellij.platform.uast.testFramework.env.findElementByTextFromPsi -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import junit.framework.TestCase import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/MarkdownCodeSpanExtendWordSelectionHandler.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/MarkdownCodeSpanExtendWordSelectionHandler.kt index 569b4484ca42..2f2503f4f7eb 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/MarkdownCodeSpanExtendWordSelectionHandler.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/MarkdownCodeSpanExtendWordSelectionHandler.kt @@ -6,8 +6,8 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.util.PsiUtilCore -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import org.intellij.plugins.markdown.lang.MarkdownElementTypes import org.intellij.plugins.markdown.lang.MarkdownTokenTypes diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/headers/HeaderLevelInferenceTypedHandler.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/headers/HeaderLevelInferenceTypedHandler.kt index 126219ee4a13..a71e2976b688 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/headers/HeaderLevelInferenceTypedHandler.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/headers/HeaderLevelInferenceTypedHandler.kt @@ -12,11 +12,7 @@ import com.intellij.openapi.util.registry.Registry import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import com.intellij.psi.util.PsiUtilCore -import com.intellij.psi.util.parents -import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import com.intellij.util.DocumentUtil import org.intellij.plugins.markdown.editor.lists.ListUtils.getLineIndentSpaces import org.intellij.plugins.markdown.editor.lists.ListUtils.getListItemAt diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListItemIndentUnindentHandlerBase.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListItemIndentUnindentHandlerBase.kt index ae3a3f2d9533..9c2381b16102 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListItemIndentUnindentHandlerBase.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListItemIndentUnindentHandlerBase.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.actionSystem.EditorActionHandler import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler import com.intellij.psi.PsiDocumentManager -import com.intellij.refactoring.suggested.endOffset +import com.intellij.psi.util.endOffset import org.intellij.plugins.markdown.editor.lists.ListUtils.getListItemAtLine import org.intellij.plugins.markdown.lang.psi.impl.MarkdownFile import org.intellij.plugins.markdown.lang.psi.impl.MarkdownListItem diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListItemInfo.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListItemInfo.kt index c36b2456571a..3e627e3e31d5 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListItemInfo.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListItemInfo.kt @@ -2,8 +2,8 @@ package org.intellij.plugins.markdown.editor.lists import com.intellij.openapi.editor.Document -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import org.intellij.plugins.markdown.editor.lists.ListUtils.getLineIndentInnerSpacesLength import org.intellij.plugins.markdown.editor.lists.ListUtils.normalizedMarker import org.intellij.plugins.markdown.lang.psi.impl.MarkdownListItem diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListRenumberUtils.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListRenumberUtils.kt index 630ece663598..4765b56e5c30 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListRenumberUtils.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/ListRenumberUtils.kt @@ -5,8 +5,8 @@ import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.editor.Document import com.intellij.psi.PsiFile import com.intellij.psi.util.elementType -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import org.intellij.plugins.markdown.editor.lists.ListUtils.getLineIndentInnerSpacesLength import org.intellij.plugins.markdown.editor.lists.ListUtils.items import org.intellij.plugins.markdown.editor.lists.ListUtils.normalizedMarker diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListEnterHandlerDelegate.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListEnterHandlerDelegate.kt index 608ce487680e..18febf230b7f 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListEnterHandlerDelegate.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListEnterHandlerDelegate.kt @@ -12,11 +12,7 @@ import com.intellij.openapi.editor.actionSystem.EditorActionHandler import com.intellij.openapi.util.Ref import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile -import com.intellij.psi.util.isAncestor -import com.intellij.psi.util.parentOfType -import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import org.intellij.plugins.markdown.editor.lists.ListRenumberUtils.obtainMarkerNumber import org.intellij.plugins.markdown.editor.lists.ListRenumberUtils.renumberInBulk import org.intellij.plugins.markdown.editor.lists.ListUtils.getLineIndentRange diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListIndentBackspaceHandlerDelegate.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListIndentBackspaceHandlerDelegate.kt index e12f4593c688..2ae4cf4caa70 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListIndentBackspaceHandlerDelegate.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListIndentBackspaceHandlerDelegate.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile import com.intellij.psi.util.parentsOfType -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.intellij.plugins.markdown.editor.lists.ListUtils.getLineIndentInnerSpacesLength import org.intellij.plugins.markdown.editor.lists.ListUtils.getLineIndentRange import org.intellij.plugins.markdown.editor.lists.ListUtils.getLineIndentSpaces diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListItemCreatingTypedHandlerDelegate.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListItemCreatingTypedHandlerDelegate.kt index 9975e2f7f44c..73563040dce6 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListItemCreatingTypedHandlerDelegate.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListItemCreatingTypedHandlerDelegate.kt @@ -6,8 +6,8 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile import com.intellij.psi.util.elementType +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.endOffset import com.intellij.util.text.CharArrayUtil import org.intellij.plugins.markdown.editor.lists.ListRenumberUtils.renumberInBulk import org.intellij.plugins.markdown.editor.lists.ListUtils.getLineIndentRange diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListMarkerBackspaceHandlerDelegate.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListMarkerBackspaceHandlerDelegate.kt index f21925456f8e..56c63fd3d516 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListMarkerBackspaceHandlerDelegate.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/lists/MarkdownListMarkerBackspaceHandlerDelegate.kt @@ -7,12 +7,7 @@ import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile -import com.intellij.psi.util.descendantsOfType -import com.intellij.psi.util.elementType -import com.intellij.psi.util.parentOfType -import com.intellij.psi.util.parentsOfType -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import com.intellij.util.DocumentUtil import com.intellij.util.text.CharArrayUtil import org.intellij.plugins.markdown.editor.lists.ListRenumberUtils.renumberInBulk diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ColumnSelection.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ColumnSelection.kt index 0640c578ea47..af423856bb51 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ColumnSelection.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ColumnSelection.kt @@ -3,9 +3,9 @@ package org.intellij.plugins.markdown.editor.tables import com.intellij.openapi.editor.Caret import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange +import com.intellij.psi.util.endOffset import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.intellij.plugins.markdown.editor.tables.TableUtils.getColumnCells import org.intellij.plugins.markdown.editor.tables.TableUtils.separatorRow import org.intellij.plugins.markdown.lang.MarkdownTokenTypes diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableFormattingUtils.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableFormattingUtils.kt index 523cd5fd211a..0b3566778f0a 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableFormattingUtils.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableFormattingUtils.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.intellij.plugins.markdown.editor.tables.TableUtils.columnsIndices import org.intellij.plugins.markdown.editor.tables.TableUtils.getColumnAlignment import org.intellij.plugins.markdown.editor.tables.TableUtils.getColumnCells diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableModificationUtils.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableModificationUtils.kt index b64119f8fa4c..d771f1d8ffb5 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableModificationUtils.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableModificationUtils.kt @@ -3,8 +3,8 @@ package org.intellij.plugins.markdown.editor.tables import com.intellij.openapi.editor.Document import com.intellij.openapi.util.TextRange -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import com.intellij.util.containers.ContainerUtil import org.intellij.plugins.markdown.editor.tables.TableUtils.calculateActualTextRange import org.intellij.plugins.markdown.editor.tables.TableUtils.columnsCount diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableUtils.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableUtils.kt index be429d633d11..aa0483999f86 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableUtils.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/TableUtils.kt @@ -6,11 +6,7 @@ import com.intellij.openapi.editor.Document import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import com.intellij.psi.util.PsiUtilCore -import com.intellij.psi.util.parentOfType -import com.intellij.psi.util.parents -import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import org.intellij.plugins.markdown.lang.MarkdownElementTypes import org.intellij.plugins.markdown.lang.MarkdownTokenTypes import org.intellij.plugins.markdown.lang.psi.impl.MarkdownTable diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/actions/InsertEmptyTableAction.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/actions/InsertEmptyTableAction.kt index 7e0e77243ee4..471438fae910 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/actions/InsertEmptyTableAction.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/actions/InsertEmptyTableAction.kt @@ -15,7 +15,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile import com.intellij.psi.util.PsiTreeUtil -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.ui.IdeBorderFactory import com.intellij.ui.components.JBLabel import com.intellij.ui.popup.AbstractPopup diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/handlers/MarkdownTableTabHandler.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/handlers/MarkdownTableTabHandler.kt index 6bf094c384ec..c8ceedac2581 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/handlers/MarkdownTableTabHandler.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/handlers/MarkdownTableTabHandler.kt @@ -8,8 +8,8 @@ import com.intellij.openapi.editor.actionSystem.EditorActionHandler import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement +import com.intellij.psi.util.endOffset import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.endOffset import org.intellij.plugins.markdown.editor.tables.TableUtils import org.intellij.plugins.markdown.editor.tables.TableUtils.firstNonWhitespaceOffset import org.intellij.plugins.markdown.editor.tables.TableUtils.lastNonWhitespaceOffset diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/MarkdownTableInlayProvider.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/MarkdownTableInlayProvider.kt index 95fa80bf5252..01633a818f7f 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/MarkdownTableInlayProvider.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/MarkdownTableInlayProvider.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.Key import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import org.intellij.plugins.markdown.MarkdownBundle import org.intellij.plugins.markdown.editor.tables.TableModificationUtils.hasCorrectBorders import org.intellij.plugins.markdown.editor.tables.TableUtils.calculateActualTextRange diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/presentation/HorizontalBarPresentation.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/presentation/HorizontalBarPresentation.kt index 90b35f91a946..53d217fe3267 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/presentation/HorizontalBarPresentation.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/presentation/HorizontalBarPresentation.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.editor.markup.TextAttributes import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.ui.LightweightHint import com.intellij.util.ui.GraphicsUtil import org.intellij.plugins.markdown.editor.tables.TableFormattingUtils.isSoftWrapping diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/presentation/VerticalBarPresentation.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/presentation/VerticalBarPresentation.kt index a143482beab2..16a570d09523 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/presentation/VerticalBarPresentation.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/tables/ui/presentation/VerticalBarPresentation.kt @@ -19,7 +19,7 @@ import com.intellij.openapi.editor.markup.TextAttributes import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.ui.LightweightHint import com.intellij.util.ui.GraphicsUtil import org.intellij.plugins.markdown.editor.tables.TableFormattingUtils.isSoftWrapping diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/toc/GenerateTableOfContentsAction.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/toc/GenerateTableOfContentsAction.kt index 840c1509c399..9850c2caa804 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/toc/GenerateTableOfContentsAction.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/editor/toc/GenerateTableOfContentsAction.kt @@ -10,12 +10,7 @@ import com.intellij.openapi.editor.Document import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement -import com.intellij.psi.util.CachedValueProvider -import com.intellij.psi.util.CachedValuesManager -import com.intellij.psi.util.PsiModificationTracker -import com.intellij.psi.util.siblings -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import org.intellij.plugins.markdown.MarkdownBundle import org.intellij.plugins.markdown.editor.toc.GenerateTableOfContentsAction.Manager.replaceString import org.intellij.plugins.markdown.lang.MarkdownElementTypes diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/extensions/CodeFenceDownloadLineMarkerProvider.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/extensions/CodeFenceDownloadLineMarkerProvider.kt index 0bd004c68694..da32fb53c0a5 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/extensions/CodeFenceDownloadLineMarkerProvider.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/extensions/CodeFenceDownloadLineMarkerProvider.kt @@ -10,8 +10,8 @@ import com.intellij.openapi.application.invokeLater import com.intellij.openapi.editor.markup.GutterIconRenderer import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import com.intellij.util.application import org.intellij.plugins.markdown.lang.MarkdownTokenTypes import org.intellij.plugins.markdown.lang.psi.impl.MarkdownCodeFence diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/styling/MarkdownCreateLinkAction.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/styling/MarkdownCreateLinkAction.kt index ed5bc0320093..e3c5ed2e32c8 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/styling/MarkdownCreateLinkAction.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/styling/MarkdownCreateLinkAction.kt @@ -14,8 +14,8 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.util.elementType import com.intellij.psi.util.elementsAtOffsetUp -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import com.intellij.util.LocalFileUrl import com.intellij.util.Urls import org.intellij.plugins.markdown.MarkdownBundle diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/styling/SetHeaderLevelImpl.kt b/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/styling/SetHeaderLevelImpl.kt index d8753364b52f..edf7900dc4d6 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/styling/SetHeaderLevelImpl.kt +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/ui/actions/styling/SetHeaderLevelImpl.kt @@ -13,9 +13,9 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.tree.TokenSet import com.intellij.psi.util.PsiTreeUtil +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.util.DocumentUtil import org.intellij.plugins.markdown.MarkdownBundle.messagePointer import org.intellij.plugins.markdown.lang.MarkdownElementTypes diff --git a/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/HeaderSymbol.kt b/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/HeaderSymbol.kt index 7dddec24041e..011445ab1fe9 100644 --- a/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/HeaderSymbol.kt +++ b/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/HeaderSymbol.kt @@ -12,8 +12,8 @@ import com.intellij.psi.PsiFile import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.SearchScope import com.intellij.psi.util.childrenOfType +import com.intellij.psi.util.startOffset import com.intellij.refactoring.rename.api.RenameTarget -import com.intellij.refactoring.suggested.startOffset import org.intellij.plugins.markdown.MarkdownIcons import org.intellij.plugins.markdown.lang.psi.impl.MarkdownHeader import org.intellij.plugins.markdown.lang.psi.impl.MarkdownHeaderContent diff --git a/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorSymbolDeclaration.kt b/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorSymbolDeclaration.kt index f74dcf4db326..e0cc54ae7b62 100644 --- a/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorSymbolDeclaration.kt +++ b/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorSymbolDeclaration.kt @@ -4,8 +4,8 @@ import com.intellij.model.Symbol import com.intellij.model.psi.PsiSymbolDeclaration import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement +import com.intellij.psi.util.startOffset import com.intellij.psi.xml.XmlAttributeValue -import com.intellij.refactoring.suggested.startOffset internal class HtmlAnchorSymbolDeclaration( private val element: XmlAttributeValue, diff --git a/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorVetoRenameCondition.kt b/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorVetoRenameCondition.kt index a507146b993a..d704fdd1477c 100644 --- a/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorVetoRenameCondition.kt +++ b/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/headers/html/HtmlAnchorVetoRenameCondition.kt @@ -3,8 +3,8 @@ package org.intellij.plugins.markdown.model.psi.headers.html import com.intellij.openapi.util.Condition import com.intellij.psi.PsiElement import com.intellij.psi.util.parentOfType +import com.intellij.psi.util.startOffset import com.intellij.psi.xml.XmlAttributeValue -import com.intellij.refactoring.suggested.startOffset /** * Veto default rename for element attribute value. diff --git a/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/labels/LinkLabelSymbol.kt b/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/labels/LinkLabelSymbol.kt index a4c6d180ee5b..d3e5414b9aa2 100644 --- a/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/labels/LinkLabelSymbol.kt +++ b/plugins/markdown/model/src/main/kotlin/org/intellij/plugins/markdown/model/psi/labels/LinkLabelSymbol.kt @@ -12,8 +12,8 @@ import com.intellij.psi.PsiFile import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.SearchScope import com.intellij.psi.util.parentOfType +import com.intellij.psi.util.startOffset import com.intellij.refactoring.rename.api.RenameTarget -import com.intellij.refactoring.suggested.startOffset import org.intellij.plugins.markdown.MarkdownIcons import org.intellij.plugins.markdown.lang.psi.impl.MarkdownLinkDefinition import org.intellij.plugins.markdown.lang.psi.impl.MarkdownLinkLabel diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/model/ProjectLevelHeaderFindUsagesTest.kt b/plugins/markdown/test/src/org/intellij/plugins/markdown/model/ProjectLevelHeaderFindUsagesTest.kt index d6b9cc78a619..9be968393393 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/model/ProjectLevelHeaderFindUsagesTest.kt +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/model/ProjectLevelHeaderFindUsagesTest.kt @@ -1,6 +1,6 @@ package org.intellij.plugins.markdown.model -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.testFramework.fixtures.BasePlatformTestCase import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.JUnitSoftAssertions diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToPsiElement.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToPsiElement.kt index f40d7618daef..6b3975af093d 100644 --- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToPsiElement.kt +++ b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToPsiElement.kt @@ -5,8 +5,8 @@ import com.intellij.openapi.editor.ScrollType import com.intellij.openapi.util.ActionCallback import com.intellij.psi.PsiElement import com.intellij.psi.PsiRecursiveElementWalkingVisitor -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.endOffset +import com.intellij.psi.util.startOffset import kotlin.math.max import kotlin.math.min diff --git a/plugins/toml/core/src/main/kotlin/org/toml/ide/intentions/TomlExpandInlineTableIntention.kt b/plugins/toml/core/src/main/kotlin/org/toml/ide/intentions/TomlExpandInlineTableIntention.kt index 9491e93651c6..3a5db72ff312 100644 --- a/plugins/toml/core/src/main/kotlin/org/toml/ide/intentions/TomlExpandInlineTableIntention.kt +++ b/plugins/toml/core/src/main/kotlin/org/toml/ide/intentions/TomlExpandInlineTableIntention.kt @@ -8,8 +8,8 @@ package org.toml.ide.intentions import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement +import com.intellij.psi.util.endOffset import com.intellij.psi.util.parentsOfType -import com.intellij.refactoring.suggested.endOffset import org.toml.TomlBundle import org.toml.lang.psi.* diff --git a/plugins/yaml/src/org/jetbrains/yaml/annotator/YAMLInvalidBlockChildrenErrorAnnotator.kt b/plugins/yaml/src/org/jetbrains/yaml/annotator/YAMLInvalidBlockChildrenErrorAnnotator.kt index f1fa18590dd3..e31b08e48834 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/annotator/YAMLInvalidBlockChildrenErrorAnnotator.kt +++ b/plugins/yaml/src/org/jetbrains/yaml/annotator/YAMLInvalidBlockChildrenErrorAnnotator.kt @@ -9,11 +9,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement import com.intellij.psi.impl.source.tree.TreeUtil import com.intellij.psi.templateLanguages.OuterLanguageElement -import com.intellij.psi.util.PsiTreeUtil -import com.intellij.psi.util.PsiUtilCore -import com.intellij.psi.util.parentOfType -import com.intellij.refactoring.suggested.endOffset -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.* import org.jetbrains.annotations.Nls import org.jetbrains.yaml.YAMLBundle import org.jetbrains.yaml.YAMLTokenTypes diff --git a/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/documentation/HuggingFaceDocumentationTarget.kt b/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/documentation/HuggingFaceDocumentationTarget.kt index 47687bb38fa9..8df565ffe69a 100644 --- a/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/documentation/HuggingFaceDocumentationTarget.kt +++ b/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/documentation/HuggingFaceDocumentationTarget.kt @@ -8,6 +8,7 @@ import com.intellij.platform.backend.documentation.DocumentationResult import com.intellij.platform.backend.documentation.DocumentationTarget import com.intellij.platform.backend.presentation.TargetPresentation import com.intellij.psi.PsiElement +import com.intellij.psi.createSmartPointer import com.intellij.python.community.impl.huggingFace.HuggingFaceConstants import com.intellij.python.community.impl.huggingFace.HuggingFaceEntityKind import com.intellij.python.community.impl.huggingFace.HuggingFaceUtil @@ -18,10 +19,8 @@ import com.intellij.python.community.impl.huggingFace.cache.HuggingFaceDatasetsC import com.intellij.python.community.impl.huggingFace.cache.HuggingFaceModelsCache import com.intellij.python.community.impl.huggingFace.service.HuggingFaceCardsUsageCollector import com.intellij.python.community.impl.huggingFace.service.PyHuggingFaceBundle -import com.intellij.refactoring.suggested.createSmartPointer import com.jetbrains.python.psi.PyTargetExpression - internal class HuggingFaceDocumentationTarget(private val myElement : PsiElement) : DocumentationTarget { override fun createPointer(): Pointer { diff --git a/python/src/com/jetbrains/python/codeInsight/completion/PyRuntimeCompletionUtils.kt b/python/src/com/jetbrains/python/codeInsight/completion/PyRuntimeCompletionUtils.kt index 6523c2b34831..2269e3fa50f3 100644 --- a/python/src/com/jetbrains/python/codeInsight/completion/PyRuntimeCompletionUtils.kt +++ b/python/src/com/jetbrains/python/codeInsight/completion/PyRuntimeCompletionUtils.kt @@ -11,7 +11,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.tree.IElementType import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.elementType -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.xdebugger.impl.ui.tree.XDebuggerTreeListener import com.intellij.xdebugger.impl.ui.tree.nodes.XDebuggerTreeNode import com.intellij.xdebugger.impl.ui.tree.nodes.XValueContainerNode diff --git a/python/src/com/jetbrains/python/refactoring/suggested/PySuggestedRefactoringSupport.kt b/python/src/com/jetbrains/python/refactoring/suggested/PySuggestedRefactoringSupport.kt index ed1f4f2cae89..b1fab9891ad8 100644 --- a/python/src/com/jetbrains/python/refactoring/suggested/PySuggestedRefactoringSupport.kt +++ b/python/src/com/jetbrains/python/refactoring/suggested/PySuggestedRefactoringSupport.kt @@ -6,6 +6,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.psi.util.hasErrorElementInRange +import com.intellij.psi.util.startOffset import com.intellij.refactoring.suggested.* import com.jetbrains.python.PyNames import com.jetbrains.python.PyTokenTypes diff --git a/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.kt b/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.kt index a068b2a2002b..d4fb2f35ca42 100644 --- a/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.kt +++ b/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.kt @@ -18,7 +18,7 @@ import com.intellij.openapi.util.registry.Registry import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.SmartPointerManager -import com.intellij.refactoring.suggested.startOffset +import com.intellij.psi.util.startOffset import com.intellij.spellchecker.util.SpellCheckerBundle import com.intellij.util.concurrency.ThreadingAssertions diff --git a/xml/xml-psi-impl/src/com/intellij/html/webSymbols/WebSymbolsHtmlQueryConfigurator.kt b/xml/xml-psi-impl/src/com/intellij/html/webSymbols/WebSymbolsHtmlQueryConfigurator.kt index ed3b69561a94..8c2ba469ab22 100644 --- a/xml/xml-psi-impl/src/com/intellij/html/webSymbols/WebSymbolsHtmlQueryConfigurator.kt +++ b/xml/xml-psi-impl/src/com/intellij/html/webSymbols/WebSymbolsHtmlQueryConfigurator.kt @@ -6,9 +6,9 @@ import com.intellij.model.Pointer import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.SmartPointerManager +import com.intellij.psi.createSmartPointer import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.xml.XmlTag -import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.util.containers.Stack import com.intellij.webSymbols.* import com.intellij.webSymbols.completion.WebSymbolCodeCompletionItem diff --git a/xml/xml-psi-impl/src/com/intellij/html/webSymbols/attributeValues/WebSymbolHtmlAttributeValueReferenceProvider.kt b/xml/xml-psi-impl/src/com/intellij/html/webSymbols/attributeValues/WebSymbolHtmlAttributeValueReferenceProvider.kt index 42ad812e4b20..230ec9ad0b2b 100644 --- a/xml/xml-psi-impl/src/com/intellij/html/webSymbols/attributeValues/WebSymbolHtmlAttributeValueReferenceProvider.kt +++ b/xml/xml-psi-impl/src/com/intellij/html/webSymbols/attributeValues/WebSymbolHtmlAttributeValueReferenceProvider.kt @@ -3,9 +3,9 @@ package com.intellij.html.webSymbols.attributeValues import com.intellij.html.webSymbols.attributes.WebSymbolAttributeDescriptor import com.intellij.html.webSymbols.elements.WebSymbolElementDescriptor import com.intellij.psi.util.parentOfType +import com.intellij.psi.util.startOffset import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.xml.XmlAttributeValue -import com.intellij.refactoring.suggested.startOffset import com.intellij.util.asSafely import com.intellij.webSymbols.WebSymbol import com.intellij.webSymbols.WebSymbolNameSegment