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-25655 Fix a few minor issues in the PR and bump the stub version

Browse Source 
Namely, I got rid of a bunch of inspection warnings related to
nullability and tweaked formatting slightly.
This commit is contained in:
Mikhail Golubev
2018-01-12 15:35:46 +03:00
parent 6d9cd9f45c
commit 63fdb3d3f8
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/stubs/PyClassStub.java
-1
View File
@@ -44,7 +44,6 @@ public interface PyClassStub extends NamedStub<PyClass> {
@NotNull
List<String> getSubscriptedSuperClasses();
@Nullable
QualifiedName getMetaClass();
python/src/com/jetbrains/python/psi/PyFileElementType.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class PyFileElementType extends IStubFileElementType<PyFileStub> {
@Override
public int getStubVersion() {
// Don't forget to update versions of indexes that use the updated stub-based elements
return 66;
return 67;
}
@Nullable
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
+3 -3
View File
@@ -343,7 +343,7 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
PyPsiUtils.assertValid(PyClassImpl.this);
final StringBuilder result = new StringBuilder(notNullize(getName(), PyNames.UNNAMED_ELEMENT));
final List<String> superClassesText = getSuperClassesText();
if (superClassesText.size() > 0) {
if (!superClassesText.isEmpty()) {
result.append("(");
result.append(join(superClassesText, expr -> notNullize(expr, PyNames.UNNAMED_ELEMENT), ", "));
result.append(")");
@@ -355,8 +355,8 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
private List<String> getSuperClassesText() {
PyClassStub stub = getGreenStub();
if (stub == null || stub.getSuperClassesText() == null) {
return ContainerUtil.map(getSuperClassExpressions(), exp -> exp.getText());
if (stub == null) {
return ContainerUtil.map(getSuperClassExpressions(), PsiElement::getText);
}
else {
return stub.getSuperClassesText();
python/src/com/jetbrains/python/psi/impl/stubs/PyClassElementType.java
-2
View File
@@ -109,7 +109,6 @@ public class PyClassElementType extends PyStubElementType<PyClassStub, PyClass>
PySubscriptionExpression.class));
}
@Nullable
private static QualifiedName resolveOriginalSuperClassQName(@NotNull PyExpression superClassExpression) {
if (superClassExpression instanceof PyReferenceExpression) {
@@ -148,7 +147,6 @@ public class PyClassElementType extends PyStubElementType<PyClassStub, PyClass>
final List<String> subscriptedBaseClassesText = pyClassStub.getSubscriptedSuperClasses();
final List<String> baseClassesText = pyClassStub.getSuperClassesText();
assert baseClassesText != null;
dataStream.writeByte(baseClassesText.size());
for (String text : baseClassesText) {
python/src/com/jetbrains/python/psi/impl/stubs/PyClassStubImpl.java
+5 -5
View File
@@ -24,14 +24,14 @@ import com.jetbrains.python.psi.stubs.PyClassStub;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Map;
/**
* @author max
*/
public class
PyClassStubImpl extends StubBase<PyClass> implements PyClassStub {
public class PyClassStubImpl extends StubBase<PyClass> implements PyClassStub {
@Nullable
private final String myName;
@@ -49,7 +49,7 @@ PyClassStubImpl extends StubBase<PyClass> implements PyClassStub {
@Nullable
private final String myDocString;
@Nullable
@NotNull
private final List<String> mySuperClassesText;
public PyClassStubImpl(@Nullable String name,
@@ -60,14 +60,14 @@ PyClassStubImpl extends StubBase<PyClass> implements PyClassStub {
@Nullable List<String> slots,
@Nullable String docString,
@NotNull IStubElementType stubElementType) {
this(name, parentStub, superClasses, subscriptedSuperClassesText, null, metaClass, slots, docString, stubElementType);
this(name, parentStub, superClasses, subscriptedSuperClassesText, Collections.emptyList(), metaClass, slots, docString, stubElementType);
}
public PyClassStubImpl(@Nullable String name,
@Nullable StubElement parentStub,
@NotNull Map<QualifiedName, QualifiedName> superClasses,
@NotNull List<String> subscriptedSuperClassesText,
@Nullable List<String> superClassesText,
@NotNull List<String> superClassesText,
@Nullable QualifiedName metaClass,
@Nullable List<String> slots,
@Nullable String docString,