From 9f7aec2cfd8996780ee455b56571ec5b84996ffc Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 1 May 2018 13:12:08 +0200 Subject: [PATCH] SSR: isIdentifier() parameter is nullable --- .../intellij/structuralsearch/JavaStructuralSearchProfile.java | 2 +- .../com/intellij/structuralsearch/StructuralSearchProfile.java | 2 +- .../intellij/structuralsearch/XmlStructuralSearchProfile.java | 2 +- .../structuralsearch/GroovyStructuralSearchProfile.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java index e25de3bc9e94..cb4271ce398a 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java @@ -761,7 +761,7 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile { } @Override - public boolean isIdentifier(PsiElement element) { + public boolean isIdentifier(@Nullable PsiElement element) { return element instanceof PsiIdentifier; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java index 90d4f5fdf49f..bf3411243de9 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java @@ -263,7 +263,7 @@ public abstract class StructuralSearchProfile { } @Contract("null -> false") - public boolean isIdentifier(PsiElement element) { + public boolean isIdentifier(@Nullable PsiElement element) { return false; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java b/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java index e85c4b0b1d5a..8c5e6106474b 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java @@ -47,7 +47,7 @@ public class XmlStructuralSearchProfile extends StructuralSearchProfile { } @Override - public boolean isIdentifier(PsiElement element) { + public boolean isIdentifier(@Nullable PsiElement element) { return element instanceof XmlToken && ((XmlToken)element).getTokenType() == XmlTokenType.XML_NAME; } diff --git a/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/GroovyStructuralSearchProfile.java b/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/GroovyStructuralSearchProfile.java index 341cbe9a7227..b75b3205b23f 100644 --- a/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/GroovyStructuralSearchProfile.java +++ b/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/GroovyStructuralSearchProfile.java @@ -68,7 +68,7 @@ public class GroovyStructuralSearchProfile extends StructuralSearchProfileBase { } @Override - public boolean isIdentifier(PsiElement element) { + public boolean isIdentifier(@Nullable PsiElement element) { return element instanceof PsiIdentifier; } }