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

Don't show unknown unions in type description strings

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2013-07-31 19:33:57 +04:00
parent 3bffbc94d7
commit 5069bc03b2
1 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/documentation/PyTypeModelBuilder.java
+32 -5
View File
@@ -89,6 +89,19 @@ public class PyTypeModelBuilder {
}
}
static class UnknownType extends TypeModel {
private final TypeModel type;
private UnknownType(TypeModel type) {
this.type = type;
}
@Override
void accept(TypeVisitor visitor) {
visitor.unknown(this);
}
}
private static TypeModel _(String name) {
return new NamedType(name);
}
@@ -162,8 +175,8 @@ public class PyTypeModelBuilder {
}
}
else if (type instanceof PyUnionType && allowUnions) {
if (type instanceof PyDynamicallyEvaluatedType) {
result = build(((PyDynamicallyEvaluatedType)type).exclude(null, myContext), true);
if (type instanceof PyDynamicallyEvaluatedType || PyTypeChecker.isUnknown(type)) {
result = new UnknownType(build(((PyUnionType)type).excludeNull(), true));
}
else {
result = new OneOf(
@@ -182,7 +195,6 @@ public class PyTypeModelBuilder {
return result;
}
public TypeModel build(PyFunction function) {
final PyType returnType = function.getReturnType(myContext, null);
return new FunctionType(build(returnType, true), Collections2.transform(Lists.newArrayList(function.getParameterList().getParameters()),
@@ -191,8 +203,7 @@ public class PyTypeModelBuilder {
public TypeModel apply(PyParameter p) {
final PyNamedParameter np = p.getAsNamed();
if (np != null) {
TypeModel paramType =
_(PyNames.UNKNOWN_TYPE);
TypeModel paramType = _(PyNames.UNKNOWN_TYPE);
final PyType t = myContext.getType(np);
if (t != null) {
paramType = build(t, true);
@@ -214,6 +225,8 @@ public class PyTypeModelBuilder {
void function(FunctionType type);
void param(ParamType text);
void unknown(UnknownType type);
}
private static class TypeToStringVisitor extends TypeNameVisitor {
@@ -232,6 +245,15 @@ public class PyTypeModelBuilder {
public String getString() {
return myStringBuilder.toString();
}
@Override
public void unknown(UnknownType type) {
final TypeModel nested = type.type;
if (nested != null) {
nested.accept(this);
}
add(" | " + PyNames.UNKNOWN_TYPE);
}
}
private static class TypeToBodyWithLinksVisitor extends TypeNameVisitor {
@@ -346,5 +368,10 @@ public class PyTypeModelBuilder {
}
myDepth--;
}
@Override
public void unknown(UnknownType type) {
type.type.accept(this);
}
}
}