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

more concise closure folding placeholder text (IDEA-86134)

Browse Source
This commit is contained in:
peter
2012-05-24 19:29:49 +02:00
parent e5054c2981
commit f5d677b775
1 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java
+2 -25
View File
@@ -43,7 +43,6 @@ import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.Function;
import com.intellij.util.ObjectUtils;
import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -626,35 +625,13 @@ public class JavaFoldingBuilder extends CustomFoldingBuilder implements DumbAwar
if (lastLineEnd > 0 && seq.charAt(lastLineEnd) == '\n') lastLineEnd--;
if (lastLineEnd < firstLineStart) return false;
final String baseClassName = quick ?
anonymousClass.getBaseClassReference().getReferenceName() :
ObjectUtils.assertNotNull(anonymousClass.getBaseClassType().resolve()).getName();
if (lastLineEnd >= seq.length() || firstLineStart >= seq.length() || firstLineStart < 0) {
LOG.error("llE=" + lastLineEnd + "; fLS=" + firstLineStart + "; len=" + seq.length() + "rE=" + rangeEnd + "; class=" +
baseClassName);
}
final String params = StringUtil.join(method.getParameterList().getParameters(), new Function<PsiParameter, String>() {
@Override
public String fun(final PsiParameter psiParameter) {
String typeName;
if (quick) {
PsiTypeElement typeElement = psiParameter.getTypeElement();
assert typeElement != null;
typeName = typeElement.getText();
}
else {
typeName = psiParameter.getType().getPresentableText();
}
int genStart = typeName.indexOf('<');
int genEnd = typeName.lastIndexOf('>');
if (genStart > 0 && genEnd > 0) {
typeName = typeName.substring(0, genStart) + typeName.substring(genEnd + 1);
}
return typeName + " " + psiParameter.getName();
return psiParameter.getName();
}
}, ", ");
@NonNls final String lambdas = baseClassName + "(" + params + ") {";
@NonNls final String lambdas = "{" + params + " =>";
final int closureStart = expression.getTextRange().getStartOffset();
final int closureEnd = expression.getTextRange().getEndOffset();