diff --git a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ObjectsRequireNonNullPostfixTemplate.java b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ObjectsRequireNonNullPostfixTemplate.java index 3ed97481e67b..69ea3dd64b43 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ObjectsRequireNonNullPostfixTemplate.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ObjectsRequireNonNullPostfixTemplate.java @@ -14,7 +14,7 @@ public class ObjectsRequireNonNullPostfixTemplate extends JavaEditablePostfixTem "java.util.Objects.requireNonNull($EXPR$)", "Objects.requireNonNull(expr)", Collections.singleton(new JavaPostfixTemplateExpressionCondition.JavaPostfixTemplateNotPrimitiveTypeExpressionCondition()), - LanguageLevel.JDK_1_7, true, provider); + LanguageLevel.JDK_1_7, false, provider); } @Override diff --git a/java/java-tests/testData/codeInsight/template/postfix/templates/reqnonnull/assignment.java b/java/java-tests/testData/codeInsight/template/postfix/templates/reqnonnull/assignment.java new file mode 100644 index 000000000000..ca821df6847a --- /dev/null +++ b/java/java-tests/testData/codeInsight/template/postfix/templates/reqnonnull/assignment.java @@ -0,0 +1,6 @@ +class Foo { + void m(String s) { + Object obj; + obj = s.reqnonnull + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/template/postfix/templates/reqnonnull/assignment_after.java b/java/java-tests/testData/codeInsight/template/postfix/templates/reqnonnull/assignment_after.java new file mode 100644 index 000000000000..2f05a363b6fd --- /dev/null +++ b/java/java-tests/testData/codeInsight/template/postfix/templates/reqnonnull/assignment_after.java @@ -0,0 +1,6 @@ +class Foo { + void m(String s) { + Object obj; + obj = java.util.Objects.requireNonNull(s) + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/ObjectsRequireNonNullPostfixTemplateTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/ObjectsRequireNonNullPostfixTemplateTest.java index a7caa6cf6ceb..3df7abbc9136 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/ObjectsRequireNonNullPostfixTemplateTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/ObjectsRequireNonNullPostfixTemplateTest.java @@ -38,6 +38,10 @@ public class ObjectsRequireNonNullPostfixTemplateTest extends PostfixTemplateTes doTest(); } + public void testAssignment() { + doTest(); + } + @NotNull @Override protected String getSuffix() {