From 8eccdc9dfc8fec539e3d79b011dc012cbc83334e Mon Sep 17 00:00:00 2001
From: Semyon Proshev <Semyon.Proshev@jetbrains.com>
Date: Tue, 29 Aug 2017 19:22:22 +0300
Subject: [PATCH] Remove default value flag from parameter stub and use text
 instead.

---
 .../jetbrains/python/psi/stubs/PyNamedParameterStub.java | 1 -
 .../jetbrains/python/psi/stubs/PyTupleParameterStub.java | 1 -
 .../src/com/jetbrains/python/psi/PyFileElementType.java  | 2 +-
 .../jetbrains/python/psi/impl/PyNamedParameterImpl.java  | 6 +++---
 .../jetbrains/python/psi/impl/PyTupleParameterImpl.java  | 2 +-
 .../psi/impl/stubs/PyNamedParameterElementType.java      | 8 ++------
 .../python/psi/impl/stubs/PyNamedParameterStubImpl.java  | 8 --------
 .../psi/impl/stubs/PyTupleParameterElementType.java      | 6 ++----
 .../python/psi/impl/stubs/PyTupleParameterStubImpl.java  | 9 +--------
 9 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java b/python/psi-api/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java
index eb502d61e85d..a9cb800095e4 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java
@@ -26,7 +26,6 @@ import org.jetbrains.annotations.Nullable;
 public interface PyNamedParameterStub extends NamedStub<PyNamedParameter>, PyAnnotationOwnerStub, PyTypeCommentOwnerStub {
   boolean isPositionalContainer();
   boolean isKeywordContainer();
-  boolean hasDefaultValue();
   @Nullable
   String getDefaultValueText();
 }
\ No newline at end of file
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java b/python/psi-api/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java
index 8ff63973be9a..6e6bef6bdd6c 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java
@@ -23,7 +23,6 @@ import org.jetbrains.annotations.Nullable;
  * Tuple parameter stub, collects nested parameters from stubs.
  */
 public interface PyTupleParameterStub extends StubElement<PyTupleParameter> {
-  boolean hasDefaultValue();
   @Nullable
   String getDefaultValueText();
 }
diff --git a/python/src/com/jetbrains/python/psi/PyFileElementType.java b/python/src/com/jetbrains/python/psi/PyFileElementType.java
index 30e0d94372b7..9386d3e0903c 100644
--- a/python/src/com/jetbrains/python/psi/PyFileElementType.java
+++ b/python/src/com/jetbrains/python/psi/PyFileElementType.java
@@ -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 63;
+    return 64;
   }
 
   @Nullable
diff --git a/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java b/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
index cde3dcf49b6e..835f1ee9569e 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
@@ -155,10 +155,10 @@ public class PyNamedParameterImpl extends PyBaseElementImpl<PyNamedParameterStub
   @Nullable
   public PyExpression getDefaultValue() {
     final PyNamedParameterStub stub = getStub();
-    if (stub != null && !stub.hasDefaultValue()) {
+    if (stub != null && stub.getDefaultValueText() == null) {
       return null;
     }
-    ASTNode[] nodes = getNode().getChildren(PythonDialectsTokenSetProvider.INSTANCE.getExpressionTokens());
+    final ASTNode[] nodes = getNode().getChildren(PythonDialectsTokenSetProvider.INSTANCE.getExpressionTokens());
     if (nodes.length > 0) {
       return (PyExpression)nodes[0].getPsi();
     }
@@ -169,7 +169,7 @@ public class PyNamedParameterImpl extends PyBaseElementImpl<PyNamedParameterStub
   public boolean hasDefaultValue() {
     final PyNamedParameterStub stub = getStub();
     if (stub != null) {
-      return stub.hasDefaultValue();
+      return stub.getDefaultValueText() != null;
     }
     return getDefaultValue() != null;
   }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyTupleParameterImpl.java b/python/src/com/jetbrains/python/psi/impl/PyTupleParameterImpl.java
index 1d3b20c92066..cf2532b2c700 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyTupleParameterImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyTupleParameterImpl.java
@@ -63,7 +63,7 @@ public class PyTupleParameterImpl extends PyBaseElementImpl<PyTupleParameterStub
   public boolean hasDefaultValue() {
     final PyTupleParameterStub stub = getStub();
     if (stub != null) {
-      return stub.hasDefaultValue();
+      return stub.getDefaultValueText() != null;
     }
     return getDefaultValue() != null;
   }
diff --git a/python/src/com/jetbrains/python/psi/impl/stubs/PyNamedParameterElementType.java b/python/src/com/jetbrains/python/psi/impl/stubs/PyNamedParameterElementType.java
index 5183fdbbe993..f52caafb7060 100644
--- a/python/src/com/jetbrains/python/psi/impl/stubs/PyNamedParameterElementType.java
+++ b/python/src/com/jetbrains/python/psi/impl/stubs/PyNamedParameterElementType.java
@@ -39,7 +39,6 @@ import java.io.IOException;
 public class PyNamedParameterElementType extends PyStubElementType<PyNamedParameterStub, PyNamedParameter> {
   private static final int POSITIONAL_CONTAINER = 1;
   private static final int KEYWORD_CONTAINER = 2;
-  private static final int HAS_DEFAULT_VALUE = 4;
 
   public PyNamedParameterElementType() {
     this("NAMED_PARAMETER");
@@ -58,9 +57,8 @@ public class PyNamedParameterElementType extends PyStubElementType<PyNamedParame
   @Override
   @NotNull
   public PyNamedParameterStub createStub(@NotNull final PyNamedParameter psi, final StubElement parentStub) {
-    return new PyNamedParameterStubImpl(psi.getName(), psi.isPositionalContainer(), psi.isKeywordContainer(), psi.hasDefaultValue(),
-                                        psi.getDefaultValueText(), psi.getTypeCommentAnnotation(), psi.getAnnotationValue() , parentStub,
-                                        getStubElementType());
+    return new PyNamedParameterStubImpl(psi.getName(), psi.isPositionalContainer(), psi.isKeywordContainer(), psi.getDefaultValueText(),
+                                        psi.getTypeCommentAnnotation(), psi.getAnnotationValue(), parentStub, getStubElementType());
   }
 
   @Override
@@ -77,7 +75,6 @@ public class PyNamedParameterElementType extends PyStubElementType<PyNamedParame
     byte flags = 0;
     if (stub.isPositionalContainer()) flags |= POSITIONAL_CONTAINER;
     if (stub.isKeywordContainer()) flags |= KEYWORD_CONTAINER;
-    if (stub.hasDefaultValue()) flags |= HAS_DEFAULT_VALUE;
     dataStream.writeByte(flags);
     dataStream.writeName(stub.getDefaultValueText());
     dataStream.writeName(stub.getTypeComment());
@@ -95,7 +92,6 @@ public class PyNamedParameterElementType extends PyStubElementType<PyNamedParame
     return new PyNamedParameterStubImpl(name,
                                         (flags & POSITIONAL_CONTAINER) != 0,
                                         (flags & KEYWORD_CONTAINER) != 0,
-                                        (flags & HAS_DEFAULT_VALUE) != 0,
                                         defaultValueText == null ? null : defaultValueText.getString(),
                                         typeComment == null ? null : typeComment.getString(),
                                         annotation == null ? null : annotation.getString(),
diff --git a/python/src/com/jetbrains/python/psi/impl/stubs/PyNamedParameterStubImpl.java b/python/src/com/jetbrains/python/psi/impl/stubs/PyNamedParameterStubImpl.java
index 27c37ad98b86..254007f7801b 100644
--- a/python/src/com/jetbrains/python/psi/impl/stubs/PyNamedParameterStubImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/stubs/PyNamedParameterStubImpl.java
@@ -30,7 +30,6 @@ public class PyNamedParameterStubImpl extends StubBase<PyNamedParameter> impleme
   private final String myName;
   private final boolean myPositionalContainer;
   private final boolean myKeywordContainer;
-  private final boolean myHasDefaultValue;
   private final String myTypeCommentAnnotation;
   private final String myAnnotation;
   @Nullable
@@ -39,7 +38,6 @@ public class PyNamedParameterStubImpl extends StubBase<PyNamedParameter> impleme
   public PyNamedParameterStubImpl(String name,
                                   boolean isPositionalContainer,
                                   boolean isKeywordContainer,
-                                  boolean hasDefaultValue,
                                   @Nullable String defaultValueText,
                                   @Nullable String typeCommentAnnotation,
                                   @Nullable String annotation,
@@ -49,7 +47,6 @@ public class PyNamedParameterStubImpl extends StubBase<PyNamedParameter> impleme
     myName = name;
     myPositionalContainer = isPositionalContainer;
     myKeywordContainer = isKeywordContainer;
-    myHasDefaultValue = hasDefaultValue;
     myTypeCommentAnnotation = typeCommentAnnotation;
     myAnnotation = annotation;
     myDefaultValueText = defaultValueText;
@@ -65,11 +62,6 @@ public class PyNamedParameterStubImpl extends StubBase<PyNamedParameter> impleme
     return myKeywordContainer;
   }
 
-  @Override
-  public boolean hasDefaultValue() {
-    return myHasDefaultValue;
-  }
-
   @Nullable
   @Override
   public String getDefaultValueText() {
diff --git a/python/src/com/jetbrains/python/psi/impl/stubs/PyTupleParameterElementType.java b/python/src/com/jetbrains/python/psi/impl/stubs/PyTupleParameterElementType.java
index 6d58f5aca0e7..fcc1278c82e1 100644
--- a/python/src/com/jetbrains/python/psi/impl/stubs/PyTupleParameterElementType.java
+++ b/python/src/com/jetbrains/python/psi/impl/stubs/PyTupleParameterElementType.java
@@ -52,20 +52,18 @@ public class PyTupleParameterElementType extends PyStubElementType<PyTupleParame
   @Override
   @NotNull
   public PyTupleParameterStub createStub(@NotNull PyTupleParameter psi, StubElement parentStub) {
-    return new PyTupleParameterStubImpl(psi.hasDefaultValue(), psi.getDefaultValueText(), parentStub);
+    return new PyTupleParameterStubImpl(psi.getDefaultValueText(), parentStub);
   }
 
   @Override
   @NotNull
   public PyTupleParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
-    final boolean hasDefaultValue = dataStream.readBoolean();
     final StringRef defaultValueText = dataStream.readName();
-    return new PyTupleParameterStubImpl(hasDefaultValue, defaultValueText == null ? null : defaultValueText.getString(), parentStub);
+    return new PyTupleParameterStubImpl(defaultValueText == null ? null : defaultValueText.getString(), parentStub);
   }
 
   @Override
   public void serialize(@NotNull PyTupleParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException {
-    dataStream.writeBoolean(stub.hasDefaultValue());
     dataStream.writeName(stub.getDefaultValueText());
   }
 }
diff --git a/python/src/com/jetbrains/python/psi/impl/stubs/PyTupleParameterStubImpl.java b/python/src/com/jetbrains/python/psi/impl/stubs/PyTupleParameterStubImpl.java
index dcadf204881f..719061bbe994 100644
--- a/python/src/com/jetbrains/python/psi/impl/stubs/PyTupleParameterStubImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/stubs/PyTupleParameterStubImpl.java
@@ -28,21 +28,14 @@ import org.jetbrains.annotations.Nullable;
  * Date: Jul 6, 2009 1:33:08 AM
  */
 public class PyTupleParameterStubImpl extends StubBase<PyTupleParameter>  implements PyTupleParameterStub {
-  private final boolean myHasDefaultValue;
   @Nullable
   private final String myDefaultValueText;
 
-  protected PyTupleParameterStubImpl(boolean hasDefaultValue, @Nullable String defaultValueText, StubElement parent) {
+  protected PyTupleParameterStubImpl(@Nullable String defaultValueText, StubElement parent) {
     super(parent, PyElementTypes.TUPLE_PARAMETER);
-    myHasDefaultValue = hasDefaultValue;
     myDefaultValueText = defaultValueText;
   }
 
-  @Override
-  public boolean hasDefaultValue() {
-    return myHasDefaultValue;
-  }
-
   @Nullable
   @Override
   public String getDefaultValueText() {