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

Dom with javac may13 #393

Merged

robstryker merged 16 commits into eclipse-jdtls:dom-with-javac from robstryker:dom-with-javac-may13

May 21, 2024

robstryker commented May 16, 2024

No description provided.

github-actions bot assigned robstryker

mickaelistria requested changes

View reviewed changes

mickaelistria left a comment

@datho7561 introduced canonicalized that seems to fix some issues as some tests (and probably some "functional" code does use identity comparison for bindings). Please use it whenever constructing a new binding.

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacModuleBinding.java

+              		RequiresDirective[] arr = this.moduleSymbol.getDirectives().stream().filter((x) -> x.getKind() == DirectiveKind.REQUIRES).map((x) -> (RequiresDirective)x).toArray(RequiresDirective[]::new);
+              		IModuleBinding[] arr2 = new IModuleBinding[arr.length];
+              		for( int i = 0; i < arr.length; i++ ) {
+              			arr2[i] = new JavacModuleBinding((ModuleType)arr[i].module.type, this.resolver);

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacModuleBinding.java

+              	public String[] getExportedTo(IPackageBinding packageBinding) {
+              		ExportsDirective[] arr = this.moduleSymbol.getDirectives().stream().filter((x) -> x.getKind() == DirectiveKind.EXPORTS).map((x) -> (ExportsDirective)x).toArray(ExportsDirective[]::new);
+              		for( int i = 0; i < arr.length; i++ ) {
+              			JavacPackageBinding tmp = new JavacPackageBinding((PackageSymbol)arr[i].packge, this.resolver);

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacModuleBinding.java

+              		OpensDirective[] arr = this.moduleSymbol.getDirectives().stream().filter((x) -> x.getKind() == DirectiveKind.OPENS).map((x) -> (OpensDirective)x).toArray(OpensDirective[]::new);
+              		IPackageBinding[] arr2 = new IPackageBinding[arr.length];
+              		for( int i = 0; i < arr.length; i++ ) {
+              			arr2[i] = new JavacPackageBinding((PackageSymbol)arr[i].packge, this.resolver);

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacModuleBinding.java

+              		UsesDirective[] arr = this.moduleSymbol.getDirectives().stream().filter((x) -> x.getKind() == DirectiveKind.USES).map((x) -> (UsesDirective)x).toArray(UsesDirective[]::new);
+              		ITypeBinding[] arr2 = new ITypeBinding[arr.length];
+              		for( int i = 0; i < arr.length; i++ ) {
+              			arr2[i] = new JavacTypeBinding(arr[i].getService().type, this.resolver);

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacModuleBinding.java

+              		ProvidesDirective[] arr = this.moduleSymbol.getDirectives().stream().filter((x) -> x.getKind() == DirectiveKind.PROVIDES).map((x) -> (ProvidesDirective)x).toArray(ProvidesDirective[]::new);
+              		ITypeBinding[] arr2 = new ITypeBinding[arr.length];
+              		for( int i = 0; i < arr.length; i++ ) {
+              			arr2[i] = new JavacTypeBinding(arr[i].getService().type, this.resolver);

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacModuleBinding.java

+              			JavacTypeBinding tmp = new JavacTypeBinding(arr[i].getService().type, this.resolver);
+              			if(service.getKey().equals(tmp.getKey())) {
+              				// we have our match
+              				JavacTypeBinding[] ret = arr[i].getImplementations().stream().map(x -> new JavacTypeBinding((ClassType)x.type, this.resolver)).toArray(JavacTypeBinding[]::new);

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacPackageBinding.java

               		} catch (JavaModelException e) {
               			// TODO Auto-generated catch block
               			e.printStackTrace();
               			return null;
               		}
               	}
+              	public IModuleBinding getModule() {
+              		return new JavacModuleBinding(this.packageSymbol.modle, this.resolver);

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java

+              		List<Type> z2 = ((ClassType)this.type).interfaces_field;
+              		ArrayList<JavacTypeBinding> l = new ArrayList<>();
+              		if( z1 != null ) {
+              			l.add(new JavacTypeBinding(z1, this.resolver));

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java

+              		}
+              		if( z2 != null ) {
+              			for( int i = 0; i < z2.size(); i++ ) {
+              				l.add(this.resolver.canonicalize(new JavacTypeBinding(z2.get(i), this.resolver)));

mickaelistria May 17, 2024

this should be canonicalize(new ...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java

+              	public IModuleBinding getModule() {
+              		Symbol o = this.type.tsym.owner;
+              		if( o instanceof PackageSymbol ps) {
+              			return new JavacModuleBinding(ps.modle, this.resolver);

mickaelistria May 17, 2024

this should be canonicalize(new ...)

mickaelistria requested changes

View reviewed changes

mickaelistria left a comment

Some missing canonicalize.
But everything else seems good.

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacModuleBinding.java

               	@Override
               	public IAnnotationBinding[] getAnnotations() {
               		// TODO - don't see any way to get this?
-              		return null; //new IAnnotationBinding[0];
+              		List<Attribute.Compound> list = moduleSymbol.getRawAttributes();
+              		return list.stream().map((x) -> new JavacAnnotationBinding(x, this.resolver, this)).toArray(JavacAnnotationBinding[]::new);

mickaelistria May 21, 2024

this needs also .map(resolver::canonicalize)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacBindingResolver.java

+              		resolve();
+              		JCTree javacNode = this.converter.domToJavac.get(typeParameter);
+              		if (javacNode instanceof JCTypeParameter jcClassDecl) {
+              			return new JavacTypeBinding(jcClassDecl.type, this);

mickaelistria May 21, 2024

This should call resolver.canonicalize(...)

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacModuleBinding.java

+              		ExportsDirective[] arr = this.moduleSymbol.getDirectives().stream().filter((x) -> x.getKind() == DirectiveKind.EXPORTS).map((x) -> (ExportsDirective)x).toArray(ExportsDirective[]::new);
+              		IPackageBinding[] arr2 = new IPackageBinding[arr.length];
+              		for( int i = 0; i < arr.length; i++ ) {
+              			arr2[i] = new JavacPackageBinding((PackageSymbol)arr[i].packge, this.resolver);

mickaelistria May 21, 2024

this should be canonicalize(new ...)

mickaelistria force-pushed the dom-with-javac branch from af54a63 to 76187e1 Compare

May 21, 2024 12:57

Rob Stryker added 14 commits

May 21, 2024 10:50


          Endless loop - nextToken() is identical for ever and ever

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix for test0126 - String[] v[] not represented correctly when part o…

e580ff0

…f for-loop

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix for test0126 - String v[] not represented correctly when part of …

f675e30

…assignment

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix for test0314 - String v[] has off-by-one error

d6e29b4

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Partial Fix for test0321 - new Object[][] has off-by-one error in dim…

1dee26e

…ensions

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Partially fix testBug531714_015 - switch(i) { case 1 -> list } needs …

9b8f79a

…yield statement Part 1 and 2

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix testBug519493_002 - TypeParameter needs a type binding

873f76d

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Add support for Module Binding

7c3aaeb

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix testTypeBindingMethods - type binding parameters are wrong

44948d5

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix testBug526534_0001 - class cast exception

ba89f6b

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix testBug519493_006 - module binding

3de5301

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix testBug519493_005 - type binding needs access to module

36362de

Signed-off-by: Rob Stryker <stryker@redhat.com>


          More work on JavacModuleBinding regarding key and annotations

87ebef5

Signed-off-by: Rob Stryker <stryker@redhat.com>


          partial fix to testBug497719_0001 - modifiers missing on try with res…

1c38bcc

…ources

Signed-off-by: Rob Stryker <stryker@redhat.com>

robstryker force-pushed the dom-with-javac-may13 branch from c2ea72d to 1c38bcc Compare

May 21, 2024 14:51

Rob Stryker added 2 commits

May 21, 2024 12:01


          Fix ASTConverter15JLS4Test.test0140 dom portion

a50470b

Signed-off-by: Rob Stryker <stryker@redhat.com>


          Fix ASTConverter15JLS4Test.test0140 binding portion

4c51c95

Signed-off-by: Rob Stryker <stryker@redhat.com>

Author

robstryker commented May 21, 2024

Merging without canocolization... we will revisit that. It's a good point but i've had some issues and am hesitant to add that part at this moment.

robstryker merged commit 2e2d4d4 into eclipse-jdtls:dom-with-javac

2 of 4 checks passed

mickaelistria commented May 21, 2024

We will revisit it as part of #395

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet