From aaf1bf953a54f1f2b5068f2cf2060b8f99b09e2c Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Sat, 31 Jan 2015 16:39:39 +0300 Subject: [PATCH] extract method: check @Nullable availability in the extracted method scope (e.g. attached to another module only) --- .../refactoring/extractMethod/ExtractMethodProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java index 66cab46b1bd4..15ff329d955c 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java @@ -637,7 +637,7 @@ public class ExtractMethodProcessor implements MatchProvider { prepareMethodBody(emptyMethod, false); final NullableNotNullManager manager = NullableNotNullManager.getInstance(myProject); final PsiClass nullableAnnotationClass = JavaPsiFacade.getInstance(myProject) - .findClass(manager.getDefaultNullable(), GlobalSearchScope.allScope(myProject)); + .findClass(manager.getDefaultNullable(), myElements[0].getResolveScope()); if (nullableAnnotationClass != null) { if (myNotNullConditionalCheck || myNullConditionalCheck) { return Nullness.NULLABLE;