MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-86807 Inconsistent treatment of type parameters in widen (ctrl-w) fixed

Browse Source
This commit is contained in:
Danila Ponomarenko
2012-05-31 20:08:53 +04:00
parent 10b963783a
commit 0df29523b1
1 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
+40 -9
View File
@@ -19,12 +19,15 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.javadoc.PsiDocComment;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
*
*/
*
*/
public class MethodOrClassSelectioner extends BasicSelectioner {
@Override
@@ -69,16 +72,44 @@ public class MethodOrClassSelectioner extends BasicSelectioner {
}
if (e instanceof PsiClass) {
int start = CodeBlockOrInitializerSelectioner.findOpeningBrace(children);
// in non-Java PsiClasses, there can be no opening brace
if (start != 0) {
int end = CodeBlockOrInitializerSelectioner.findClosingBrace(children, start);
result.addAll(expandToWholeLine(editorText, new TextRange(start, end)));
}
result.addAll(selectWithTypeParameters((PsiClass)e));
result.addAll(selectBetweenBracesLines(children, editorText));
}
return result;
}
private static Collection<TextRange> selectWithTypeParameters(@NotNull PsiClass psiClass) {
final PsiIdentifier identifier = psiClass.getNameIdentifier();
final PsiTypeParameterList list = psiClass.getTypeParameterList();
if (identifier != null && list != null) {
return Collections.singletonList(new TextRange(identifier.getTextRange().getStartOffset(), list.getTextRange().getEndOffset()));
}
return Collections.emptyList();
}
private static Collection<TextRange> selectBetweenBracesLines(@NotNull PsiElement[] children,
@NotNull CharSequence editorText) {
int start = CodeBlockOrInitializerSelectioner.findOpeningBrace(children);
// in non-Java PsiClasses, there can be no opening brace
if (start != 0) {
int end = CodeBlockOrInitializerSelectioner.findClosingBrace(children, start);
return expandToWholeLine(editorText, new TextRange(start, end));
}
return Collections.emptyList();
}
private static Collection<TextRange> selectWithoutDocComment(@NotNull PsiElement[] children,
@NotNull CharSequence editorText) {
int start = CodeBlockOrInitializerSelectioner.findOpeningBrace(children);
// in non-Java PsiClasses, there can be no opening brace
if (start != 0) {
int end = CodeBlockOrInitializerSelectioner.findClosingBrace(children, start);
return expandToWholeLine(editorText, new TextRange(start, end));
}
return Collections.emptyList();
}
}