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

PY-45206 IJ-CR-3996 More null safety

Browse Source 
GitOrigin-RevId: 98a84a10f2b50e76ae416140fecff8d05d42bbe2
This commit is contained in:
Andrey Vlasovskikh
2021-03-30 14:27:03 +00:00
committed by intellij-monorepo-bot
parent 6951cf0f2d
commit 1c353a809a
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-psi-api/src/com/jetbrains/python/psi/PyClass.java
+1
View File
@@ -220,6 +220,7 @@ public interface PyClass extends PsiNameIdentifierOwner, PyStatement, PyDocStrin
* <p/>
* This method does not access AST if underlying PSI is stub based.
*/
@NotNull
List<PyTargetExpression> getInstanceAttributes();
@Nullable
python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyClassImpl.java
+21 -12
View File
@@ -64,8 +64,8 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
public static final PyClass[] EMPTY_ARRAY = new PyClassImpl[0];
private volatile List<PyTargetExpression> myInstanceAttributes;
private volatile List<PyTargetExpression> myFallbackInstanceAttributes;
@Nullable private volatile List<PyTargetExpression> myInstanceAttributes;
@Nullable private volatile List<PyTargetExpression> myFallbackInstanceAttributes;
private volatile Map<String, Property> myLocalPropertyCache;
@@ -1066,12 +1066,16 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
return processor.getResult();
}
@NotNull
@Override
public List<PyTargetExpression> getInstanceAttributes() {
if (myInstanceAttributes == null) {
myInstanceAttributes = collectInstanceAttributes(Collections.emptyMap());
List<PyTargetExpression> attributes = myInstanceAttributes;
if (attributes != null) {
return attributes;
}
return myInstanceAttributes;
attributes = collectInstanceAttributes(Collections.emptyMap());
myInstanceAttributes = attributes;
return attributes;
}
@Nullable
@@ -1094,17 +1098,22 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
return null;
}
@NotNull
private List<PyTargetExpression> getFallbackInstanceAttributes() {
if (myFallbackInstanceAttributes == null) {
Map<String, ScopeOwner> scopesToSkip = StreamEx.of(getInstanceAttributes())
.filter(e -> e.getName() != null)
.mapToEntry(e -> e.getName(), e -> ScopeUtil.getScopeOwner(e))
.toMap();
myFallbackInstanceAttributes = collectInstanceAttributes(scopesToSkip);
List<PyTargetExpression> attributes = myFallbackInstanceAttributes;
if (attributes != null) {
return attributes;
}
return myFallbackInstanceAttributes;
Map<String, ScopeOwner> scopesToSkip = StreamEx.of(getInstanceAttributes())
.filter(e -> e.getName() != null)
.mapToEntry(e -> e.getName(), e -> ScopeUtil.getScopeOwner(e))
.toMap();
attributes = collectInstanceAttributes(scopesToSkip);
myFallbackInstanceAttributes = attributes;
return attributes;
}
@NotNull
private List<PyTargetExpression> collectInstanceAttributes(Map<String, ScopeOwner> scopesToSkip) {
Map<String, PyTargetExpression> result = new HashMap<>();
collectAttributesInConstructors(result, scopesToSkip);