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

annotate dispatch method entry point with @Generated #3080

Merged
merged 4 commits into from
Aug 4, 2024
Merged

annotate dispatch method entry point with @Generated #3080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45425ff
annotate dispatch method entry point with @Generated
LorenzoBettini Jun 7, 2024
d0f3cf6
@Generated -> @XbaseGenerated
LorenzoBettini Jun 25, 2024
d802287
new option: useXbaseGenerated = true
LorenzoBettini Jun 26, 2024
f4f782b
fixed Javadoc
LorenzoBettini Aug 4, 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
3 changes: 3 additions & 0 deletions org.eclipse.xtend.core.tests/batch-compiler-data/xtendClass/XtendA.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@

class XtendA {
val public String foo = ""

def dispatch m(String s) {}
def dispatch m(int i) {}
}
2 changes: 2 additions & 0 deletions ...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class CompilerBug423631Test extends AbstractXtendCompilerTest {
}
''', '''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class C {
Expand All @@ -41,6 +42,7 @@ class CompilerBug423631Test extends AbstractXtendCompilerTest {
return null;
}

@XbaseGenerated
public Object m(final A a) {
if (a instanceof B) {
return _m((B)a);
Expand Down
2 changes: 2 additions & 0 deletions ...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,7 @@ class CompilerBug427637Test extends AbstractXtendCompilerTest {
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;
import org.eclipse.xtext.xbase.lib.util.ToStringHelper;

@SuppressWarnings("all")
Expand Down Expand Up @@ -1589,6 +1590,7 @@ class CompilerBug427637Test extends AbstractXtendCompilerTest {
return _function;
}

@XbaseGenerated
protected Function1<? super FormattableDocument, ? extends Iterable<FormattingData>> newFormattingData(final HiddenLeafs leafs, final PreferenceKey key, final FormattingDataFactory.FormattingDataInit it) {
if (key instanceof BlankLineKey) {
return _newFormattingData(leafs, (BlankLineKey)key, it);
Expand Down
2 changes: 2 additions & 0 deletions ...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class CompilerBug441096Test extends AbstractXtendCompilerTest {
import org.eclipse.xtend.lib.annotations.AccessorType;
import org.eclipse.xtend.lib.annotations.Accessors;
import org.eclipse.xtext.xbase.lib.Pure;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class C {
Expand All @@ -65,6 +66,7 @@ class CompilerBug441096Test extends AbstractXtendCompilerTest {
}
};

@XbaseGenerated
public void m(final Object expr, final Object seq) {
if (expr == null
&& seq instanceof StringBuilder) {
Expand Down
2 changes: 2 additions & 0 deletions ...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class CompilerBug441099Test extends AbstractXtendCompilerTest {
import org.eclipse.xtend.lib.annotations.AccessorType;
import org.eclipse.xtend.lib.annotations.Accessors;
import org.eclipse.xtext.xbase.lib.Pure;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class C {
Expand All @@ -51,6 +52,7 @@ class CompilerBug441099Test extends AbstractXtendCompilerTest {
return new D("");
}

@XbaseGenerated
public Object m(final String x) {
return _m(x);
}
Expand Down
8 changes: 8 additions & 0 deletions ...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest {
import java.util.List;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class SOE {
Expand All @@ -58,6 +59,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest {
return CollectionLiterals.<SOE.A>emptyList();
}

@XbaseGenerated
public List<SOE.A> getList(final Object it) {
if (it instanceof SOE.A) {
return _getList((SOE.A)it);
Expand Down Expand Up @@ -93,6 +95,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest {
import java.util.List;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class C {
Expand All @@ -111,6 +114,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest {
return CollectionLiterals.<C>emptyList();
}

@XbaseGenerated
public List<C> getList(final Object it) {
if (it instanceof C) {
return _getList((C)it);
Expand Down Expand Up @@ -148,6 +152,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest {
import java.util.List;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class SOE {
Expand All @@ -169,6 +174,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest {
return IterableExtensions.<SOE.A>toList(new SOE.CustomItr());
}

@XbaseGenerated
public List<SOE.A> getList(final Object it) {
if (it instanceof SOE.A) {
return _getList((SOE.A)it);
Expand Down Expand Up @@ -205,6 +211,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest {
import java.util.List;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class SOE {
Expand All @@ -226,6 +233,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest {
return CollectionLiterals.<SOE.A>emptyList();
}

@XbaseGenerated
public List<SOE.A> getList(final Object it) {
if (it instanceof SOE.A) {
return _getList((SOE.A)it);
Expand Down
4 changes: 4 additions & 0 deletions ...tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class CompilerBugDispatchWithOverrideTest extends AbstractXtendCompilerTest {
''',
'''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class Something extends AbstractSomething {
Expand All @@ -42,6 +43,7 @@ class CompilerBugDispatchWithOverrideTest extends AbstractXtendCompilerTest {
}

@Override
@XbaseGenerated
public void m(final Object x) {
if (x instanceof Integer) {
_m((Integer)x);
Expand Down Expand Up @@ -73,6 +75,7 @@ class CompilerBugDispatchWithOverrideTest extends AbstractXtendCompilerTest {
''',
'''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class Something extends AbstractSomething {
Expand All @@ -81,6 +84,7 @@ class CompilerBugDispatchWithOverrideTest extends AbstractXtendCompilerTest {
}

@Override
@XbaseGenerated
public void m(final Object x) {
if (x instanceof Integer) {
_m((Integer)x);
Expand Down
6 changes: 6 additions & 0 deletions ...re.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest {
}
''', '''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class D extends C {
Expand All @@ -41,6 +42,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest {
protected void _m(final CharSequence o) {
}

@XbaseGenerated
public void m(final Object o) {
if (o instanceof Integer) {
_m((Integer)o);
Expand Down Expand Up @@ -93,6 +95,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest {
}
''', '''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class Parent<T extends Object> {
Expand All @@ -104,6 +107,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest {
return this.test(a.getDann());
}

@XbaseGenerated
public T test(final Ausdruck a) {
if (a instanceof Fallunterscheidung) {
return _test((Fallunterscheidung)a);
Expand Down Expand Up @@ -145,13 +149,15 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest {
}
''', '''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class Child extends Parent<String> {
protected String _test(final StringAusdruck a) {
return null;
}

@XbaseGenerated
public String test(final Ausdruck a) {
if (a instanceof Fallunterscheidung) {
return _test((Fallunterscheidung)a);
Expand Down
6 changes: 6 additions & 0 deletions ...clipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@ class CompilerTraceTest extends AbstractXtendTestCase {
}
'''.tracesTo('''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class Zonk {
Expand All @@ -689,6 +690,7 @@ class CompilerTraceTest extends AbstractXtendTestCase {
protected void _method(final Integer i) {
}

@XbaseGenerated
public void method(final Object i) {
if (i instanceof Integer) {
_method((Integer)i);
Expand All @@ -714,6 +716,7 @@ class CompilerTraceTest extends AbstractXtendTestCase {
}
'''.tracesTo('''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class Zonk {
Expand All @@ -723,6 +726,7 @@ class CompilerTraceTest extends AbstractXtendTestCase {
protected void _method(final Integer i) {
}

@XbaseGenerated
public void #method#(final Object i) {
if (i instanceof Integer) {
_method((Integer)i);
Expand All @@ -748,6 +752,7 @@ class CompilerTraceTest extends AbstractXtendTestCase {
}
'''.tracesTo('''
import java.util.Arrays;
import org.eclipse.xtext.xbase.lib.XbaseGenerated;

@SuppressWarnings("all")
public class Zonk {
Expand All @@ -757,6 +762,7 @@ class CompilerTraceTest extends AbstractXtendTestCase {
protected void _method(final Integer i) {
}

@XbaseGenerated
public void method(final Object i) {
if (i instanceof Integer) {
_method((Integer)i);
Expand Down
Loading
Loading