azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline Variable: Highlight usages in current file even if the variable is used in other files

Browse Source
This commit is contained in:
Alexey Sedunov
2015-12-14 18:11:11 +03:00
parent 4e36edb5d6
commit ea8da18338
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.kt
+6 -7
View File
@@ -159,12 +159,11 @@ class KotlinInlineValHandler : InlineActionHandler() {
val typeArgumentsForCall = getTypeArgumentsStringForCall(initializer) val typeArgumentsForCall = getTypeArgumentsStringForCall(initializer)
val parametersForFunctionLiteral = getParametersForFunctionLiteral(initializer) val parametersForFunctionLiteral = getParametersForFunctionLiteral(initializer)
val isSingleFile = referenceExpressions.all { it.containingFile === file } val referencesInOriginalFile = referenceExpressions.filter { it.containingFile == file }
if (isSingleFile) { val isHighlighting = referencesInOriginalFile.isNotEmpty()
highlightExpressions(project, editor, referenceExpressions) highlightExpressions(project, editor, referencesInOriginalFile)
}
if (!isSingleFile) { if (referencesInOriginalFile.size != referenceExpressions.size) {
val targetPackages = referenceExpressions.mapNotNullTo(LinkedHashSet()) { (it.containingFile as? KtFile)?.packageFqName } val targetPackages = referenceExpressions.mapNotNullTo(LinkedHashSet()) { (it.containingFile as? KtFile)?.packageFqName }
for (targetPackage in targetPackages) { for (targetPackage in targetPackages) {
if (targetPackage == file.packageFqName) continue if (targetPackage == file.packageFqName) continue
@@ -180,7 +179,7 @@ class KotlinInlineValHandler : InlineActionHandler() {
fun performRefactoring() { fun performRefactoring() {
if (!showDialog(project, name, declaration, referenceExpressions)) { if (!showDialog(project, name, declaration, referenceExpressions)) {
if (isSingleFile) { if (isHighlighting) {
val statusBar = WindowManager.getInstance().getStatusBar(project) val statusBar = WindowManager.getInstance().getStatusBar(project)
statusBar?.info = RefactoringBundle.message("press.escape.to.remove.the.highlighting") statusBar?.info = RefactoringBundle.message("press.escape.to.remove.the.highlighting")
} }
@@ -222,7 +221,7 @@ class KotlinInlineValHandler : InlineActionHandler() {
parametersForFunctionLiteral?.let { addFunctionLiteralParameterTypes(it, inlinedExpressions) } parametersForFunctionLiteral?.let { addFunctionLiteralParameterTypes(it, inlinedExpressions) }
if (isSingleFile) { if (isHighlighting) {
highlightExpressions(project, editor, inlinedExpressions) highlightExpressions(project, editor, inlinedExpressions)
} }
} }