GitOrigin-RevId: 2d261a0ef6cfc3be90dd955dc75046d29d66e6ee
This commit is contained in:
Alexey Kudravtsev
2022-12-02 15:19:49 +01:00
committed by intellij-monorepo-bot
parent 793fab22f4
commit 4433ce807b
5 changed files with 12 additions and 10 deletions

View File

@@ -15,7 +15,7 @@ import java.util.Set;
public class LightModifierList extends LightElement implements PsiModifierList {
private final Set<String> myModifiers;
public LightModifierList(PsiModifierListOwner modifierListOwner) {
public LightModifierList(@NotNull PsiModifierListOwner modifierListOwner) {
this(modifierListOwner.getManager());
copyModifiers(modifierListOwner.getModifierList());
}
@@ -26,10 +26,10 @@ public class LightModifierList extends LightElement implements PsiModifierList {
public LightModifierList(PsiManager manager, Language language, String... modifiers) {
super(manager, language);
myModifiers = ContainerUtil.set(modifiers);
myModifiers = ContainerUtil.newHashSet(modifiers);
}
public void addModifier(String modifier) {
public void addModifier(@NotNull String modifier) {
myModifiers.add(modifier);
}

View File

@@ -70,15 +70,17 @@ public class LightVariableBuilder<T extends LightVariableBuilder<?>> extends Lig
return myModifierList;
}
@SuppressWarnings("unchecked")
public T setModifiers(String... modifiers) {
@NotNull
public T setModifiers(@NotNull String @NotNull ... modifiers) {
myModifierList = new LightModifierList(getManager(), getLanguage(), modifiers);
//noinspection unchecked
return (T)this;
}
@SuppressWarnings("unchecked")
@NotNull
public T setModifierList(LightModifierList modifierList) {
myModifierList = modifierList;
//noinspection unchecked
return (T)this;
}

View File

@@ -162,7 +162,7 @@ public class GrLightParameter extends LightVariableBuilder<GrLightParameter> imp
}
@Override
public GrLightParameter setModifiers(@GrModifierConstant String... modifiers) {
public @NotNull GrLightParameter setModifiers(@GrModifierConstant @NotNull String @NotNull ... modifiers) {
GrLightModifierList modifiersList = new GrLightModifierList(getContext());
modifiersList.setModifiers(modifiers);
myModifierList = modifiersList;

View File

@@ -37,14 +37,14 @@ public class LombokLightFieldBuilder extends LightFieldBuilder implements Synthe
}
@Override
public LombokLightFieldBuilder setModifiers(String... modifiers) {
public @NotNull LombokLightFieldBuilder setModifiers(@NotNull String @NotNull ... modifiers) {
myModifierList.clearModifiers();
Stream.of(modifiers).forEach(myModifierList::addModifier);
return this;
}
@Override
public LombokLightFieldBuilder setModifierList(LightModifierList modifierList) {
public @NotNull LombokLightFieldBuilder setModifierList(LightModifierList modifierList) {
setModifiers(modifierList.getModifiers());
return this;
}

View File

@@ -57,7 +57,7 @@ public class LombokLightParameter extends LightParameter implements SyntheticEle
}
@Override
public LombokLightParameter setModifiers(String... modifiers) {
public @NotNull LombokLightParameter setModifiers(@NotNull String @NotNull ... modifiers) {
final LombokLightModifierList lombokLightModifierList = getModifierList();
lombokLightModifierList.clearModifiers();
Stream.of(modifiers).forEach(lombokLightModifierList::addModifier);