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-126334 Correct declaration scope for light parameters and getReturnTypeElementGroovy for light methods

Browse Source
This commit is contained in:
Max Medvedev
2014-07-19 15:31:04 +04:00
parent 5ccb8728b3
commit a2221d5c29
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java
+5 -1
View File
@@ -200,7 +200,11 @@ public class GrLightMethodBuilder extends LightElement implements GrMethod, Ori
@Override
public GrTypeElement getReturnTypeElementGroovy() {
return null;
PsiType returnType = getReturnType();
if (returnType == null) {
return null;
}
return new GrLightTypeElement(returnType, getManager());
}
@Override
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightParameterListBuilder.java
+2 -2
View File
@@ -64,9 +64,9 @@ public class GrLightParameterListBuilder extends LightElement implements GrParam
return myCachedParameters;
}
public void copyParameters(@NotNull PsiMethod method, PsiSubstitutor substitutor) {
public void copyParameters(@NotNull PsiMethod method, PsiSubstitutor substitutor, PsiMethod scope) {
for (PsiParameter parameter : method.getParameterList().getParameters()) {
GrLightParameter p = new GrLightParameter(StringUtil.notNullize(parameter.getName()), substitutor.substitute(parameter.getType()), this);
GrLightParameter p = new GrLightParameter(StringUtil.notNullize(parameter.getName()), substitutor.substitute(parameter.getType()), scope);
if (parameter instanceof GrParameter) {
p.setOptional(((GrParameter)parameter).isOptional());
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrMethodWrapper.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class GrMethodWrapper extends GrLightMethodBuilder implements PsiMirrorEl
getModifierList().copyModifiers(method);
getParameterList().copyParameters(method, substitutor);
getParameterList().copyParameters(method, substitutor, this);
if (method instanceof OriginInfoAwareElement) {
setOriginInfo(((OriginInfoAwareElement)method).getOriginInfo());