Reverted serialization of runtime types for self variables

(cherry picked from commit 7c685b5)
Camelcade · Aug 11, 2019 · bc576e5 · bc576e5
1 parent a518454
commit bc576e5
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 26 deletions.
diff --git a/.../core/src/com/perl5/lang/perl/idea/codeInsight/typeInference/value/PerlValuesManager.java b/.../core/src/com/perl5/lang/perl/idea/codeInsight/typeInference/value/PerlValuesManager.java
@@ -110,7 +110,7 @@ public final class PerlValuesManager {
   static final int SMART_GETTER_ID = id++;
 
   // MUST stay here. Automatically changes on new element creation
-  public static final int VERSION = id + 4;
+  public static final int VERSION = id + 5;
 
   private static final WeakInterner<PerlValue> INTERNER = new WeakInterner<>();
 

diff --git a/plugin/core/src/com/perl5/lang/perl/psi/utils/PerlResolveUtil.java b/plugin/core/src/com/perl5/lang/perl/psi/utils/PerlResolveUtil.java
@@ -42,7 +42,6 @@
 import com.perl5.lang.perl.psi.impl.PerlImplicitVariableDeclaration;
 import com.perl5.lang.perl.psi.properties.PerlLexicalScope;
 import com.perl5.lang.perl.psi.references.scopes.PerlVariableDeclarationSearcher;
-import com.perl5.lang.perl.util.PerlPackageUtil;
 import com.perl5.lang.perl.util.PerlUtil;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -326,9 +325,6 @@ private static PerlValue getValueFromControlFlow(@NotNull PsiElement element,
       if( !declaredValue.isUnknown()){
         valueBuilder.addVariant(declaredValue);
       }
-      if (lexicalDeclaration.isInvocantDeclaration() || lexicalDeclaration.isSelf()) {
-        valueBuilder.addVariant(PerlPackageUtil.getExpectedSelfValue(lexicalDeclaration));
-      }
     }
     return valueBuilder.build();
   }

diff --git a/plugin/testData/unit/perl/perlValues/argumentSelf.pl.txt b/plugin/testData/unit/perl/perlValues/argumentSelf.pl.txt
@@ -6,8 +6,7 @@ sub something{
 ----------
 $self
 PsiPerlScalarVariableImpl(Perl5: SCALAR_VARIABLE) at 38 in argumentSelf.pl
-OneOf[ArrayItem: SUB_ARGUMENTS[0],
-main]
+ArrayItem: SUB_ARGUMENTS[0]
 ----------
 Resolved
 ----------

diff --git a/plugin/testData/unit/perl/perlValues/issue2092First.pl.txt b/plugin/testData/unit/perl/perlValues/issue2092First.pl.txt
@@ -19,8 +19,7 @@ sub useClass{
 $var
 PsiPerlScalarVariableImpl(Perl5: SCALAR_VARIABLE) at 159 in issue2092First.pl
 scalar OneOf[ArrayItem: SUB_ARGUMENTS[1],
-Some::Class,
-main]->something()
+Some::Class]->something()
 ----------
 Resolved
 ----------

diff --git a/plugin/testData/unit/perl/perlValues/methodImplicitInvocant.pl.txt b/plugin/testData/unit/perl/perlValues/methodImplicitInvocant.pl.txt
@@ -4,8 +4,7 @@ method something($first){
 ----------
 $self
 PsiPerlScalarVariableImpl(Perl5: SCALAR_VARIABLE) at 28 in methodImplicitInvocant.pl
-OneOf[ArrayItem: SUB_ARGUMENTS[0],
-main]
+ArrayItem: SUB_ARGUMENTS[0]
 ----------
 Resolved
 ----------

diff --git a/plugin/testData/unit/perl/perlValues/mojo/app.pl.txt b/plugin/testData/unit/perl/perlValues/mojo/app.pl.txt
@@ -10,11 +10,7 @@ scalar main::app()
 ----------
 Resolved
 ----------
-OneOf[Mojolicious,
-Ref[Hash(), blessed with Mojo::Base],
-Ref[Hash(), blessed with main],
-Ref[Hash(Value unknown), blessed with Mojo::Base],
+OneOf[Ref[Hash(), blessed with main],
 Ref[Hash(Value unknown), blessed with main],
-Ref[Hash(moniker => dummy), blessed with Mojo::Base],
 Ref[Hash(moniker => dummy), blessed with main],
 main]
diff --git a/plugin/testData/unit/perl/perlValues/mojo/new.pl.txt b/plugin/testData/unit/perl/perlValues/mojo/new.pl.txt
@@ -10,11 +10,7 @@ scalar main::new()
 ----------
 Resolved
 ----------
-OneOf[Mojolicious,
-Ref[Hash(), blessed with Mojo::Base],
-Ref[Hash(), blessed with main],
-Ref[Hash(Value unknown), blessed with Mojo::Base],
+OneOf[Ref[Hash(), blessed with main],
 Ref[Hash(Value unknown), blessed with main],
-Ref[Hash(moniker => dummy), blessed with Mojo::Base],
 Ref[Hash(moniker => dummy), blessed with main],
 main]
diff --git a/plugin/testData/unit/perl/perlValues/superCall.pl.txt b/plugin/testData/unit/perl/perlValues/superCall.pl.txt
@@ -25,5 +25,4 @@ scalar Child->new(foo, 42)
 Resolved
 ----------
 OneOf[Child,
-Ref[Hash(foo => 42), blessed with Child],
-Ref[Hash(foo => 42), blessed with Parent]]
+Ref[Hash(foo => 42), blessed with Child]]
diff --git a/plugin/testData/unit/perl/returnValues/argumentSelf.pl.txt b/plugin/testData/unit/perl/returnValues/argumentSelf.pl.txt
@@ -4,4 +4,4 @@
   $self;
 }
 ----------
-OneOf: [ArrayItem: SUB_ARGUMENTS[0], main]
+ArrayItem: SUB_ARGUMENTS[0]
diff --git a/plugin/testData/unit/perl/returnValues/methodExplicitInvocant.pl.txt b/plugin/testData/unit/perl/returnValues/methodExplicitInvocant.pl.txt
@@ -2,4 +2,4 @@
   $cb
 }
 ----------
-OneOf: [ArrayItem: SUB_ARGUMENTS[0], main]
+ArrayItem: SUB_ARGUMENTS[0]
diff --git a/plugin/testData/unit/perl/returnValues/methodImplicitInvocant.pl.txt b/plugin/testData/unit/perl/returnValues/methodImplicitInvocant.pl.txt
@@ -2,4 +2,4 @@
   $self
 }
 ----------
-OneOf: [ArrayItem: SUB_ARGUMENTS[0], main]
+ArrayItem: SUB_ARGUMENTS[0]
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ @@
       $self;
     }
     ----------
-    OneOf: [ArrayItem: SUB_ARGUMENTS[0], main]
+    ArrayItem: SUB_ARGUMENTS[0]