From a68fba8a8a31bcb236d138e873220a2417401032 Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Tue, 10 Nov 2020 00:59:42 +0300 Subject: [PATCH] Cleanup: De Morgan's law & common code in branches GitOrigin-RevId: 23861059ded4bb6be60d09923b8cbb7b2bdb1f8f --- .../com/jetbrains/python/psi/types/PyClassTypeImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java index 7f0c7e755286..5466e2c63091 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java @@ -448,13 +448,10 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType { final PyResolveProcessor processor = new PyResolveProcessor(name); final Map results; - if (!isDefinition && !cls.processInstanceLevelDeclarations(processor, location)) { - results = processor.getResults(); - } - else { + if (isDefinition || cls.processInstanceLevelDeclarations(processor, location)) { cls.processClassLevelDeclarations(processor); - results = processor.getResults(); } + results = processor.getResults(); return EntryStream .of(results)