Skip to content

Commit d06f23f

Browse files
committed
Move: Fix replacement of non-code usages with backquoted names
#KT-13986 Fixed
1 parent a194eb9 commit d06f23f

File tree

6 files changed

+30
-2
lines changed

6 files changed

+30
-2
lines changed

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ import org.jetbrains.kotlin.asJava.namedUnwrappedElement
4949
import org.jetbrains.kotlin.asJava.toLightElements
5050
import org.jetbrains.kotlin.idea.codeInsight.shorten.addToBeShortenedDescendantsToWaitingSet
5151
import org.jetbrains.kotlin.idea.core.deleteSingle
52+
import org.jetbrains.kotlin.idea.core.quoteIfNeeded
5253
import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
5354
import org.jetbrains.kotlin.idea.refactoring.move.*
5455
import org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories.MoveKotlinClassHandler
5556
import org.jetbrains.kotlin.idea.search.projectScope
5657
import org.jetbrains.kotlin.idea.search.restrictByFileType
5758
import org.jetbrains.kotlin.idea.util.projectStructure.module
5859
import org.jetbrains.kotlin.lexer.KtTokens
60+
import org.jetbrains.kotlin.name.FqName
5961
import org.jetbrains.kotlin.psi.*
6062
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
6163
import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
@@ -198,14 +200,14 @@ class MoveKotlinDeclarationsProcessor(
198200
else null
199201
}
200202

201-
val name = lightElement.getKotlinFqName()?.asString()
203+
val name = lightElement.getKotlinFqName()?.quoteIfNeeded()?.asString()
202204
if (name != null) {
203205
TextOccurrencesUtil.findNonCodeUsages(
204206
lightElement,
205207
name,
206208
descriptor.searchInCommentsAndStrings,
207209
descriptor.searchInNonCode,
208-
newFqName,
210+
FqName(newFqName).quoteIfNeeded().asString(),
209211
results
210212
)
211213
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package code.`in`.comments2
2+
3+
class MyTest
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package code.`in`.comments
2+
3+
fun main(args: Array<String>) {
4+
// code.`in`.comments2.MyTest
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package code.`in`.comments
2+
3+
class <caret>MyTest
4+
5+
fun main(args: Array<String>) {
6+
// code.`in`.comments.MyTest
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"mainFile": "test.kt",
3+
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
4+
"targetPackage": "code.`in`.comments2"
5+
}

idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)