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

Inline Val: Do not highlight usages if some are not located in the same file as the declaration itself

Browse Source 
#KT-7655 Fixed
This commit is contained in:
Alexey Sedunov
2015-05-12 16:16:03 +03:00
parent 7f05b35332
commit 2dac70a4f7
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java
+25 -5
View File
@@ -42,6 +42,8 @@ import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.RefactoringMessageDialog;
import com.intellij.util.Function;
import kotlin.Function1;
import kotlin.KotlinPackage;
import kotlin.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -89,6 +91,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
@Override
public void inlineElement(final Project project, final Editor editor, PsiElement element) {
final JetProperty val = (JetProperty) element;
final JetFile file = val.getContainingJetFile();
String name = val.getName();
JetExpression initializerInDeclaration = val.getInitializer();
@@ -127,12 +130,27 @@ public class KotlinInlineValHandler extends InlineActionHandler {
final String typeArgumentsForCall = getTypeArgumentsStringForCall(initializer);
final String parametersForFunctionLiteral = getParametersForFunctionLiteral(initializer);
highlightExpressions(project, editor, referenceExpressions);
final boolean canHighlight = KotlinPackage.all(
referenceExpressions,
new Function1<JetExpression, Boolean>() {
@Override
public Boolean invoke(JetExpression expression) {
return expression.getContainingFile() == file;
}
}
);
if (canHighlight) {
highlightExpressions(project, editor, referenceExpressions);
}
if (!showDialog(project, name, referenceExpressions)) {
StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
if (statusBar != null) {
statusBar.setInfo(RefactoringBundle.message("press.escape.to.remove.the.highlighting"));
if (canHighlight) {
StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
if (statusBar != null) {
statusBar.setInfo(RefactoringBundle.message("press.escape.to.remove.the.highlighting"));
}
}
return;
}
@@ -167,7 +185,9 @@ public class KotlinInlineValHandler extends InlineActionHandler {
addFunctionLiteralParameterTypes(parametersForFunctionLiteral, inlinedExpressions);
}
highlightExpressions(project, editor, inlinedExpressions);
if (canHighlight) {
highlightExpressions(project, editor, inlinedExpressions);
}
}
});
}