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-89598 NPE from GDSL

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-08-04 23:14:41 +04:00
parent 67f44bfbeb
commit b9d3816b83
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/resources/standardDsls/defaultMethods.gdsl
+7 -8
View File
@@ -17,35 +17,34 @@ package standardDsls
import com.intellij.psi.PsiType
import com.intellij.psi.util.PsiUtil
import static standardDsls.Constants.NUMBER
import static standardDsls.Constants.STRING
/**
* @author Maxim.Medvedev
*/
interface Constants {
private interface Constants {
String NUMBER = "java.lang.Number"
String STRING = "java.lang.String"
String WILDCARD_PREFIX = "? extends "
}
def extractIterableParameter(PsiType type) {
if (!type) return null
private String extractIterableParameter(PsiType type) {
def componentType = PsiUtil.extractIterableTypeParameter(type, true)
return removeWildcard(componentType.canonicalText?:componentType.presentableText);
return removeWildcard(componentType?.canonicalText ?: componentType?.presentableText);
}
private String removeWildcard(String componentType) {
componentType = componentType.replace("?extends", "? extends ")
componentType = componentType?.replace("?extends", "? extends ")
if (componentType?.startsWith(Constants.WILDCARD_PREFIX)) {
return componentType.substring(Constants.WILDCARD_PREFIX.size())
return componentType?.substring(Constants.WILDCARD_PREFIX.size())
}
return componentType
}
def constructElementTypeArg(PsiType psiType) {
private String constructElementTypeArg(PsiType psiType) {
def arg = extractIterableParameter(psiType)
if (!arg || arg == "null") return ""
return "<$arg>"