diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt index 2ddc12b704d..2469a40a13c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt @@ -71,8 +71,7 @@ val PsiReference.unwrappedTargets: Set fun PsiReference.canBeReferenceTo(candidateTarget: PsiElement): Boolean { // optimization return element.containingFile == candidateTarget.containingFile - || ProjectRootsUtil.isInProjectOrLibSource(element) - || ScratchUtil.isScratch(element.containingFile.virtualFile) + || ProjectRootsUtil.isInProjectOrLibSource(element, includeScriptsOutsideSourceRoots = true) } fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt index b018cbf0bed..f8b6fde95df 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt @@ -460,7 +460,7 @@ fun PsiElement.canRefactor(): Boolean { this is KtElement || this is PsiMember && language == JavaLanguage.INSTANCE || this is PsiDirectory -> - ProjectRootsUtil.isInProjectSource(this) || ((containingFile as? KtFile)?.isScript() ?: false) + ProjectRootsUtil.isInProjectSource(this, includeScriptsOutsideSourceRoots = true) else -> false } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.181 b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.181 index b78893fa42d..0142d5d84f3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.181 @@ -460,7 +460,7 @@ fun PsiElement.canRefactor(): Boolean { this is KtElement || this is PsiMember && language == JavaLanguage.INSTANCE || this is PsiDirectory -> - ProjectRootsUtil.isInProjectSource(this) || ((containingFile as? KtFile)?.isScript() ?: false) + ProjectRootsUtil.isInProjectSource(this, includeScriptsOutsideSourceRoots = true) else -> false } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt index d45e55e829f..afbcf807261 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt @@ -38,7 +38,8 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { override fun isValid() = file.isValid } - override fun canProcessElement(element: PsiElement) = element is KtFile && ProjectRootsUtil.isInProjectSource(element) + override fun canProcessElement(element: PsiElement) = + element is KtFile && ProjectRootsUtil.isInProjectSource(element, includeScriptsOutsideSourceRoots = true) override fun prepareRenaming(element: PsiElement, newName: String, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 index b63a1d89b2e..754f31b915b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 @@ -38,7 +38,8 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { override fun isValid() = file.isValid } - override fun canProcessElement(element: PsiElement) = element is KtFile && ProjectRootsUtil.isInProjectSource(element) + override fun canProcessElement(element: PsiElement) = + element is KtFile && ProjectRootsUtil.isInProjectSource(element, includeScriptsOutsideSourceRoots = true) override fun prepareRenaming(element: PsiElement?, newName: String, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt index f0f6f7512c0..8456f6e7897 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt @@ -35,7 +35,6 @@ import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters -import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.idea.util.actualsForExpected import org.jetbrains.kotlin.idea.util.liftToExpected import org.jetbrains.kotlin.name.Name @@ -68,7 +67,7 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun findReferences(element: PsiElement): Collection { val searchParameters = KotlinReferencesSearchParameters( element, - element.project.projectScope(), + element.useScope, kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false) ) val references = ReferencesSearch.search(searchParameters).toMutableList() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 index 6762cb24c90..f3036691a40 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 @@ -47,7 +47,7 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun findReferences(element: PsiElement): Collection { val searchParameters = KotlinReferencesSearchParameters( element, - element.project.projectScope(), + element.useScope, kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false) ) val references = ReferencesSearch.search(searchParameters).toMutableList()