MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[lombok] removed unused public getter

Browse Source 
GitOrigin-RevId: a398803379013156fbae475f7a15c324925f0f14
This commit is contained in:
Michail Plushnikov
2022-11-27 20:59:25 +01:00
committed by intellij-monorepo-bot
parent 3d4748480a
commit 0c3eafdee8
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/field/AbstractFieldProcessor.java
View File

@@ -104,8 +104,7 @@ public abstract class AbstractFieldProcessor extends AbstractProcessor implement
@NotNull ProblemSink problemSink,
@NotNull String parameterName) {
if(problemSink.deepValidation()) {
final @NotNull List<PsiAnnotation> copyableAnnotations =
LombokCopyableAnnotations.collectCopyableAnnotations(psiField, LombokCopyableAnnotations.BASE_COPYABLE);
final @NotNull List<PsiAnnotation> copyableAnnotations = LombokCopyableAnnotations.BASE_COPYABLE.collectCopyableAnnotations(psiField);
if (!copyableAnnotations.isEmpty()) {
final Iterable<String> onXAnnotations = LombokProcessorUtil.getOnX(psiAnnotation, parameterName);

12
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/thirdparty/LombokCopyableAnnotations.java vendored
View File

@@ -29,10 +29,6 @@ public enum LombokCopyableAnnotations {
}
}
public Map<String, Set<String>> getShortNames() {
return shortNames;
}
public static void copyOnXAnnotations(@Nullable PsiAnnotation processedAnnotation,
@NotNull PsiModifierList modifierList,
@NotNull String onXParameterName) {
@@ -44,8 +40,7 @@ public enum LombokCopyableAnnotations {
annotationsToAdd.forEach(modifierList::addAnnotation);
}
public static @NotNull <T extends PsiModifierListOwner & PsiMember> List<PsiAnnotation> collectCopyableAnnotations(@NotNull T psiFromElement,
@NotNull LombokCopyableAnnotations copyableAnnotations) {
public @NotNull <T extends PsiModifierListOwner & PsiMember> List<PsiAnnotation> collectCopyableAnnotations(@NotNull T psiFromElement) {
final PsiAnnotation[] fieldAnnotations = psiFromElement.getAnnotations();
if (0 == fieldAnnotations.length) {
// nothing to copy if no annotations defined
@@ -55,7 +50,6 @@ public enum LombokCopyableAnnotations {
final Set<String> annotationNames = new HashSet<>();
final Collection<String> existedShortAnnotationNames = ContainerUtil.map2Set(fieldAnnotations, PsiAnnotationSearchUtil::getShortNameOf);
final Map<String, Set<String>> shortNames = copyableAnnotations.getShortNames();
for (String shortName : existedShortAnnotationNames) {
Set<String> fqns = shortNames.get(shortName);
if (fqns != null) {
@@ -65,7 +59,7 @@ public enum LombokCopyableAnnotations {
final PsiClass containingClass = psiFromElement.getContainingClass();
// append only for BASE_COPYABLE
if (BASE_COPYABLE.equals(copyableAnnotations) && null != containingClass) {
if (BASE_COPYABLE.equals(this) && null != containingClass) {
Collection<String> configuredCopyableAnnotations =
ConfigDiscovery.getInstance().getMultipleValueLombokConfigProperty(ConfigKey.COPYABLE_ANNOTATIONS, containingClass);
@@ -92,7 +86,7 @@ public enum LombokCopyableAnnotations {
public static <T extends PsiModifierListOwner & PsiMember> void copyCopyableAnnotations(@NotNull T fromPsiElement,
@NotNull LombokLightModifierList toModifierList,
@NotNull LombokCopyableAnnotations copyableAnnotations) {
List<PsiAnnotation> annotationsToAdd = collectCopyableAnnotations(fromPsiElement, copyableAnnotations);
List<PsiAnnotation> annotationsToAdd = copyableAnnotations.collectCopyableAnnotations(fromPsiElement);
annotationsToAdd.forEach(toModifierList::withAnnotation);
}
}