From 30a6888e51207eaa25602851766d17ed91e33a61 Mon Sep 17 00:00:00 2001
From: Travis Cripps <travis@trav.is>
Date: Tue, 15 Jul 2014 01:27:40 -0700
Subject: [PATCH] Issue #51: plugin crash with java.lang.NoSuchMethodError

- Fix an incompatibility with version 13.x due to an API method removal.
- Due to the API change, the minimum supported version is now IDEA 13.
---
 .idea/ant.xml                                       |  6 +-----
 .idea/compiler.xml                                  |  6 +++++-
 .idea/copyright/profiles_settings.xml               |  4 +---
 .idea/misc.xml                                      | 13 +++++++++----
 .idea/runConfigurations/idea_plugin_protobuf.xml    |  2 +-
 .idea/scopes/scope_settings.xml                     |  5 +++++
 META-INF/plugin.xml                                 |  8 +++++++-
 ReleaseNotes.txt                                    |  8 ++++++++
 src/protobuf/lang/psi/impl/reference/PbRefImpl.java |  3 ++-
 9 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 .idea/scopes/scope_settings.xml

diff --git a/.idea/ant.xml b/.idea/ant.xml
index 2581ca3..f6e673a 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -1,7 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
-  </component>
-</project>
+<project version="4" />
 
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 97c9ca5..ff2e67d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,7 +18,11 @@
       <entry name="?*.tld" />
       <entry name="?*.ftl" />
     </wildcardResourcePatterns>
-    <annotationProcessing enabled="false" useClasspath="true" />
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
   </component>
 </project>
 
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index 3572571..e7bedf3 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,5 +1,3 @@
 <component name="CopyrightManager">
-  <settings default="">
-    <module2copyright />
-  </settings>
+  <settings default="" />
 </component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7e7cc20..66deecf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -252,9 +252,6 @@
       </regional-settings>
     </general-settings>
   </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
@@ -263,6 +260,14 @@
       <facet-type id="Scala" />
     </autodetection-disabled>
   </component>
+  <component name="IvyIDEA.ProjectSettings">
+    <option name="artifactTypeSettings">
+      <ArtifactTypeSettings />
+    </option>
+    <option name="propertiesSettings">
+      <PropertiesSettings />
+    </option>
+  </component>
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" />
     <option name="OPTION_SCOPE" value="protected" />
@@ -286,7 +291,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA sdk" project-jdk-type="IDEA JDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA 13 SDK" project-jdk-type="IDEA JDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">
diff --git a/.idea/runConfigurations/idea_plugin_protobuf.xml b/.idea/runConfigurations/idea_plugin_protobuf.xml
index ec45564..7fe9883 100644
--- a/.idea/runConfigurations/idea_plugin_protobuf.xml
+++ b/.idea/runConfigurations/idea_plugin_protobuf.xml
@@ -3,7 +3,7 @@
     <module name="idea-plugin-protobuf" />
     <option name="VM_PARAMETERS" value="-Xms128m -Xmx512m -XX:MaxPermSize=250m -ea" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <log_file path="$USER_HOME$/.IdeaIC10/system-103/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <log_file path="$USER_HOME$/Library/Caches/IdeaIC13/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="2033" />
       <option name="TRANSPORT" value="0" />
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000..922003b
--- /dev/null
+++ b/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index 9599f45..d995b92 100644
--- a/META-INF/plugin.xml
+++ b/META-INF/plugin.xml
@@ -12,9 +12,15 @@
         ]]>
     </description>
     <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="123"/><!-- Idea 12 -->
+    <idea-version since-build="133"/><!-- Idea 13 -->
     <change-notes>
         <![CDATA[
+        <p>0.5.7</p>
+        <ul>
+            <li>Fix an incompatibility with version 13.x due to an API method removal.</li>
+            <li>Fix an occasional error generating a safe package name for validating build item validity state.</li>
+            <li>Due to the API change, the minimum supported version is now IDEA 13.</li>
+        </ul>
         <p>0.5.6</p>
         <ul>
             <li>No longer re-compiles proto files that are up to date when using the external compiler.</li>
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 00c6cc0..97adf07 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,11 @@
+==== 0.5.7
+* Fix an incompatibility with version 13.x due to an API method removal.
+* Due to the API change, the minimum supported version is now IDEA 13.
+* Fix an occasional error generating a safe package name for validating build item validity state.
+
+==== 0.5.6
+* Fixes a bug in detecting the state of the generated files. The bug meant that Java files would be generated even when there was no change to the .proto files. This should speed up compilation of projects significantly.
+
 ==== 0.5.5
 * Changes to support IDEA 13.  The minimum version changed to IDEA 12.
 * Minor bug fix for collapse all in the structure view for .proto files.
diff --git a/src/protobuf/lang/psi/impl/reference/PbRefImpl.java b/src/protobuf/lang/psi/impl/reference/PbRefImpl.java
index ea42d89..0c935d6 100644
--- a/src/protobuf/lang/psi/impl/reference/PbRefImpl.java
+++ b/src/protobuf/lang/psi/impl/reference/PbRefImpl.java
@@ -369,7 +369,8 @@ public CompletionKind getCompletionKind() {
 
     public static class ExperimentalResolver implements ResolveCache.Resolver {
 
-        public PsiElement resolve(PsiReference refElement, boolean incompleteCode) {
+        @Override
+        public PsiElement resolve(@NotNull PsiReference refElement, boolean incompleteCode) {
             final PbRefImpl ref = (PbRefImpl) refElement;
             final ReferenceKind refKind = ref.getRefKind();
             final PbRef qualifier = ref.getQualifierRef();