Skip to content

feature(api): Skip style builder creation on merge #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kezz merged 2 commits into from
Apr 24, 2025
Merged

feature(api): Skip style builder creation on merge #1219

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc91d3c
feature(api): Skip style builder creation on merge
kezz Apr 22, 2025
de82a85
take into account merges
kezz Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,9 @@ private void prepareChildren() {
@Override
@SuppressWarnings("unchecked")
public @NotNull B mergeStyle(final @NotNull Component that, final @NotNull Set<Style.Merge> merges) {
this.styleBuilder().merge(requireNonNull(that, "component").style(), merges);
final Style thatStyle = requireNonNull(that, "that").style();
if (thatStyle.isEmpty() && merges.isEmpty()) return (B) this;
this.styleBuilder().merge(thatStyle, merges);
return (B) this;
}

Expand All @@ -313,6 +315,7 @@ private void prepareChildren() {
return this.styleBuilder;
}

@SuppressWarnings("BooleanMethodIsAlwaysInverted")
protected final boolean hasStyle() {
return this.styleBuilder != null || this.style != null;
}
Expand Down