diff --git a/java/java-psi-api/src/com/intellij/patterns/PsiMemberPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiMemberPattern.java index d6501d79bf9f..d5497f0ff9c4 100644 --- a/java/java-psi-api/src/com/intellij/patterns/PsiMemberPattern.java +++ b/java/java-psi-api/src/com/intellij/patterns/PsiMemberPattern.java @@ -35,10 +35,12 @@ public class PsiMemberPattern("inClass", pattern) { @Override diff --git a/platform/core-api/src/com/intellij/patterns/StandardPatterns.java b/platform/core-api/src/com/intellij/patterns/StandardPatterns.java index 24e0cf1fcfc4..0a1d7ebb4246 100644 --- a/platform/core-api/src/com/intellij/patterns/StandardPatterns.java +++ b/platform/core-api/src/com/intellij/patterns/StandardPatterns.java @@ -36,18 +36,22 @@ public class StandardPatterns { private static final FalsePattern FALSE_PATTERN = new FalsePattern(); + @NotNull public static StringPattern string() { return StringPattern.STRING_PATTERN; } - + + @NotNull public static CharPattern character() { return new CharPattern(); } + @NotNull public static ObjectPattern.Capture instanceOf(Class aClass) { return new ObjectPattern.Capture(aClass); } + @NotNull public static ElementPattern instanceOf(@NotNull Class... classes) { ElementPattern[] patterns = ContainerUtil.map(classes, new Function, ElementPattern>() { @Override @@ -58,6 +62,7 @@ public class StandardPatterns { return or(patterns); } + @NotNull public static ElementPattern save(final Key key) { return new ObjectPattern.Capture(new InitialPatternCondition(Object.class) { @Override @@ -73,19 +78,22 @@ public class StandardPatterns { }); } + @NotNull public static ObjectPattern.Capture object() { return instanceOf(Object.class); } + @NotNull public static ObjectPattern.Capture object(@NotNull T value) { return instanceOf((Class)value.getClass()).equalTo(value); } - @SuppressWarnings({"UnusedDeclaration"}) + @NotNull public static CollectionPattern collection(Class aClass) { return new CollectionPattern(); } + @NotNull public static ElementPattern get(@NotNull @NonNls final String key) { return new ObjectPattern.Capture(new InitialPatternCondition(Object.class) { @Override @@ -100,10 +108,12 @@ public class StandardPatterns { }); } + @NotNull public static CollectionPattern collection() { return new CollectionPattern(); } + @NotNull public static ElementPattern or(@NotNull final ElementPattern... patterns) { return new ObjectPattern.Capture(new InitialPatternConditionPlus(Object.class) { @Override @@ -133,6 +143,7 @@ public class StandardPatterns { }); } + @NotNull public static ElementPattern and(final ElementPattern... patterns) { final List initial = ContainerUtil.newSmartList(); for (ElementPattern pattern : patterns) { @@ -172,6 +183,7 @@ public class StandardPatterns { }); } + @NotNull public static ObjectPattern.Capture not(final ElementPattern pattern) { return new ObjectPattern.Capture(new InitialPatternConditionPlus(Object.class) { @Override @@ -192,6 +204,7 @@ public class StandardPatterns { }); } + @NotNull public static ObjectPattern.Capture optional(final ElementPattern pattern) { return new ObjectPattern.Capture(new InitialPatternCondition(Object.class) { @Override @@ -203,6 +216,7 @@ public class StandardPatterns { } + @NotNull public static ElementPattern alwaysFalse() { return FALSE_PATTERN; }