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

Regenerated Xtend files #3022

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Regenerated Xtend files #3022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
341050e
regenerated Xtend file
LorenzoBettini Apr 29, 2024
bc51517
other regenerated files
LorenzoBettini Apr 29, 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
6 changes: 3 additions & 3 deletions .../xtend-gen/org/eclipse/xtend/core/tests/macro/InsertParameterMiniHelperAnnoProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
package org.eclipse.xtend.core.tests.macro;

import com.google.common.base.Objects;
import java.util.Objects;
import org.eclipse.xtend.lib.macro.AbstractClassProcessor;
import org.eclipse.xtend.lib.macro.TransformationContext;
import org.eclipse.xtend.lib.macro.declaration.AnnotationReference;
Expand All @@ -24,7 +24,7 @@ public class InsertParameterMiniHelperAnnoProcessor extends AbstractClassProcess
@Override
public void doTransform(final MutableClassDeclaration clazz, @Extension final TransformationContext context) {
final Function1<AnnotationReference, Boolean> _function = (AnnotationReference a) -> {
return Boolean.valueOf((Objects.equal(a.getAnnotationTypeDeclaration().getSimpleName(), InsertParameterMiniHelperAnno.class.getSimpleName()) && (a.getClassValue("classRef") != null)));
return Boolean.valueOf((Objects.equals(a.getAnnotationTypeDeclaration().getSimpleName(), InsertParameterMiniHelperAnno.class.getSimpleName()) && (a.getClassValue("classRef") != null)));
};
AnnotationReference _findFirst = IterableExtensions.findFirst(clazz.getAnnotations(), _function);
TypeReference _classValue = null;
Expand All @@ -35,7 +35,7 @@ public void doTransform(final MutableClassDeclaration clazz, @Extension final Tr
final Function1<AnnotationReference, Boolean> _function_1 = (AnnotationReference a) -> {
String _simpleName = a.getAnnotationTypeDeclaration().getSimpleName();
String _simpleName_1 = InsertParameterMiniHelperAnno.class.getSimpleName();
return Boolean.valueOf(Objects.equal(_simpleName, _simpleName_1));
return Boolean.valueOf(Objects.equals(_simpleName, _simpleName_1));
};
final int position = IterableExtensions.findFirst(clazz.getAnnotations(), _function_1).getIntValue("position");
Iterable<? extends MutableMethodDeclaration> _declaredMethods = clazz.getDeclaredMethods();
Expand Down
20 changes: 10 additions & 10 deletions org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/TransformationContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public List<? extends Problem> getProblems(final Element element) {
return this.getProblemSupport().getProblems(element);
}

public void validateLater(final Procedure0 validationCallback) {
this.getProblemSupport().validateLater(validationCallback);
public void validateLater(final Procedure0 arg0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmm why does this now toggle back to arg0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By the way, when working on another branch where I'm not yet rebased on master, where #2784 had already been merged, I don't see such changes related to parameter's names; that's why I assume they are due to #2784

Note that in this case, not all parameters are affected.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wired. Let’s recheck after the milestone. I just saw changes the other way round

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’ve this problem since a while

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@szarnekow even before #2784 and when automatic build in Eclipse?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the past we checked in the eclipse built variant and not the maven one but the maven one had the arg0s

@cdietrich that's the eclipse built variant, that's why it's strange. Maybe it's better to revert those two files?

Moreover, only a few parameters miss the proper name.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes even in the same file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems to affect nested interfaces. maybe something broke in jdt.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@szarnekow which class is used to produce the ParameterDeclarations in this case?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was hoping to fix it with #2995

But I only have time to continue that work on Saturday or Sunday this week.

this.getProblemSupport().validateLater(arg0);
}

public MutableAnnotationTypeDeclaration findAnnotationType(final String qualifiedName) {
Expand Down Expand Up @@ -226,32 +226,32 @@ public AnnotationReference newAnnotationReference(final AnnotationReference anno
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationReference);
}

public AnnotationReference newAnnotationReference(final AnnotationReference annotationReference, final Procedure1<AnnotationReferenceBuildContext> initializer) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationReference, initializer);
public AnnotationReference newAnnotationReference(final AnnotationReference arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
}

public AnnotationReference newAnnotationReference(final Class<?> annotationClass) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationClass);
}

public AnnotationReference newAnnotationReference(final Class<?> annotationClass, final Procedure1<AnnotationReferenceBuildContext> initializer) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationClass, initializer);
public AnnotationReference newAnnotationReference(final Class<?> arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
}

public AnnotationReference newAnnotationReference(final String annotationTypeName) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeName);
}

public AnnotationReference newAnnotationReference(final String annotationTypeName, final Procedure1<AnnotationReferenceBuildContext> initializer) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeName, initializer);
public AnnotationReference newAnnotationReference(final String arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
}

public AnnotationReference newAnnotationReference(final Type annotationTypeDelcaration) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeDelcaration);
}

public AnnotationReference newAnnotationReference(final Type annotationTypeDelcaration, final Procedure1<AnnotationReferenceBuildContext> initializer) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeDelcaration, initializer);
public AnnotationReference newAnnotationReference(final Type arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
}

public boolean exists(final Path path) {
Expand Down
20 changes: 10 additions & 10 deletions org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ValidationContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ public List<? extends Problem> getProblems(final Element element) {
return this.getProblemSupport().getProblems(element);
}

public void validateLater(final Procedure0 validationCallback) {
this.getProblemSupport().validateLater(validationCallback);
public void validateLater(final Procedure0 arg0) {
this.getProblemSupport().validateLater(arg0);
}

public MutableAnnotationTypeDeclaration findAnnotationType(final String qualifiedName) {
Expand Down Expand Up @@ -219,32 +219,32 @@ public AnnotationReference newAnnotationReference(final AnnotationReference anno
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationReference);
}

public AnnotationReference newAnnotationReference(final AnnotationReference annotationReference, final Procedure1<AnnotationReferenceBuildContext> initializer) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationReference, initializer);
public AnnotationReference newAnnotationReference(final AnnotationReference arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
}

public AnnotationReference newAnnotationReference(final Class<?> annotationClass) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationClass);
}

public AnnotationReference newAnnotationReference(final Class<?> annotationClass, final Procedure1<AnnotationReferenceBuildContext> initializer) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationClass, initializer);
public AnnotationReference newAnnotationReference(final Class<?> arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
}

public AnnotationReference newAnnotationReference(final String annotationTypeName) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeName);
}

public AnnotationReference newAnnotationReference(final String annotationTypeName, final Procedure1<AnnotationReferenceBuildContext> initializer) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeName, initializer);
public AnnotationReference newAnnotationReference(final String arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
}

public AnnotationReference newAnnotationReference(final Type annotationTypeDelcaration) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeDelcaration);
}

public AnnotationReference newAnnotationReference(final Type annotationTypeDelcaration, final Procedure1<AnnotationReferenceBuildContext> initializer) {
return this.getAnnotationReferenceProvider().newAnnotationReference(annotationTypeDelcaration, initializer);
public AnnotationReference newAnnotationReference(final Type arg0, final Procedure1<AnnotationReferenceBuildContext> arg1) {
return this.getAnnotationReferenceProvider().newAnnotationReference(arg0, arg1);
}

public boolean exists(final Path path) {
Expand Down
Loading