MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

copy also nullable annotations when create constructor parameter from field (IDEA-164493)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-11-25 12:48:57 +01:00
parent df3abfd8c3
commit 57bd0325ef
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,7 +43,6 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.changeSignature.ParameterInfoImpl;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
@@ -334,7 +333,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
if (parameter == null) {
continue;
}
NullableNotNullManager.getInstance(field.getProject()).copyNotNullAnnotation(field, parameter);
NullableNotNullManager.getInstance(field.getProject()).copyNullableOrNotNullAnnotation(field, parameter);
cleanupElements.add(manager.createSmartPsiElementPointer(parameter));
final PsiElement assignmentStatement = AssignFieldFromParameterAction.addFieldAssignmentStatement(project, field, parameter, editor);
if (assignmentStatement != null) {

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterNullableAnnotated.java Normal file
View File

@@ -0,0 +1,10 @@
// "Add constructor parameter" "true"
import org.jetbrains.annotations.*;
class A {
@Nullable private final Object field;
A(@Nullable Object field, String... strs) {
this.field = field;
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/beforeNullableAnnotated.java Normal file
View File

@@ -0,0 +1,9 @@
// "Add constructor parameter" "true"
import org.jetbrains.annotations.*;
class A {
@Nullable private final Object <caret>field;
A(String... strs) {
}
}