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

Revert incomplete implementation of PyTypeVisitor polluting public API

Browse Source 
except PyCollectionType extending PyClassType that makes a lot of
sense since both PyCollectionTypeImpl and PyTupleType already extend
PyClassTypeImpl, but one still needs explicit casts to
PyCollectionTypeImpl to access the corresponding class definition.
This commit is contained in:
Mikhail Golubev
2018-02-20 18:04:54 +03:00
parent 5e73e7764e
commit 4e8a44b297
15 changed files with 0 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java
-5
View File
@@ -65,9 +65,4 @@ public interface PyClassLikeType extends PyCallableType, PyWithAncestors, PyInst
@Nullable
PyClassLikeType getMetaClassType(@NotNull TypeEvalContext context, boolean inherited);
@Override
default void accept(@NotNull PyTypeVisitor visitor) {
visitor.visitClassLikeType(this);
}
}
python/psi-api/src/com/jetbrains/python/psi/types/PyType.java
-3
View File
@@ -91,7 +91,4 @@ public interface PyType {
boolean isBuiltin();
void assertValid(String message);
default void accept(@NotNull PyTypeVisitor visitor) {
}
}
python/psi-api/src/com/jetbrains/python/psi/types/PyTypeVisitor.java
-27
View File
@@ -1,27 +0,0 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.python.psi.types;
import org.jetbrains.annotations.NotNull;
/**
* @author Mikhail Golubev
*/
public abstract class PyTypeVisitor {
public void visitType(@NotNull PyType type) {}
public void visitCallableType(@NotNull PyCallableType type) {
visitType(type);
}
public void visitFunctionType(@NotNull PyFunctionType type) {
visitCallableType(type);
}
public void visitClassLikeType(@NotNull PyClassLikeType type) {
visitCallableType(type);
}
public void visitClassType(@NotNull PyClassType type) {
visitClassLikeType(type);
}
}
python/src/com/jetbrains/python/psi/types/PyCallableTypeImpl.java
-7
View File
@@ -110,11 +110,4 @@ public class PyCallableTypeImpl implements PyCallableType {
@Override
public void assertValid(String message) {
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
visitor.visitCallableType(this);
}
}
}
python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java
-5
View File
@@ -901,9 +901,4 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
return (instance != target);
}
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
visitor.visitClassType(this);
}
}
python/src/com/jetbrains/python/psi/types/PyCollectionTypeImpl.java
-7
View File
@@ -111,11 +111,4 @@ public class PyCollectionTypeImpl extends PyClassTypeImpl implements PyCollectio
// TODO: Select the parameter type that matches T in Iterable[T]
return ContainerUtil.getFirstItem(myElementTypes);
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
((PyTypeVisitorExt)visitor).visitCollectionType(this);
}
}
}
python/src/com/jetbrains/python/psi/types/PyFunctionTypeImpl.java
-5
View File
@@ -182,9 +182,4 @@ public class PyFunctionTypeImpl implements PyFunctionType {
}
return this;
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
visitor.visitFunctionType(this);
}
}
python/src/com/jetbrains/python/psi/types/PyGenericType.java
-7
View File
@@ -131,11 +131,4 @@ public class PyGenericType implements PyType, PyInstantiableType<PyGenericType>
public PyGenericType toClass() {
return myIsDefinition ? this : new PyGenericType(myName, myBound, true, myTargetExpression);
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
((PyTypeVisitorExt)visitor).visitGenericType(this);
}
}
}
python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java
-7
View File
@@ -123,13 +123,6 @@ public class PyImportedModuleType implements PyType {
return myImportedModule;
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
((PyTypeVisitorExt)visitor).visitImportedModuleType(this);
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
python/src/com/jetbrains/python/psi/types/PyModuleType.java
-6
View File
@@ -507,10 +507,4 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
return MODULE_MEMBERS;
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
((PyTypeVisitorExt)visitor).visitModuleType(this);
}
}
}
python/src/com/jetbrains/python/psi/types/PyNoneType.java
-7
View File
@@ -60,11 +60,4 @@ public class PyNoneType implements PyType { // TODO must extend ClassType. It's
@Override
public void assertValid(String message) {
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
((PyTypeVisitorExt)visitor).visitNoneType(this);
}
}
}
python/src/com/jetbrains/python/psi/types/PyStructuralType.java
-7
View File
@@ -88,11 +88,4 @@ public class PyStructuralType implements PyType {
public Set<String> getAttributeNames() {
return myAttributes;
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
((PyTypeVisitorExt)visitor).visitStructuralType(this);
}
}
}
python/src/com/jetbrains/python/psi/types/PyTupleType.java
-7
View File
@@ -124,11 +124,4 @@ public class PyTupleType extends PyClassTypeImpl implements PyCollectionType {
public PyType getIteratedItemType() {
return PyUnionType.union(myElementTypes);
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
((PyTypeVisitorExt)visitor).visitTupleType(this);
}
}
}
python/src/com/jetbrains/python/psi/types/PyTypeVisitorExt.java
-47
View File
@@ -1,47 +0,0 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.python.psi.types;
import com.jetbrains.python.codeInsight.stdlib.PyNamedTupleType;
import org.jetbrains.annotations.NotNull;
/**
* @author Mikhail Golubev
*/
public abstract class PyTypeVisitorExt extends PyTypeVisitor {
public void visitNoneType(@NotNull PyNoneType type) {
visitType(type);
}
public void visitUnionType(@NotNull PyUnionType type) {
visitType(type);
}
public void visitGenericType(@NotNull PyGenericType type) {
visitType(type);
}
public void visitCollectionType(@NotNull PyCollectionType type) {
visitClassType(type);
}
public void visitTupleType(@NotNull PyTupleType type) {
visitCollectionType(type);
}
public void visitNamedTupleType(@NotNull PyNamedTupleType type) {
visitTupleType(type);
}
public void visitStructuralType(@NotNull PyStructuralType type) {
visitType(type);
}
public void visitImportedModuleType(@NotNull PyImportedModuleType type) {
visitType(type);
}
public void visitModuleType(@NotNull PyModuleType type) {
visitType(type);
}
}
python/src/com/jetbrains/python/psi/types/PyUnionType.java
-7
View File
@@ -219,11 +219,4 @@ public class PyUnionType implements PyType {
public String toString() {
return "PyUnionType: " + getName();
}
@Override
public void accept(@NotNull PyTypeVisitor visitor) {
if (visitor instanceof PyTypeVisitorExt) {
((PyTypeVisitorExt)visitor).visitUnionType(this);
}
}
}