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

create method with a literal name if the name is not a identifier

Browse Source
This commit is contained in:
Max Medvedev
2013-07-11 08:59:07 +04:00
parent 5898ef7d96
commit ddf1d376d7
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
+2 -1
View File
@@ -228,7 +228,8 @@ public abstract class GroovyPsiElementFactory implements JVMElementFactory {
public abstract GrMethod createConstructorFromText(String constructorName, CharSequence constructorText, @Nullable PsiElement context);
public abstract GrDocComment createDocCommentFromText(String text) ;
@NotNull
public abstract GrDocComment createDocCommentFromText(@NotNull String text) ;
public abstract GrDocTag createDocTagFromText(String text) ;
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
+23 -5
View File
@@ -41,6 +41,7 @@ import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocMemberReference;
import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocReferenceElement;
import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocTag;
import org.jetbrains.plugins.groovy.lang.psi.*;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifier;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifierList;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;
import org.jetbrains.plugins.groovy.lang.psi.api.signatures.GrClosureSignature;
@@ -833,7 +834,8 @@ public class GroovyPsiElementFactoryImpl extends GroovyPsiElementFactory {
return createMethodFromText(text.toString(), context);
}
public GrDocComment createDocCommentFromText(String text) {
@NotNull
public GrDocComment createDocCommentFromText(@NotNull String text) {
return (GrDocComment)createGroovyFileChecked(text).getFirstChild();
}
@@ -962,14 +964,30 @@ public class GroovyPsiElementFactoryImpl extends GroovyPsiElementFactory {
public GrMethod createMethod(@NotNull @NonNls String name, @Nullable PsiType returnType) throws IncorrectOperationException {
StringBuilder builder = StringBuilderSpinAllocator.alloc();
try {
builder.append("def <T>");
if (returnType != null) {
builder.append(returnType.getCanonicalText());
}
else {
builder.append("def");
builder.append(' ');
if (GroovyNamesUtil.isIdentifier(name)) {
builder.append(name);
}
builder.append(' ').append(name).append("(){}");
return createMethodFromText(builder);
else {
builder.append('"');
builder.append(GrStringUtil.escapeSymbolsForGString(name, true, false));
builder.append('"');
}
builder.append("(){}");
GrMethod method = createMethodFromText(builder);
if (returnType != null) {
method.getModifierList().setModifierProperty(GrModifier.DEF, false);
}
PsiTypeParameterList typeParameterList = method.getTypeParameterList();
assert typeParameterList != null;
typeParameterList.getFirstChild().delete();
typeParameterList.getFirstChild().delete();
typeParameterList.getFirstChild().delete();
return method;
}
finally {
StringBuilderSpinAllocator.dispose(builder);