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

Refactoring: Extend expression selection utilities to support KtTypeElement

Browse Source
This commit is contained in:
Alexey Sedunov
2016-07-12 15:43:11 +03:00
parent ef0318e038
commit 301f86cc96
13 changed files with 180 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/CodeInsightUtils.java
+28 -11
View File
@@ -27,9 +27,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.descriptors.ClassKind;
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor;
import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.lexer.KtTokens;
import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.*;
@@ -47,8 +45,23 @@ import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.*;
public class CodeInsightUtils { public class CodeInsightUtils {
@Nullable @Nullable
public static KtExpression findExpression(@NotNull PsiFile file, int startOffset, int endOffset) { public static PsiElement findElement(
KtExpression element = findElementOfClassAtRange(file, startOffset, endOffset, KtExpression.class); @NotNull PsiFile file,
int startOffset,
int endOffset,
@NotNull CodeInsightUtils.ElementKind elementKind
) {
Class<? extends KtElement> elementClass;
switch (elementKind) {
case EXPRESSION: elementClass = KtExpression.class;
break;
case TYPE_ELEMENT: elementClass = KtTypeElement.class;
break;
default: throw new IllegalArgumentException(elementKind.name());
}
PsiElement element = findElementOfClassAtRange(file, startOffset, endOffset, elementClass);
if (elementKind == ElementKind.TYPE_ELEMENT) return element;
if (element instanceof KtScriptInitializer) { if (element instanceof KtScriptInitializer) {
element = ((KtScriptInitializer) element).getBody(); element = ((KtScriptInitializer) element).getBody();
@@ -78,24 +91,26 @@ public class CodeInsightUtils {
} }
} }
KtExpression expression = element; KtExpression expression = (KtExpression) element;
BindingContext context = ResolutionUtils.analyze(expression); BindingContext context = ResolutionUtils.analyze(expression);
Qualifier qualifier = context.get(BindingContext.QUALIFIER, expression); Qualifier qualifier = context.get(BindingContext.QUALIFIER, expression);
if (qualifier != null) { if (qualifier != null) {
if (!(qualifier instanceof ClassQualifier)) return null; if (!(qualifier instanceof ClassQualifier)) return null;
ClassifierDescriptor classifier = ((ClassQualifier) qualifier).getDescriptor(); if (((ClassQualifier) qualifier).getDescriptor().getKind() != ClassKind.OBJECT) return null;
if (!(classifier instanceof ClassDescriptor) || ((ClassDescriptor) classifier).getKind() != ClassKind.OBJECT) {
return null;
}
} }
return expression; return expression;
} }
public enum ElementKind {
EXPRESSION,
TYPE_ELEMENT
}
@NotNull @NotNull
public static PsiElement[] findStatements(@NotNull PsiFile file, int startOffset, int endOffset) { public static PsiElement[] findElements(@NotNull PsiFile file, int startOffset, int endOffset, @NotNull ElementKind kind) {
PsiElement element1 = getElementAtOffsetIgnoreWhitespaceBefore(file, startOffset); PsiElement element1 = getElementAtOffsetIgnoreWhitespaceBefore(file, startOffset);
PsiElement element2 = getElementAtOffsetIgnoreWhitespaceAfter(file, endOffset); PsiElement element2 = getElementAtOffsetIgnoreWhitespaceAfter(file, endOffset);
@@ -129,7 +144,9 @@ public class CodeInsightUtils {
} }
for (PsiElement element : array) { for (PsiElement element : array) {
if (!(element instanceof KtExpression boolean correctType = kind == ElementKind.EXPRESSION && element instanceof KtExpression
|| kind == ElementKind.TYPE_ELEMENT && element instanceof KtTypeElement;
if (!(correctType
|| element.getNode().getElementType() == KtTokens.SEMICOLON || element.getNode().getElementType() == KtTokens.SEMICOLON
|| element instanceof PsiWhiteSpace || element instanceof PsiWhiteSpace
|| element instanceof PsiComment)) { || element instanceof PsiComment)) {
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinExpressionSurroundDescriptor.java
+4 -1
View File
@@ -37,7 +37,10 @@ public class KotlinExpressionSurroundDescriptor implements SurroundDescriptor {
@Override @Override
@NotNull @NotNull
public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) { public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
KtExpression expression = CodeInsightUtils.findExpression(file, startOffset, endOffset); KtExpression expression = (KtExpression) CodeInsightUtils.findElement(file,
startOffset,
endOffset,
CodeInsightUtils.ElementKind.EXPRESSION);
if (expression == null) { if (expression == null) {
return PsiElement.EMPTY_ARRAY; return PsiElement.EMPTY_ARRAY;
} }
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinStatementSurroundDescriptor.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class KotlinStatementSurroundDescriptor implements SurroundDescriptor {
@Override @Override
@NotNull @NotNull
public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) { public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
return CodeInsightUtils.findStatements(file, startOffset, endOffset); return CodeInsightUtils.findElements(file, startOffset, endOffset, CodeInsightUtils.ElementKind.EXPRESSION);
} }
@Override @Override
idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java
+95 -61
View File
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor;
import org.jetbrains.kotlin.idea.KotlinBundle; import org.jetbrains.kotlin.idea.KotlinBundle;
import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils;
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde;
import org.jetbrains.kotlin.idea.refactoring.introduce.IntroduceUtilKt; import org.jetbrains.kotlin.idea.refactoring.introduce.IntroduceUtilKt;
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
@@ -325,118 +326,144 @@ public class KotlinRefactoringUtil {
} }
} }
public interface SelectExpressionCallback { public interface SelectElementCallback {
void run(@Nullable KtExpression expression); void run(@Nullable PsiElement element);
} }
public static void selectExpression( public static void selectElement(
@NotNull Editor editor, @NotNull Editor editor,
@NotNull KtFile file, @NotNull KtFile file,
@NotNull SelectExpressionCallback callback) throws IntroduceRefactoringException { @NotNull CodeInsightUtils.ElementKind elementKind,
selectExpression(editor, file, true, callback); @NotNull SelectElementCallback callback
) throws IntroduceRefactoringException {
selectElement(editor, file, true, elementKind, callback);
} }
public static void selectExpression(@NotNull Editor editor, public static void selectElement(@NotNull Editor editor,
@NotNull KtFile file, @NotNull KtFile file,
boolean failOnEmptySuggestion, boolean failOnEmptySuggestion,
@NotNull SelectExpressionCallback callback) throws IntroduceRefactoringException { @NotNull CodeInsightUtils.ElementKind elementKind,
@NotNull SelectElementCallback callback
) throws IntroduceRefactoringException {
if (editor.getSelectionModel().hasSelection()) { if (editor.getSelectionModel().hasSelection()) {
int selectionStart = editor.getSelectionModel().getSelectionStart(); int selectionStart = editor.getSelectionModel().getSelectionStart();
int selectionEnd = editor.getSelectionModel().getSelectionEnd(); int selectionEnd = editor.getSelectionModel().getSelectionEnd();
String text = file.getText(); String text = file.getText();
while (selectionStart < selectionEnd && Character.isSpaceChar(text.charAt(selectionStart))) ++selectionStart; while (selectionStart < selectionEnd && Character.isSpaceChar(text.charAt(selectionStart))) ++selectionStart;
while (selectionStart < selectionEnd && Character.isSpaceChar(text.charAt(selectionEnd - 1))) --selectionEnd; while (selectionStart < selectionEnd && Character.isSpaceChar(text.charAt(selectionEnd - 1))) --selectionEnd;
callback.run(findExpression(file, selectionStart, selectionEnd, failOnEmptySuggestion)); callback.run(findElement(file, selectionStart, selectionEnd, failOnEmptySuggestion, elementKind));
} }
else { else {
int offset = editor.getCaretModel().getOffset(); int offset = editor.getCaretModel().getOffset();
smartSelectExpression(editor, file, offset, failOnEmptySuggestion, callback); smartSelectElement(editor, file, offset, failOnEmptySuggestion, elementKind, callback);
} }
} }
public static List<KtExpression> getSmartSelectSuggestions( public static List<KtElement> getSmartSelectSuggestions(
@NotNull PsiFile file, @NotNull PsiFile file,
int offset int offset,
@NotNull CodeInsightUtils.ElementKind elementKind
) throws IntroduceRefactoringException { ) throws IntroduceRefactoringException {
if (offset < 0) { if (offset < 0) {
return new ArrayList<KtExpression>(); return new ArrayList<KtElement>();
} }
PsiElement element = file.findElementAt(offset); PsiElement element = file.findElementAt(offset);
if (element == null) { if (element == null) {
return new ArrayList<KtExpression>(); return new ArrayList<KtElement>();
} }
if (element instanceof PsiWhiteSpace) { if (element instanceof PsiWhiteSpace) {
return getSmartSelectSuggestions(file, offset - 1); return getSmartSelectSuggestions(file, offset - 1, elementKind);
} }
List<KtExpression> expressions = new ArrayList<KtExpression>(); List<KtElement> elements = new ArrayList<KtElement>();
while (element != null && !(element instanceof KtBlockExpression && !(element.getParent() instanceof KtFunctionLiteral)) && while (element != null && !(element instanceof KtBlockExpression && !(element.getParent() instanceof KtFunctionLiteral)) &&
!(element instanceof KtNamedFunction) !(element instanceof KtNamedFunction)
&& !(element instanceof KtClassBody)) { && !(element instanceof KtClassBody)) {
if (element instanceof KtExpression && !(element instanceof KtStatementExpression)) { boolean addElement = false;
boolean addExpression = true; boolean keepPrevious = true;
if (element instanceof KtParenthesizedExpression) { if (element instanceof KtTypeElement) {
addExpression = false; addElement = elementKind == CodeInsightUtils.ElementKind.TYPE_ELEMENT;
if (!addElement) {
keepPrevious = false;
} }
else if (KtPsiUtil.isLabelIdentifierExpression(element)) { }
addExpression = false; else if (element instanceof KtExpression && !(element instanceof KtStatementExpression)) {
} addElement = elementKind == CodeInsightUtils.ElementKind.EXPRESSION;
else if (element.getParent() instanceof KtQualifiedExpression) {
KtQualifiedExpression qualifiedExpression = (KtQualifiedExpression) element.getParent(); if (addElement) {
if (qualifiedExpression.getReceiverExpression() != element) { if (element instanceof KtParenthesizedExpression) {
addExpression = false; addElement = false;
} }
} else if (KtPsiUtil.isLabelIdentifierExpression(element)) {
else if (element.getParent() instanceof KtCallElement addElement = false;
|| element.getParent() instanceof KtThisExpression
|| PsiTreeUtil.getParentOfType(element, KtSuperExpression.class) != null) {
addExpression = false;
}
else if (element.getParent() instanceof KtOperationExpression) {
KtOperationExpression operationExpression = (KtOperationExpression) element.getParent();
if (operationExpression.getOperationReference() == element) {
addExpression = false;
} }
} else if (element.getParent() instanceof KtQualifiedExpression) {
if (addExpression) { KtQualifiedExpression qualifiedExpression = (KtQualifiedExpression) element.getParent();
KtExpression expression = (KtExpression)element; if (qualifiedExpression.getReceiverExpression() != element) {
BindingContext bindingContext = ResolutionUtils.analyze(expression, BodyResolveMode.FULL); addElement = false;
KotlinType expressionType = bindingContext.getType(expression); }
if (expressionType == null || !KotlinBuiltIns.isUnit(expressionType)) { }
expressions.add(expression); else if (element.getParent() instanceof KtCallElement
|| element.getParent() instanceof KtThisExpression
|| PsiTreeUtil.getParentOfType(element, KtSuperExpression.class) != null) {
addElement = false;
}
else if (element.getParent() instanceof KtOperationExpression) {
KtOperationExpression operationExpression = (KtOperationExpression) element.getParent();
if (operationExpression.getOperationReference() == element) {
addElement = false;
}
}
if (addElement) {
KtExpression expression = (KtExpression)element;
BindingContext bindingContext = ResolutionUtils.analyze(expression, BodyResolveMode.FULL);
KotlinType expressionType = bindingContext.getType(expression);
if (expressionType != null && KotlinBuiltIns.isUnit(expressionType)) {
addElement = false;
}
} }
} }
} }
else if (element instanceof KtTypeElement) {
expressions.clear(); if (addElement) {
elements.add((KtElement) element);
} }
if (!keepPrevious) {
elements.clear();
}
element = element.getParent(); element = element.getParent();
} }
return expressions; return elements;
} }
private static void smartSelectExpression( private static void smartSelectElement(
@NotNull Editor editor, @NotNull PsiFile file, int offset, @NotNull Editor editor,
@NotNull PsiFile file,
int offset,
boolean failOnEmptySuggestion, boolean failOnEmptySuggestion,
@NotNull final SelectExpressionCallback callback) throws IntroduceRefactoringException { @NotNull CodeInsightUtils.ElementKind elementKind,
List<KtExpression> expressions = getSmartSelectSuggestions(file, offset); @NotNull final SelectElementCallback callback
if (expressions.size() == 0) { ) throws IntroduceRefactoringException {
List<KtElement> elements = getSmartSelectSuggestions(file, offset, elementKind);
if (elements.size() == 0) {
if (failOnEmptySuggestion) throw new IntroduceRefactoringException( if (failOnEmptySuggestion) throw new IntroduceRefactoringException(
KotlinRefactoringBundle.message("cannot.refactor.not.expression")); KotlinRefactoringBundle.message("cannot.refactor.not.expression"));
callback.run(null); callback.run(null);
return; return;
} }
if (expressions.size() == 1 || ApplicationManager.getApplication().isUnitTestMode()) { if (elements.size() == 1 || ApplicationManager.getApplication().isUnitTestMode()) {
callback.run(expressions.get(0)); callback.run(elements.get(0));
return; return;
} }
final DefaultListModel model = new DefaultListModel(); final DefaultListModel model = new DefaultListModel();
for (KtExpression expression : expressions) { for (PsiElement element : elements) {
model.addElement(expression); model.addElement(element);
} }
final ScopeHighlighter highlighter = new ScopeHighlighter(editor); final ScopeHighlighter highlighter = new ScopeHighlighter(editor);
@@ -447,7 +474,7 @@ public class KotlinRefactoringUtil {
@Override @Override
public Component getListCellRendererComponent(@NotNull JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { public Component getListCellRendererComponent(@NotNull JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Component rendererComponent = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); Component rendererComponent = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
KtExpression element = (KtExpression) value; KtElement element = (KtElement) value;
if (element.isValid()) { if (element.isValid()) {
setText(getExpressionShortText(element)); setText(getExpressionShortText(element));
} }
@@ -461,7 +488,7 @@ public class KotlinRefactoringUtil {
highlighter.dropHighlight(); highlighter.dropHighlight();
int selectedIndex = list.getSelectedIndex(); int selectedIndex = list.getSelectedIndex();
if (selectedIndex < 0) return; if (selectedIndex < 0) return;
KtExpression expression = (KtExpression) model.get(selectedIndex); KtElement expression = (KtElement) model.get(selectedIndex);
List<PsiElement> toExtract = new ArrayList<PsiElement>(); List<PsiElement> toExtract = new ArrayList<PsiElement>();
toExtract.add(expression); toExtract.add(expression);
highlighter.highlight(expression, toExtract); highlighter.highlight(expression, toExtract);
@@ -473,7 +500,7 @@ public class KotlinRefactoringUtil {
setRequestFocus(true).setItemChoosenCallback(new Runnable() { setRequestFocus(true).setItemChoosenCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
callback.run((KtExpression) list.getSelectedValue()); callback.run((KtElement) list.getSelectedValue());
} }
}).addListener(new JBPopupAdapter() { }).addListener(new JBPopupAdapter() {
@Override @Override
@@ -493,10 +520,17 @@ public class KotlinRefactoringUtil {
} }
@Nullable @Nullable
private static KtExpression findExpression( private static PsiElement findElement(
@NotNull KtFile file, int startOffset, int endOffset, boolean failOnNoExpression @NotNull KtFile file,
int startOffset,
int endOffset,
boolean failOnNoExpression,
@NotNull CodeInsightUtils.ElementKind elementKind
) throws IntroduceRefactoringException { ) throws IntroduceRefactoringException {
KtExpression element = IntroduceUtilKt.findExpressionOrStringFragment(file, startOffset, endOffset); PsiElement element = CodeInsightUtils.findElement(file, startOffset, endOffset, elementKind);
if (element == null && elementKind == CodeInsightUtils.ElementKind.EXPRESSION) {
element = IntroduceUtilKt.findExpressionOrStringFragment(file, startOffset, endOffset);
}
if (element == null) { if (element == null) {
//todo: if it's infix expression => add (), then commit document then return new created expression //todo: if it's infix expression => add (), then commit document then return new created expression
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
+3 -1
View File
@@ -22,8 +22,9 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import com.intellij.refactoring.RefactoringActionHandler import com.intellij.refactoring.RefactoringActionHandler
import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers
import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinExtractFunctionDialog import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinExtractFunctionDialog
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.* import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
import org.jetbrains.kotlin.idea.refactoring.introduce.selectElementsWithTargetSibling import org.jetbrains.kotlin.idea.refactoring.introduce.selectElementsWithTargetSibling
@@ -67,6 +68,7 @@ class ExtractKotlinFunctionHandler(
editor, editor,
file, file,
"Select target code block", "Select target code block",
CodeInsightUtils.ElementKind.EXPRESSION,
{ elements, parent -> parent.getExtractionContainers(elements.size == 1, allContainersEnabled) }, { elements, parent -> parent.getExtractionContainers(elements.size == 1, allContainersEnabled) },
continuation continuation
) )
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+4 -3
View File
@@ -36,22 +36,22 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator
import org.jetbrains.kotlin.idea.core.moveInsideParenthesesAndReplaceWith import org.jetbrains.kotlin.idea.core.moveInsideParenthesesAndReplaceWith
import org.jetbrains.kotlin.idea.refactoring.removeTemplateEntryBracesIfPossible
import org.jetbrains.kotlin.idea.refactoring.runRefactoringWithPostprocessing
import org.jetbrains.kotlin.idea.core.replaced import org.jetbrains.kotlin.idea.core.replaced
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
import org.jetbrains.kotlin.idea.refactoring.changeSignature.* import org.jetbrains.kotlin.idea.refactoring.changeSignature.*
import org.jetbrains.kotlin.idea.refactoring.introduce.* import org.jetbrains.kotlin.idea.refactoring.introduce.*
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.* import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
import org.jetbrains.kotlin.idea.refactoring.removeTemplateEntryBracesIfPossible
import org.jetbrains.kotlin.idea.refactoring.runRefactoringWithPostprocessing
import org.jetbrains.kotlin.idea.refactoring.runSynchronouslyWithProgress import org.jetbrains.kotlin.idea.refactoring.runSynchronouslyWithProgress
import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.references.mainReference
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.idea.util.application.executeCommand import org.jetbrains.kotlin.idea.util.application.executeCommand
import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.idea.util.approximateWithResolvableType import org.jetbrains.kotlin.idea.util.approximateWithResolvableType
import org.jetbrains.kotlin.idea.util.getResolutionScope import org.jetbrains.kotlin.idea.util.getResolutionScope
import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
@@ -191,6 +191,7 @@ fun selectNewParameterContext(
editor = editor, editor = editor,
file = file, file = file,
title = "Introduce parameter to declaration", title = "Introduce parameter to declaration",
elementKind = CodeInsightUtils.ElementKind.EXPRESSION,
getContainers = { elements, parent -> getContainers = { elements, parent ->
val parents = parent.parents val parents = parent.parents
val stopAt = (parent.parents.zip(parent.parents.drop(1))) val stopAt = (parent.parents.zip(parent.parents.drop(1)))
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
+2
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
import org.jetbrains.kotlin.idea.util.psi.patternMatching.* import org.jetbrains.kotlin.idea.util.psi.patternMatching.*
import com.intellij.openapi.application.* import com.intellij.openapi.application.*
import com.intellij.refactoring.RefactoringActionHandler import com.intellij.refactoring.RefactoringActionHandler
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers
import java.util.* import java.util.*
@@ -58,6 +59,7 @@ class KotlinIntroducePropertyHandler(
editor, editor,
file, file,
"Select target code block", "Select target code block",
CodeInsightUtils.ElementKind.EXPRESSION,
{ elements, parent -> { elements, parent ->
parent.getExtractionContainers(strict = true, includeAll = true).filter { it is KtClassBody || (it is KtFile && !it.isScript) } parent.getExtractionContainers(strict = true, includeAll = true).filter { it is KtClassBody || (it is KtFile && !it.isScript) }
}, },
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt
+14 -12
View File
@@ -45,6 +45,7 @@ fun selectElementsWithTargetSibling(
editor: Editor, editor: Editor,
file: KtFile, file: KtFile,
title: String, title: String,
elementKind: CodeInsightUtils.ElementKind,
getContainers: (elements: List<PsiElement>, commonParent: PsiElement) -> List<PsiElement>, getContainers: (elements: List<PsiElement>, commonParent: PsiElement) -> List<PsiElement>,
continuation: (elements: List<PsiElement>, targetSibling: PsiElement) -> Unit continuation: (elements: List<PsiElement>, targetSibling: PsiElement) -> Unit
) { ) {
@@ -67,7 +68,7 @@ fun selectElementsWithTargetSibling(
continuation(elements, outermostParent) continuation(elements, outermostParent)
} }
selectElementsWithTargetParent(operationName, editor, file, title, getContainers, ::onSelectionComplete) selectElementsWithTargetParent(operationName, editor, file, title, elementKind, getContainers, ::onSelectionComplete)
} }
fun selectElementsWithTargetParent( fun selectElementsWithTargetParent(
@@ -75,6 +76,7 @@ fun selectElementsWithTargetParent(
editor: Editor, editor: Editor,
file: KtFile, file: KtFile,
title: String, title: String,
elementKind: CodeInsightUtils.ElementKind,
getContainers: (elements: List<PsiElement>, commonParent: PsiElement) -> List<PsiElement>, getContainers: (elements: List<PsiElement>, commonParent: PsiElement) -> List<PsiElement>,
continuation: (elements: List<PsiElement>, targetParent: PsiElement) -> Unit continuation: (elements: List<PsiElement>, targetParent: PsiElement) -> Unit
) { ) {
@@ -103,11 +105,11 @@ fun selectElementsWithTargetParent(
) )
} }
fun selectMultipleExpressions() { fun selectMultipleElements() {
val startOffset = editor.selectionModel.selectionStart val startOffset = editor.selectionModel.selectionStart
val endOffset = editor.selectionModel.selectionEnd val endOffset = editor.selectionModel.selectionEnd
val elements = CodeInsightUtils.findStatements(file, startOffset, endOffset) val elements = CodeInsightUtils.findElements(file, startOffset, endOffset, elementKind)
if (elements.isEmpty()) { if (elements.isEmpty()) {
showErrorHintByKey("cannot.refactor.no.expression") showErrorHintByKey("cannot.refactor.no.expression")
return return
@@ -116,27 +118,29 @@ fun selectElementsWithTargetParent(
selectTargetContainer(elements.toList()) selectTargetContainer(elements.toList())
} }
fun selectSingleExpression() { fun selectSingleElement() {
KotlinRefactoringUtil.selectExpression(editor, file, false) { expr -> KotlinRefactoringUtil.selectElement(editor, file, false, elementKind) { expr ->
if (expr != null) { if (expr != null) {
selectTargetContainer(listOf(expr)) selectTargetContainer(listOf(expr))
} }
else { else {
if (!editor.selectionModel.hasSelection()) { if (!editor.selectionModel.hasSelection()) {
val elementAtCaret = file.findElementAt(editor.caretModel.offset) if (elementKind == CodeInsightUtils.ElementKind.EXPRESSION) {
elementAtCaret?.getParentOfTypeAndBranch<KtProperty> { nameIdentifier }?.let { val elementAtCaret = file.findElementAt(editor.caretModel.offset)
return@selectExpression selectTargetContainer(listOf(it)) elementAtCaret?.getParentOfTypeAndBranch<KtProperty> { nameIdentifier }?.let {
return@selectElement selectTargetContainer(listOf(it))
}
} }
editor.selectionModel.selectLineAtCaret() editor.selectionModel.selectLineAtCaret()
} }
selectMultipleExpressions() selectMultipleElements()
} }
} }
} }
editor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE) editor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
selectSingleExpression() selectSingleElement()
} }
fun PsiElement.findExpressionByCopyableDataAndClearIt(key: Key<Boolean>): KtExpression { fun PsiElement.findExpressionByCopyableDataAndClearIt(key: Key<Boolean>): KtExpression {
@@ -158,8 +162,6 @@ fun PsiElement.findExpressionsByCopyableDataAndClearIt(key: Key<Boolean>): List<
} }
fun findExpressionOrStringFragment(file: KtFile, startOffset: Int, endOffset: Int): KtExpression? { fun findExpressionOrStringFragment(file: KtFile, startOffset: Int, endOffset: Int): KtExpression? {
CodeInsightUtils.findExpression(file, startOffset, endOffset)?.let { return it }
val entry1 = file.findElementAt(startOffset)?.getNonStrictParentOfType<KtStringTemplateEntry>() ?: return null val entry1 = file.findElementAt(startOffset)?.getNonStrictParentOfType<KtStringTemplateEntry>() ?: return null
val entry2 = file.findElementAt(endOffset - 1)?.getNonStrictParentOfType<KtStringTemplateEntry>() ?: return null val entry2 = file.findElementAt(endOffset - 1)?.getNonStrictParentOfType<KtStringTemplateEntry>() ?: return null
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
+2 -1
View File
@@ -42,6 +42,7 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.idea.analysis.analyzeInContext import org.jetbrains.kotlin.idea.analysis.analyzeInContext
import org.jetbrains.kotlin.idea.analysis.computeTypeInfoInContext import org.jetbrains.kotlin.idea.analysis.computeTypeInfoInContext
import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
import org.jetbrains.kotlin.idea.core.* import org.jetbrains.kotlin.idea.core.*
import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyIntention import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyIntention
import org.jetbrains.kotlin.idea.refactoring.* import org.jetbrains.kotlin.idea.refactoring.*
@@ -718,7 +719,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
if (file !is KtFile) return if (file !is KtFile) return
try { try {
KotlinRefactoringUtil.selectExpression(editor, file) { doRefactoring(project, editor, it, null, null) } KotlinRefactoringUtil.selectElement(editor, file, CodeInsightUtils.ElementKind.EXPRESSION) { doRefactoring(project, editor, it as KtExpression?, null, null) }
} }
catch (e: KotlinRefactoringUtil.IntroduceRefactoringException) { catch (e: KotlinRefactoringUtil.IntroduceRefactoringException) {
showErrorHint(project, editor, e.message!!) showErrorHint(project, editor, e.message!!)
idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java
+6 -5
View File
@@ -16,11 +16,12 @@
package org.jetbrains.kotlin.idea; package org.jetbrains.kotlin.idea;
import com.intellij.psi.PsiElement;
import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.testFramework.LightCodeInsightTestCase;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils;
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil; import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil;
import org.jetbrains.kotlin.psi.KtExpression;
import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestUtils;
@@ -31,11 +32,11 @@ public abstract class AbstractExpressionSelectionTest extends LightCodeInsightTe
final String expectedExpression = KotlinTestUtils.getLastCommentInFile((KtFile) getFile()); final String expectedExpression = KotlinTestUtils.getLastCommentInFile((KtFile) getFile());
try { try {
KotlinRefactoringUtil.selectExpression(getEditor(), (KtFile) getFile(), new KotlinRefactoringUtil.SelectExpressionCallback() { KotlinRefactoringUtil.selectElement(getEditor(), (KtFile) getFile(), CodeInsightUtils.ElementKind.EXPRESSION, new KotlinRefactoringUtil.SelectElementCallback() {
@Override @Override
public void run(@Nullable KtExpression expression) { public void run(@Nullable PsiElement element) {
assertNotNull("Selected expression mustn't be null", expression); assertNotNull("Selected expression mustn't be null", element);
assertEquals(expectedExpression, expression.getText()); assertEquals(expectedExpression, element.getText());
} }
}); });
} }
idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java
+6 -5
View File
@@ -19,8 +19,9 @@ package org.jetbrains.kotlin.idea;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.testFramework.LightCodeInsightTestCase;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils;
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil; import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil;
import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtElement;
import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestUtils;
@@ -33,12 +34,12 @@ public abstract class AbstractSmartSelectionTest extends LightCodeInsightTestCas
configureByFile(path); configureByFile(path);
String expectedResultText = KotlinTestUtils.getLastCommentInFile((KtFile) getFile()); String expectedResultText = KotlinTestUtils.getLastCommentInFile((KtFile) getFile());
List<KtExpression> expressions = KotlinRefactoringUtil.getSmartSelectSuggestions( List<KtElement> elements = KotlinRefactoringUtil.getSmartSelectSuggestions(
getFile(), getEditor().getCaretModel().getOffset()); getFile(), getEditor().getCaretModel().getOffset(), CodeInsightUtils.ElementKind.EXPRESSION);
List<String> textualExpressions = new ArrayList<String>(); List<String> textualExpressions = new ArrayList<String>();
for (KtExpression expression : expressions) { for (KtElement element : elements) {
textualExpressions.add(KotlinRefactoringUtil.getExpressionShortText(expression)); textualExpressions.add(KotlinRefactoringUtil.getExpressionShortText(element));
} }
assertEquals(expectedResultText, StringUtil.join(textualExpressions, "\n")); assertEquals(expectedResultText, StringUtil.join(textualExpressions, "\n"));
} }
idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt
+4 -2
View File
@@ -36,6 +36,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil
import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil
import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.EXTRACT_FUNCTION import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.EXTRACT_FUNCTION
import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler
@@ -48,6 +49,7 @@ import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
@@ -109,8 +111,8 @@ abstract class AbstractExtractionTest() : KotlinLightCodeInsightFixtureTestCase(
with (handler) { with (handler) {
val target = (file as KtFile).findElementByCommentPrefix("// TARGET:") as? KtNamedDeclaration val target = (file as KtFile).findElementByCommentPrefix("// TARGET:") as? KtNamedDeclaration
if (target != null) { if (target != null) {
KotlinRefactoringUtil.selectExpression(fixture.getEditor(), file, true) { expression -> KotlinRefactoringUtil.selectElement(fixture.getEditor(), file, true, CodeInsightUtils.ElementKind.EXPRESSION) { element ->
invoke(fixture.getProject(), fixture.getEditor(), expression!!, target) invoke(fixture.getProject(), fixture.getEditor(), element as KtExpression, target)
} }
} }
else { else {
idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt
+11 -3
View File
@@ -17,8 +17,10 @@
package org.jetbrains.kotlin.idea.refactoring.nameSuggester package org.jetbrains.kotlin.idea.refactoring.nameSuggester
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiElement
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
@@ -88,9 +90,15 @@ class KotlinNameSuggesterTest : LightCodeInsightFixtureTestCase() {
if (withRuntime) { if (withRuntime) {
ConfigLibraryUtil.configureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) ConfigLibraryUtil.configureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk())
} }
KotlinRefactoringUtil.selectExpression(myFixture.editor, file, object : KotlinRefactoringUtil.SelectExpressionCallback { KotlinRefactoringUtil.selectElement(myFixture.editor, file, CodeInsightUtils.ElementKind.EXPRESSION, object : KotlinRefactoringUtil.SelectElementCallback {
override fun run(expression: KtExpression?) { override fun run(element: PsiElement?) {
val names = KotlinNameSuggester.suggestNamesByExpressionAndType(expression!!, null, expression.analyze(BodyResolveMode.PARTIAL), { true }, "value").sorted() val names = KotlinNameSuggester
.suggestNamesByExpressionAndType(element as KtExpression,
null,
element.analyze(BodyResolveMode.PARTIAL),
{ true },
"value")
.sorted()
val result = StringUtil.join(names, "\n").trim() val result = StringUtil.join(names, "\n").trim()
assertEquals(expectedResultText, result) assertEquals(expectedResultText, result)
} }