diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/codeInsight/ReferenceVariantsHelper.kt similarity index 98% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/codeInsight/ReferenceVariantsHelper.kt index 27fc58cf734..a829a7784f6 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/codeInsight/ReferenceVariantsHelper.kt @@ -3,16 +3,15 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.codeInsight +package org.jetbrains.kotlin.scripting.ide_common.idea.codeInsight import com.intellij.psi.PsiElement import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.FrontendInternals -import org.jetbrains.kotlin.idea.resolve.ResolutionFacade -import org.jetbrains.kotlin.idea.resolve.frontendService -import org.jetbrains.kotlin.idea.util.* +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.ResolutionFacade +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.frontendService import org.jetbrains.kotlin.incremental.KotlinLookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi @@ -34,6 +33,7 @@ import org.jetbrains.kotlin.resolve.scopes.utils.collectAllFromMeAndParent import org.jetbrains.kotlin.resolve.scopes.utils.collectDescriptorsFiltered import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope import org.jetbrains.kotlin.resolve.source.getPsi +import org.jetbrains.kotlin.scripting.ide_common.idea.util.* import org.jetbrains.kotlin.synthetic.JavaSyntheticScopes import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor import org.jetbrains.kotlin.types.KotlinType diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/resolve/ResolutionFacade.kt similarity index 94% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/resolve/ResolutionFacade.kt index 10163052a42..937d2d5bf5d 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/resolve/ResolutionFacade.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.resolve +package org.jetbrains.kotlin.scripting.ide_common.idea.resolve import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.analyzer.ResolverForProject import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.idea.FrontendInternals import org.jetbrains.kotlin.psi.KtElement diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/frontendServiceHelpers.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/resolve/frontendServiceHelpers.kt similarity index 93% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/frontendServiceHelpers.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/resolve/frontendServiceHelpers.kt index 71f821f6ecf..c1ceab0acf9 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/frontendServiceHelpers.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/resolve/frontendServiceHelpers.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.resolve +package org.jetbrains.kotlin.scripting.ide_common.idea.resolve import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.idea.FrontendInternals diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/CallType.kt similarity index 96% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/CallType.kt index 6fef1608e65..7b847aa81f9 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/CallType.kt @@ -3,17 +3,16 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import com.intellij.psi.PsiElement import org.jetbrains.kotlin.config.LanguageFeature -import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.FrontendInternals -import org.jetbrains.kotlin.idea.resolve.ResolutionFacade -import org.jetbrains.kotlin.idea.resolve.frontendService -import org.jetbrains.kotlin.idea.resolve.getDataFlowValueFactory -import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.ResolutionFacade +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.frontendService +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.getDataFlowValueFactory +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.getLanguageVersionSettings import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression @@ -23,7 +22,6 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfoBefore import org.jetbrains.kotlin.resolve.calls.DslMarkerUtils import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo -import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastManager import org.jetbrains.kotlin.resolve.descriptorUtil.classValueType import org.jetbrains.kotlin.resolve.descriptorUtil.parentsWithSelf @@ -32,8 +30,8 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.receivers.* import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.expressions.DoubleColonLHS -import org.jetbrains.kotlin.util.isJavaDescriptor -import org.jetbrains.kotlin.util.supertypesWithAny +import org.jetbrains.kotlin.scripting.ide_common.util.isJavaDescriptor +import org.jetbrains.kotlin.scripting.ide_common.util.supertypesWithAny import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.util.* diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/FuzzyType.kt similarity index 99% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/FuzzyType.kt index 3701709561e..c2e7ef6cd7f 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/FuzzyType.kt @@ -5,7 +5,7 @@ @file:JvmName("FuzzyTypeUtils") -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderersScripting.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/IdeDescriptorRenderersScripting.kt similarity index 100% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderersScripting.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/IdeDescriptorRenderersScripting.kt diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/ImportsUtils.kt similarity index 97% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/ImportsUtils.kt index 82117d65807..6568ce19a12 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/ImportsUtils.kt @@ -5,7 +5,7 @@ @file:JvmName("ImportsUtils") -package org.jetbrains.kotlin.idea.imports +package org.jetbrains.kotlin.scripting.ide_common.idea.util import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.FqName diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/NotPropertyList.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/NotPropertyList.kt similarity index 94% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/NotPropertyList.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/NotPropertyList.kt index 63370c4ce24..60d751a2690 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/NotPropertyList.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/NotPropertyList.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import org.jetbrains.kotlin.descriptors.FunctionDescriptor diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/ShadowedDeclarationsFilter.kt similarity index 95% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/ShadowedDeclarationsFilter.kt index 63af6d69ec3..43b63e90ce2 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/ShadowedDeclarationsFilter.kt @@ -3,16 +3,15 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.FrontendInternals -import org.jetbrains.kotlin.idea.imports.importableFqName -import org.jetbrains.kotlin.idea.resolve.ResolutionFacade -import org.jetbrains.kotlin.idea.resolve.frontendService -import org.jetbrains.kotlin.idea.resolve.getDataFlowValueFactory -import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.ResolutionFacade +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.frontendService +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.getDataFlowValueFactory +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.getLanguageVersionSettings import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingTraceFilter.Companion.NO_DIAGNOSTICS @@ -23,12 +22,12 @@ import org.jetbrains.kotlin.resolve.calls.CallResolver import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode import org.jetbrains.kotlin.resolve.calls.context.ContextDependency -import org.jetbrains.kotlin.resolve.scopes.ExplicitImportsScope +import org.jetbrains.kotlin.scripting.ide_common.resolve.scopes.ExplicitImportsScope import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.scopes.utils.addImportingScope import org.jetbrains.kotlin.types.TypeUtils -import org.jetbrains.kotlin.util.descriptorsEqualWithSubstitution +import org.jetbrains.kotlin.scripting.ide_common.util.descriptorsEqualWithSubstitution import java.util.* class ShadowedDeclarationsFilter( diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/TypeUtils.kt similarity index 98% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/TypeUtils.kt index 0b6859784e6..8e6050d52fd 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/TypeUtils.kt @@ -5,7 +5,7 @@ @file:JvmName("TypeUtils") -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMapper import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/Utils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/Utils.kt similarity index 95% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/Utils.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/Utils.kt index de04f9acdbd..206b17229ac 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/Utils.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/Utils.kt @@ -3,12 +3,10 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/extensionsUtils.kt similarity index 96% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/extensionsUtils.kt index 2b1ae250396..a9bbfeb7512 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/extensionsUtils.kt @@ -5,7 +5,7 @@ @file:JvmName("ExtensionUtils") -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.types.KotlinType diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/implicitReceiversUtils.kt similarity index 98% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/implicitReceiversUtils.kt index 33abeb65578..797f9cf745b 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/implicitReceiversUtils.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.FqName diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/scopeUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/scopeUtils.kt similarity index 90% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/scopeUtils.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/scopeUtils.kt index e2369291dd7..06a9c473376 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/scopeUtils.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/idea/util/scopeUtils.kt @@ -5,13 +5,13 @@ @file:JvmName("ScopeUtils") -package org.jetbrains.kotlin.idea.util +package org.jetbrains.kotlin.scripting.ide_common.idea.util import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes import org.jetbrains.kotlin.idea.FrontendInternals -import org.jetbrains.kotlin.idea.resolve.ResolutionFacade -import org.jetbrains.kotlin.idea.resolve.frontendService +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.ResolutionFacade +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.frontendService import org.jetbrains.kotlin.psi.KtClassBody import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/resolve/scopes/ExplicitImportsScope.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/resolve/scopes/ExplicitImportsScope.kt similarity index 89% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/resolve/scopes/ExplicitImportsScope.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/resolve/scopes/ExplicitImportsScope.kt index 5ee6fc017dc..b47f957c476 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/resolve/scopes/ExplicitImportsScope.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/resolve/scopes/ExplicitImportsScope.kt @@ -3,11 +3,13 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.resolve.scopes +package org.jetbrains.kotlin.scripting.ide_common.resolve.scopes import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.resolve.scopes.BaseImportingScope +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull diff --git a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/util/descriptorUtils.kt similarity index 90% rename from plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/util/descriptorUtils.kt index ac9e2bdcae7..4495f6376b3 100644 --- a/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt +++ b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/scripting/ide_common/util/descriptorUtils.kt @@ -3,16 +3,12 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.util +package org.jetbrains.kotlin.scripting.ide_common.util import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor -import org.jetbrains.kotlin.resolve.OverridingUtil -import org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.CONFLICT -import org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE -import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.TypeConstructor import org.jetbrains.kotlin.types.checker.KotlinTypeChecker diff --git a/plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KJvmReplCompleter.kt b/plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KJvmReplCompleter.kt index 84d897aa0ec..8812221b9ae 100644 --- a/plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KJvmReplCompleter.kt +++ b/plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KJvmReplCompleter.kt @@ -11,10 +11,10 @@ import org.jetbrains.kotlin.builtins.isFunctionType import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl -import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper -import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver -import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderersScripting -import org.jetbrains.kotlin.idea.util.getResolutionScope +import org.jetbrains.kotlin.scripting.ide_common.idea.codeInsight.ReferenceVariantsHelper +import org.jetbrains.kotlin.scripting.ide_common.idea.util.CallTypeAndReceiver +import org.jetbrains.kotlin.scripting.ide_common.idea.util.IdeDescriptorRenderersScripting +import org.jetbrains.kotlin.scripting.ide_common.idea.util.getResolutionScope import org.jetbrains.kotlin.lexer.KtKeywordToken import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.ClassId diff --git a/plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KotlinResolutionFacadeForRepl.kt b/plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KotlinResolutionFacadeForRepl.kt index 9f23bfe227a..92dbfba3346 100644 --- a/plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KotlinResolutionFacadeForRepl.kt +++ b/plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KotlinResolutionFacadeForRepl.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.idea.FrontendInternals -import org.jetbrains.kotlin.idea.resolve.ResolutionFacade +import org.jetbrains.kotlin.scripting.ide_common.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.resolve.BindingContext