Skip to content
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

Jump to bottom

Fix Semi-colon on inline methods after property declaration disappears #585

Merged
merged 2 commits into from
Jan 9, 2024
Merged

Fix Semi-colon on inline methods after property declaration disappears #585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
619372e
Fix Semi-colon on inline methods after property declaration disappears
kunli2 Jan 3, 2024
c9d5fc4
Merge branch 'main' into 560
kunli2 Jan 3, 2024
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
Next Next commit
Fix Semi-colon on inline methods after property declaration disappears
  • Loading branch information
@kunli2
kunli2 committed Jan 3, 2024
commit 619372edfa8bb8ba18733c10dc68a76587348911
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/kotlin/KotlinVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public J visitProperty(K.Property property, P p) {
pr = (K.Property) temp;
}

pr = pr.withVariableDeclarations(visitAndCast(pr.getVariableDeclarations(), p));
pr = pr.getPadding().withVariableDeclarations(visitRightPadded(pr.getPadding().getVariableDeclarations(), p));
pr = pr.getPadding().withReceiver(visitRightPadded(pr.getPadding().getReceiver(), p));
pr = pr.withAccessors(visitContainer(pr.getAccessors(), p));
return pr;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/openrewrite/kotlin/format/SpacesVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,13 @@ public K.Property visitProperty(K.Property property, P p) {
if (prop.getPadding().getReceiver() != null) {
prop = prop.getPadding().withReceiver(prop.getPadding().getReceiver().withAfter(updateSpace(prop.getPadding().getReceiver().getAfter(), false)));
}

if (prop.getVariableDeclarations() != null && !prop.getVariableDeclarations().getVariables().isEmpty()) {
prop = prop.withVariableDeclarations(
prop.getVariableDeclarations().withVariables(
ListUtils.mapFirst(prop.getVariableDeclarations().getVariables(),
v -> spaceBefore(v, false))
)
);
List<J.VariableDeclarations.NamedVariable> variables = ListUtils.mapFirst(prop.getVariableDeclarations().getVariables(),
v -> spaceBefore(v, false));
JRightPadded<J.VariableDeclarations> rp = prop.getPadding().getVariableDeclarations();
rp = rp.withElement(rp.getElement().withVariables(variables));
prop = prop.getPadding().withVariableDeclarations(rp);
}
return prop;
}
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/openrewrite/kotlin/internal/KotlinPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,11 @@ public J visitProperty(K.Property property, PrintOutputCapture<P> p) {
delegate.visitContainer("where", property.getTypeConstraints().getPadding().getConstraints(), JContainer.Location.TYPE_PARAMETERS, ",", "", p);
}

visitSpace(property.getPadding().getVariableDeclarations().getAfter(), Space.Location.VARIABLE_INITIALIZER, p);
if (property.getPadding().getVariableDeclarations().getMarkers().findFirst(Semicolon.class).isPresent()) {
p.append(";");
}

visitContainer(property.getAccessors(), p);
afterSyntax(property, p);
return property;
Expand Down
16 changes: 14 additions & 2 deletions src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2958,7 +2958,19 @@ public J visitProperty(KtProperty property, ExecutionContext data) {
if (!ktPropertyAccessors.isEmpty() || receiver != null || typeConstraints != null) {
List<JRightPadded<J.MethodDeclaration>> accessors = new ArrayList<>(ktPropertyAccessors.size());

for (KtPropertyAccessor ktPropertyAccessor : ktPropertyAccessors) {
Space beforeSemiColon = Space.EMPTY;
Markers rpMarkers = Markers.EMPTY;
for (int i = 0; i < ktPropertyAccessors.size(); i++) {
KtPropertyAccessor ktPropertyAccessor = ktPropertyAccessors.get(i);

if (i == 0) {
PsiElement maybeSemiColon = PsiTreeUtil.findSiblingBackward(ktPropertyAccessor, KtTokens.SEMICOLON, null);
if (maybeSemiColon != null) {
beforeSemiColon = prefix(maybeSemiColon);
rpMarkers = rpMarkers.addIfAbsent(new Semicolon(randomId()));
}
}

J.MethodDeclaration accessor = (J.MethodDeclaration) ktPropertyAccessor.accept(this, data);
accessors.add(maybeTrailingSemicolonInternal(accessor, ktPropertyAccessor));
}
Expand All @@ -2968,7 +2980,7 @@ public J visitProperty(KtProperty property, ExecutionContext data) {
deepPrefix(property),
markers,
typeParameters,
variableDeclarations.withPrefix(Space.EMPTY),
padRight(variableDeclarations.withPrefix(Space.EMPTY), beforeSemiColon, rpMarkers),
typeConstraints,
JContainer.build(accessors),
receiver
Expand Down
31 changes: 26 additions & 5 deletions src/main/java/org/openrewrite/kotlin/tree/K.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ public List<TypeParameter> getTypeParameters() {
return typeParameters == null ? null : typeParameters.getElements();
}

J.VariableDeclarations variableDeclarations;
JRightPadded<J.VariableDeclarations> paddedVariableDeclarations;

@Nullable
TypeConstraints typeConstraints;
Expand All @@ -1523,7 +1523,8 @@ public Property(UUID id,
Space prefix,
Markers markers,
JContainer<TypeParameter> typeParameters,
VariableDeclarations variableDeclarations,
@Nullable JRightPadded<J.VariableDeclarations> paddedVariableDeclarations,
@Nullable VariableDeclarations variableDeclarations,
@Nullable K.TypeConstraints typeConstraints,
@Nullable @JsonProperty("getter") J.MethodDeclaration getter,
@Nullable @JsonProperty("setter") J.MethodDeclaration setter,
Expand All @@ -1535,7 +1536,14 @@ public Property(UUID id,
this.prefix = prefix;
this.markers = markers;
this.typeParameters = typeParameters;
this.variableDeclarations = variableDeclarations;

if (variableDeclarations != null) {
// from old LST
this.paddedVariableDeclarations = new JRightPadded<>(variableDeclarations, Space.EMPTY, Markers.EMPTY);
} else {
this.paddedVariableDeclarations = requireNonNull(paddedVariableDeclarations);
}

this.typeConstraints = typeConstraints;

if (getter != null || setter != null || isSetterFirst != null) {
Expand All @@ -1561,6 +1569,10 @@ public Property(UUID id,
this.receiver = receiver;
}

public J.VariableDeclarations getVariableDeclarations() {
return paddedVariableDeclarations.getElement();
}

@Nullable
public Expression getReceiver() {
return receiver == null ? null : receiver.getElement();
Expand Down Expand Up @@ -1602,14 +1614,23 @@ public String toString() {
public static class Padding {
private final Property t;

public JRightPadded<J.VariableDeclarations> getVariableDeclarations() {
return t.paddedVariableDeclarations;
}

public Property withVariableDeclarations(JRightPadded<J.VariableDeclarations> variableDeclarations) {
return t.paddedVariableDeclarations == variableDeclarations ? t : new Property(t.id, t.prefix, t.markers, t.typeParameters,
variableDeclarations, t.typeConstraints, t.accessors, t.receiver);
}

@Nullable
public JContainer<TypeParameter> getTypeParameters() {
return t.typeParameters;
}

public Property withTypeParameters(@Nullable JContainer<TypeParameter> typeParameters) {
return t.typeParameters == typeParameters ? t : new Property(t.id, t.prefix, t.markers, typeParameters,
t.variableDeclarations, t.typeConstraints, t.accessors, t.receiver);
t.paddedVariableDeclarations, t.typeConstraints, t.accessors, t.receiver);
}

@Nullable
Expand All @@ -1620,7 +1641,7 @@ public JRightPadded<Expression> getReceiver() {
@Nullable
public Property withReceiver(@Nullable JRightPadded<Expression> receiver) {
return t.receiver == receiver ? t : new Property(t.id, t.prefix, t.markers, t.typeParameters,
t.variableDeclarations, t.typeConstraints, t.accessors, receiver);
t.paddedVariableDeclarations, t.typeConstraints, t.accessors, receiver);
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/org/openrewrite/kotlin/tree/VariableDeclarationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,20 @@ class Test {
);
}

@Issue("https://github.com/openrewrite/rewrite-kotlin/issues/560")
@Test
void accessorAfterTrailingSemiColon() {
rewriteRun(
kotlin(
"""
class Test {
var n: Int = 0 ; protected set
}
"""
)
);
}

@Issue("https://github.com/openrewrite/rewrite-kotlin/issues/135")
@Test
void checkNonNull() {
Expand Down
Loading