From 54d80ac4ea6dbadf489f569b9734580f71396c6f Mon Sep 17 00:00:00 2001
From: fedor <fedor@cirruslabs.org>
Date: Wed, 7 Apr 2021 13:19:19 -0400
Subject: [PATCH] IntelliJ 2021.1 Support

---
 gradle.properties                             |   4 +-
 .../lang/psi/ThriftPrefixReference.java       |   6 -
 .../thrift/lang/psi/ThriftTypeReference.java  |   6 -
 thrift/src/main/resources/META-INF/plugin.xml | 109 +-----------------
 4 files changed, 4 insertions(+), 121 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5e9a9e03..7bf5effa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-ideaVersion = 2020.3.1
+ideaVersion = 2021.1
 sources = true
 isEAP = false
 
@@ -6,4 +6,4 @@ org.gradle.daemon=true
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
-org.gradle.jvmargs=-Dfile.encoding=UTF-8
\ No newline at end of file
+org.gradle.jvmargs=-Dfile.encoding=UTF-8
diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/lang/psi/ThriftPrefixReference.java b/thrift/src/main/java/com/intellij/plugins/thrift/lang/psi/ThriftPrefixReference.java
index b8a5e92f..1e1aeaf1 100644
--- a/thrift/src/main/java/com/intellij/plugins/thrift/lang/psi/ThriftPrefixReference.java
+++ b/thrift/src/main/java/com/intellij/plugins/thrift/lang/psi/ThriftPrefixReference.java
@@ -35,12 +35,6 @@ public Object[] getVariants() {
     return PsiElement.EMPTY_ARRAY;
   }
 
-  @NotNull
-  @Override
-  public Collection<? extends SymbolResolveResult> resolveReference() {
-    return super.resolveReference();
-  }
-
   @Override
   public PsiElement handleElementRename(@NotNull String newElementName) throws IncorrectOperationException {
     ThriftCustomType element = this.getElement();
diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/lang/psi/ThriftTypeReference.java b/thrift/src/main/java/com/intellij/plugins/thrift/lang/psi/ThriftTypeReference.java
index 54876d87..0a7c2e02 100644
--- a/thrift/src/main/java/com/intellij/plugins/thrift/lang/psi/ThriftTypeReference.java
+++ b/thrift/src/main/java/com/intellij/plugins/thrift/lang/psi/ThriftTypeReference.java
@@ -89,12 +89,6 @@ private <T> T processComponentAndFile(@NotNull Function<Pair<String, PsiFile>, T
     }
   }
 
-  @NotNull
-  @Override
-  public Collection<? extends SymbolResolveResult> resolveReference() {
-    return super.resolveReference();
-  }
-
   @Override
   public PsiElement handleElementRename(@NotNull String newElementName) throws IncorrectOperationException {
     ThriftCustomType element = this.getElement();
diff --git a/thrift/src/main/resources/META-INF/plugin.xml b/thrift/src/main/resources/META-INF/plugin.xml
index 75321565..25f3f035 100644
--- a/thrift/src/main/resources/META-INF/plugin.xml
+++ b/thrift/src/main/resources/META-INF/plugin.xml
@@ -4,113 +4,8 @@
   <description>Support for Thrift language</description>
   <change-notes>
     <![CDATA[
-      <p>1.4:</p>
-      <ul>
-        <li>Compatibility with IntelliJ 2020.3</li>
-      </ul>
-      <p>1.2:</p>
-      <ul>
-        <li>Compatibility with IntelliJ 2020.2</li>
-      </ul>
-      <p>1.1:</p>
-      <ul>
-        <li>Compatibility with IntelliJ 2020.1</li>
-      </ul>
-      <p>1.0:</p>
-      <ul>
-        <li>Compatibility with IntelliJ 2019.3</li>
-        <li>Building with Gradle</li>
-      </ul>
-      <p>0.10.0:</p>
-      <ul>
-        <li>Compatibility with IntelliJ 2019.2</li>
-      </ul>
-      <p>0.9.9:</p>
-      <ul>
-        <li>Compatibility with IntelliJ 2018.1</li>
-      </ul>
-      <p>0.9.8:</p>
-      <ul>
-        <li>Proper handling of relative imports</li>
-        <li>Bug fixes</li>
-      </ul>
-      <p>0.9.7:</p>
-      <ul>
-        <li>Erlang support</li>
-        <li>Bug fixes</li>
-        <li>Support all IntelliJ-based IDEs</li>
-      </ul>
-      <p>0.9.6:</p>
-      <ul>
-        <li>Support for generated_annotations=undated</li>
-        <li>Java 6 bytecode level</li>
-      </ul>
-      <p>0.9.5:</p>
-      <ul>
-        <li>Add Thrift v0.9.2 compiler options</li>
-        <li>ID duplication inspection</li>
-      </ul>
-      <p>0.9.4:</p>
-      <ul>
-        <li>Always absolute from source roots paths in includes</li>
-      </ul>
-      <p>0.9.3:</p>
-      <ul>
-        <li>Bug fixed and performance improvements</li>
-      </ul>
-      <p>0.9.2:</p>
-      <ul>
-        <li>Store relative to module folder paths for output folder</li>
-        <li>Fixed resolving for source roots with packages prefixes</li>
-      </ul>
-      <p>0.9.1:</p>
-      <ul>
-        <li>Compile thrift files within Idea</li>
-      </ul>
-      <p>0.9:</p>
-      <ul>
-        <li>Type Annotations</li>
-        <li>Bug fixes</li>
-      </ul>
-      <p>0.7:</p>
-      <ul>
-        <li>Improved include resolver</li>
-        <li>Unresolved include inspection</li>
-      </ul>
-      <p>0.6:</p>
-      <ul>
-        <li>Bug fixes</li>
-      </ul>
-      <p>0.5:</p>
-      <ul>
-        <li>Rename Refactoring fixes</li>
-      </ul>
-      <p>0.4:</p>
-      <ul>
-        <li>Bug fixes</li>
-      </ul>
-      <p>0.3:</p>
-      <ul>
-        <li>Find usages</li>
-        <li>Structure View</li>
-        <li>Fields and Functions in Go to by Symbol Name</li>
-      </ul>
-      <p>0.2:</p>
-      <ul>
-        <li>References</li>
-        <li>Go to implementation</li>
-        <li>Icons</li>
-      </ul>
-      <p>0.1:</p>
-      <ul>
-        <li>Syntax error highlighting via parser</li>
-        <li>Simple code highlighting</li>
-        <li>Completion</li>
-        <li>Commenter</li>
-        <li>Brace matching</li>
-        <li>Quote handler</li>
-      </ul>
-      ]]>
+      IntelliJ 2021.1 Support
+    ]]>
   </change-notes>
   <vendor>@fedor</vendor>
   <idea-version since-build="203.*"/><!-- Will be patched by the plugin -->