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

Cleanup PyNamedTupleType

Browse Source
This commit is contained in:
Semyon Proshev
2018-01-17 22:06:36 +03:00
parent bafc005066
commit eaaaf8bd7a
2 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/stdlib/PyNamedTupleType.java
+18 -25
View File
@@ -6,6 +6,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ProcessingContext;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap;
import com.jetbrains.python.psi.PyCallSiteExpression;
import com.jetbrains.python.psi.PyClass;
import com.jetbrains.python.psi.PyExpression;
@@ -21,14 +22,11 @@ import java.util.*;
*/
public class PyNamedTupleType extends PyTupleType implements PyCallableType {
@NotNull
private final PsiElement myDeclaration;
@NotNull
private final String myName;
@NotNull
private final Map<String, FieldTypeAndDefaultValue> myFields;
private final LinkedHashMap<String, FieldTypeAndDefaultValue> myFields;
@NotNull
private final DefinitionLevel myDefinitionLevel;
@@ -36,9 +34,8 @@ public class PyNamedTupleType extends PyTupleType implements PyCallableType {
private final boolean myTyped;
public PyNamedTupleType(@NotNull PyClass tupleClass,
@NotNull PsiElement declaration,
@NotNull String name,
@NotNull Map<String, FieldTypeAndDefaultValue> fields,
@NotNull LinkedHashMap<String, FieldTypeAndDefaultValue> fields,
@NotNull DefinitionLevel definitionLevel,
boolean typed) {
super(tupleClass,
@@ -46,8 +43,7 @@ public class PyNamedTupleType extends PyTupleType implements PyCallableType {
false,
definitionLevel != DefinitionLevel.INSTANCE);
myDeclaration = declaration;
myFields = Collections.unmodifiableMap(fields);
myFields = new LinkedHashMap<>(fields);
myName = name;
myDefinitionLevel = definitionLevel;
myTyped = typed;
@@ -76,13 +72,12 @@ public class PyNamedTupleType extends PyTupleType implements PyCallableType {
@Nullable
@Override
public PyType getCallType(@NotNull TypeEvalContext context, @NotNull PyCallSiteExpression callSite) {
public PyNamedTupleType getCallType(@NotNull TypeEvalContext context, @NotNull PyCallSiteExpression callSite) {
if (myDefinitionLevel == DefinitionLevel.NT_FUNCTION) {
return new PyNamedTupleType(myClass, myDeclaration, myName, myFields, DefinitionLevel.NEW_TYPE, myTyped);
return new PyNamedTupleType(myClass, myName, myFields, DefinitionLevel.NEW_TYPE, myTyped);
}
else if (myDefinitionLevel == DefinitionLevel.NEW_TYPE) {
final Map<String, FieldTypeAndDefaultValue> fields = takeFieldsTypesFromCallSiteIfNeeded(context, callSite);
return new PyNamedTupleType(myClass, myDeclaration, myName, fields, DefinitionLevel.INSTANCE, myTyped);
return getCallDefinitionType(callSite, context);
}
return null;
@@ -90,18 +85,18 @@ public class PyNamedTupleType extends PyTupleType implements PyCallableType {
@NotNull
@Override
public PyClassType toInstance() {
public PyNamedTupleType toInstance() {
return myDefinitionLevel == DefinitionLevel.NEW_TYPE
? new PyNamedTupleType(myClass, myDeclaration, myName, myFields, DefinitionLevel.INSTANCE, myTyped)
? new PyNamedTupleType(myClass, myName, myFields, DefinitionLevel.INSTANCE, myTyped)
: this;
}
@NotNull
@Override
public PyClassLikeType toClass() {
public PyNamedTupleType toClass() {
return myDefinitionLevel == DefinitionLevel.INSTANCE
? this
: new PyNamedTupleType(myClass, myDeclaration, myName, myFields, DefinitionLevel.NEW_TYPE, myTyped);
: new PyNamedTupleType(myClass, myName, myFields, DefinitionLevel.NEW_TYPE, myTyped);
}
@Override
@@ -137,7 +132,7 @@ public class PyNamedTupleType extends PyTupleType implements PyCallableType {
@NotNull
public Map<String, FieldTypeAndDefaultValue> getFields() {
return myFields;
return Collections.unmodifiableMap(myFields);
}
@Override
@@ -170,34 +165,32 @@ public class PyNamedTupleType extends PyTupleType implements PyCallableType {
}
}
return new PyNamedTupleType(myClass, myDeclaration, myName, newFields, myDefinitionLevel, false);
return new PyNamedTupleType(myClass, myName, newFields, myDefinitionLevel, false);
}
return this;
}
@NotNull
private Map<String, FieldTypeAndDefaultValue> takeFieldsTypesFromCallSiteIfNeeded(@NotNull TypeEvalContext context,
@NotNull PyCallSiteExpression callSite) {
private PyNamedTupleType getCallDefinitionType(@NotNull PyCallSiteExpression callSite, @NotNull TypeEvalContext context) {
if (!myTyped) {
final List<PyExpression> arguments = callSite.getArguments(null);
if (arguments.size() == myFields.size()) {
final Map<String, FieldTypeAndDefaultValue> result = new HashMap<>();
final Map<String, PyType> result = new HashMap<>();
for (Map.Entry<String, PyExpression> entry : StreamEx.ofKeys(myFields).zipWith(StreamEx.of(arguments))) {
final String name = entry.getKey();
final PyType type = context.getType(entry.getValue());
final PyExpression value = myFields.get(name).getDefaultValue();
result.put(name, new FieldTypeAndDefaultValue(type, value));
result.put(name, type);
}
return result;
return toInstance().clarifyFields(result);
}
}
return myFields;
return toInstance();
}
@NotNull
python/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java
-2
View File
@@ -492,7 +492,6 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
final PyClass tupleClass = as(typingNT, PyClass.class);
if (tupleClass != null) {
return new PyNamedTupleType(tupleClass,
cls,
name,
collectTypingNTInheritorFields(cls, context),
PyNamedTupleType.DefinitionLevel.NEW_TYPE,
@@ -537,7 +536,6 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
final Map<String, Optional<String>> fields = stub.getFields();
return new PyNamedTupleType(tupleClass,
referenceTarget,
stub.getName(),
parseNamedTupleFields(referenceTarget, fields, context),
definitionLevel,