From 1470fb105654c21160d6ceb4c82b1505c71d5e15 Mon Sep 17 00:00:00 2001 From: Michail Plushnikov Date: Wed, 13 Dec 2023 19:34:05 +0100 Subject: [PATCH] [lombok] EA-977599 EA-932894 EA-927010 EA-921512 prevent NPE GitOrigin-RevId: 3a08499a7f5a6c06a2ab6753bed08b3a87cd177a --- .../intellij/plugin/processor/handler/BuilderHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java index 01eb70f42c57..401a85347c3e 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java @@ -391,10 +391,10 @@ public class BuilderHandler { } @NotNull - static String getBuilderClassName(@NotNull PsiClass psiClass, String returnTypeName) { + static String getBuilderClassName(@NotNull PsiClass psiClass, @Nullable String returnTypeName) { final ConfigDiscovery configDiscovery = ConfigDiscovery.getInstance(); final String builderClassNamePattern = configDiscovery.getStringLombokConfigProperty(BUILDER_CLASS_NAME, psiClass); - return replace(builderClassNamePattern, "*", capitalize(returnTypeName)); + return replace(builderClassNamePattern, "*", capitalize(StringUtil.notNullize(returnTypeName))); } boolean hasMethod(@NotNull PsiClass psiClass, @NotNull String builderMethodName) {