tweak so it compiles under latest intellij

indegro · May 11, 2017 · 56ef5d4 · 56ef5d4
1 parent 2d588d9
commit 56ef5d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/intellij-plugin-v4.iml b/intellij-plugin-v4.iml
@@ -19,7 +19,7 @@
       <sourceFolder url="file://$MODULE_DIR$/resources/templates" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.idea" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-172.SNAPSHOT" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library>

diff --git a/src/java/org/antlr/intellij/plugin/psi/MyPsiUtils.java b/src/java/org/antlr/intellij/plugin/psi/MyPsiUtils.java
@@ -67,13 +67,16 @@ public Iterator<PsiElement> iterator() {
         };
     }
 
-    static Predicate<PsiElement> includeElementTypes(final TokenSet tokenSet){
-        return new Predicate<PsiElement>() {
-
-            @Override
-            public boolean apply(@Nullable PsiElement input) {
-                if(input==null) return false;
-                ASTNode node = input.getNode();
+	static Predicate<PsiElement> includeElementTypes(final TokenSet tokenSet){
+		return new Predicate<PsiElement>() {
+			@Override
+			public boolean test(@javax.annotation.Nullable PsiElement input) {
+				return this.apply(input);
+			}
+			@Override
+			public boolean apply(@Nullable PsiElement input) {
+				if(input==null) return false;
+				ASTNode node = input.getNode();
                 if(node==null)return false;
                 return tokenSet.contains(node.getElementType());
             }