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

return type of dynamic methods

Browse Source
This commit is contained in:
Max Medvedev
2013-08-19 14:48:44 +04:00
parent 19aeeed809
commit 2416310c50
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/elements/DMethodElement.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class DMethodElement extends DItemElement {
if (myImplicitMethod != null) return myImplicitMethod;
Boolean aStatic = isStatic();
myImplicitMethod = new GrDynamicImplicitMethod(manager, getName(), containingClassName, aStatic != null && aStatic.booleanValue(), myPairs);
myImplicitMethod = new GrDynamicImplicitMethod(manager, getName(), containingClassName, aStatic != null && aStatic.booleanValue(), myPairs, getType());
return myImplicitMethod;
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrDynamicImplicitMethod.java
+8 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,12 +57,14 @@ public class GrDynamicImplicitMethod extends GrLightMethodBuilder implements GrD
private final String myContainingClassName;
private final List<ParamInfo> myParamInfos;
private final String myReturnType;
public GrDynamicImplicitMethod(PsiManager manager,
String name,
String containingClassName,
boolean isStatic,
List<ParamInfo> paramInfos) {
List<ParamInfo> paramInfos,
String returnType) {
super(manager, name);
myContainingClassName = containingClassName;
myParamInfos = paramInfos;
@@ -75,6 +77,9 @@ public class GrDynamicImplicitMethod extends GrLightMethodBuilder implements GrD
for (ParamInfo pair : paramInfos) {
addParameter(pair.name, pair.type, false);
}
setReturnType(returnType, getResolveScope());
myReturnType = returnType;
}
public String getContainingClassName() {
@@ -95,7 +100,7 @@ public class GrDynamicImplicitMethod extends GrLightMethodBuilder implements GrD
}
public GrDynamicImplicitMethod copy() {
return new GrDynamicImplicitMethod(myManager, getName(), getContainingClassName(), hasModifierProperty(PsiModifier.STATIC), ContainerUtil.newArrayList(myParamInfos));
return new GrDynamicImplicitMethod(myManager, getName(), getContainingClassName(), hasModifierProperty(PsiModifier.STATIC), ContainerUtil.newArrayList(myParamInfos), myReturnType);
}
public boolean isValid() {