diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md index 94751e75a..6b09f4585 100644 --- a/THIRD_PARTY_LICENSES.md +++ b/THIRD_PARTY_LICENSES.md @@ -2,8 +2,9 @@ ## Project Lombok -`plugins/lombok/lombok-1.18.48-openidea.1.jar` contains Project Lombok v1.18.48 with the Equinox -classloader fix from [projectlombok/lombok#4059](https://github.com/projectlombok/lombok/pull/4059). +`plugins/lombok/lombok-1.18.48-openidea.2.jar` contains Project Lombok v1.18.48 with the Equinox +classloader fix from [projectlombok/lombok#4059](https://github.com/projectlombok/lombok/pull/4059) +and the ECJ constructor-call fix from [projectlombok/lombok#4089](https://github.com/projectlombok/lombok/pull/4089). Copyright (C) 2009-2021 The Project Lombok Authors. MIT license and bundled component notices are retained in [plugins/lombok/LICENSE](plugins/lombok/LICENSE) and inside the jar. Source tag, patch commits and build instructions: [plugins/lombok/README.md](plugins/lombok/README.md). diff --git a/crates/ide-sdk/src/java.rs b/crates/ide-sdk/src/java.rs index 623a8705c..a2f60063d 100644 --- a/crates/ide-sdk/src/java.rs +++ b/crates/ide-sdk/src/java.rs @@ -884,7 +884,7 @@ mod tests { configure_jdtls(&mut plain, Path::new("/p"), Path::new("/data"), &[], None, None, JDTLS_MIN_JAVA, &[], None); let data = |c: &LanguageServerConfig| c.args[c.args.iter().position(|a| a == "-data").unwrap() + 1].clone(); assert_ne!(data(&cfg), data(&plain), "a separate workspace, so everything is rebuilt with the agent"); - let patched = Path::new("/managed/lombok-1.18.48-openidea.1.jar"); + let patched = Path::new("/managed/lombok-1.18.48-openidea.2.jar"); let mut fixed = jdtls(); configure_jdtls( &mut fixed, diff --git a/crates/ide-sdk/src/lombok.rs b/crates/ide-sdk/src/lombok.rs index 67c383385..8b292d482 100644 --- a/crates/ide-sdk/src/lombok.rs +++ b/crates/ide-sdk/src/lombok.rs @@ -507,7 +507,7 @@ mod tests { let cache = repo.join("org/projectlombok/lombok/1.18.48"); fs::create_dir_all(&cache).unwrap(); fs::write(cache.join("lombok-1.18.48.jar"), b"official agent").unwrap(); - let patched = PathBuf::from("/managed/lombok-1.18.48-openidea.1.jar"); + let patched = PathBuf::from("/managed/lombok-1.18.48-openidea.2.jar"); let selected = lombok_agent(tmp.path(), None, Some(patched.clone()), Some(repo.clone())); assert_eq!(selected.jar(), Some(patched.as_path())); assert_eq!(selected.problem(), None); diff --git a/crates/ide-tools/src/registry.rs b/crates/ide-tools/src/registry.rs index 6602f8094..116dbfc88 100644 --- a/crates/ide-tools/src/registry.rs +++ b/crates/ide-tools/src/registry.rs @@ -637,13 +637,15 @@ pub static TOOLS: &[ToolSpec] = &[ display: "Lombok (jdtls agent)", kind: Plugin, commands: &["lombok.jar"], - // Equinox removed getModuleClassLoader(boolean), breaking lombok.config lookup. - // Return to Maven Central once an official release includes lombok#4059. + // Equinox removed getModuleClassLoader(boolean), breaking lombok.config lookup (lombok#4059); + // ECJ 3.46.200 keeps the constructor call in a constructor's statements, which + // @SneakyThrows / @NonNull must not wrap or precede (lombok#4089). + // Return to Maven Central once an official release includes both. // Source commit, build instructions and checksum: plugins/lombok/README.md. method: Method::Bundled { - filename: "lombok-1.18.48-openidea.1.jar", - version: "1.18.48-openidea.1", - bytes: include_bytes!("../../../plugins/lombok/lombok-1.18.48-openidea.1.jar"), + filename: "lombok-1.18.48-openidea.2.jar", + version: "1.18.48-openidea.2", + bytes: include_bytes!("../../../plugins/lombok/lombok-1.18.48-openidea.2.jar"), }, fallback: None, version: V, diff --git a/crates/ide-tools/src/tests.rs b/crates/ide-tools/src/tests.rs index 7b15ba32c..96617bf26 100644 --- a/crates/ide-tools/src/tests.rs +++ b/crates/ide-tools/src/tests.rs @@ -56,9 +56,9 @@ fn bundled_lombok_replaces_legacy_installs_on_every_platform_without_downloads() let info = tools.info("lombok", &[]).unwrap(); let path = managed_bundle(env.root.parent().unwrap(), "lombok").unwrap(); assert_eq!(info.status, ToolStatus::Installed); - assert_eq!(info.version.as_deref(), Some("1.18.48-openidea.1")); + assert_eq!(info.version.as_deref(), Some("1.18.48-openidea.2")); assert_eq!(info.path, Some(path.clone().into())); - assert_eq!(path.file_name().unwrap(), "lombok-1.18.48-openidea.1.jar"); + assert_eq!(path.file_name().unwrap(), "lombok-1.18.48-openidea.2.jar"); assert!(!info.can_install && !info.can_uninstall); assert_eq!(tools.unavailable_reason(registry::find("lombok").unwrap()), None); assert_eq!(fs::read(&legacy).unwrap(), b"old official agent", "other windows may still use it"); diff --git a/plugins/lombok/README.md b/plugins/lombok/README.md index 701198345..33b513f56 100644 --- a/plugins/lombok/README.md +++ b/plugins/lombok/README.md @@ -1,8 +1,15 @@ # Lombok agent for JDT LS -`lombok-1.18.48-openidea.1.jar` is the app-provided Java agent for JDT LS. It includes -[projectlombok/lombok#4059](https://github.com/projectlombok/lombok/pull/4059), which restores -`lombok.config` lookup after Equinox removed `getModuleClassLoader(boolean)`. +`lombok-1.18.48-openidea.2.jar` is the app-provided Java agent for JDT LS. It includes: + +- [projectlombok/lombok#4059](https://github.com/projectlombok/lombok/pull/4059), which restores + `lombok.config` lookup after Equinox removed `getModuleClassLoader(boolean)`. +- [projectlombok/lombok#4089](https://github.com/projectlombok/lombok/pull/4089) (fixes + lombok#4084 / #4094). ECJ 3.46.200, bundled with JDT LS 1.63, keeps a constructor's explicit or + implicit `super()` / `this()` call as the first element of its statements. Lombok 1.18.48 wrapped + that call in the `@SneakyThrows` try block (ECJ then fails with "Internal Error compiling … + BlockScope cannot be cast to MethodScope" and the whole workspace build fails) and put `@NonNull` + checks before it; constructors Lombok generates lacked the statement. The jar is embedded by `ide-tools`, so every platform receives the same bytes without a download. Both Java server startup and launch diagnostics obtain it through `managed_bundle`. Tool detection @@ -12,21 +19,27 @@ The filename includes the patch version because JDT LS workspace keys include th changing agents must rebuild classes produced by the old agent. Old jars remain for running windows. Replace this temporary bundle with an official Maven Central release once that release includes -#4059. Restore the registry's Maven Central install method and remove the embedded jar. Keep the +#4059 and #4089. Restore the registry's Maven Central install method and remove the embedded jar. Keep the workspace migration test when changing its path. ## Provenance and build - Repository: https://github.com/projectlombok/lombok - Base tag: `v1.18.48` (`b48657c83ce44d027984f539bd36048293ce5e8e`). -- Cherry-picked commits from PR #4059, in order: - - `2d535482a913de46c27d06c5b0b294918ede3f9c` - - `3098f4dd78b5349c2f382e7310e64db810dd380b` -- Upstream version: `1.18.48`; `openidea.1` identifies this distribution of the patched agent. +- Cherry-picked commits, in order: + - PR #4059 (`chagong/lombok` `fix-equinox-bundle-wiring`): + - `2d535482a913de46c27d06c5b0b294918ede3f9c` + - `3098f4dd78b5349c2f382e7310e64db810dd380b` + - PR #4089 (`Rawi01/lombok` `eclipse-constructor-call-statement`): + - `7832faa49b35c839088866daf865384c82cd555f` + - `3f3a80b857a969839ab1baba12767aec4965ac32` +- Upstream version: `1.18.48`; `openidea.2` identifies this distribution of the patched agent + (`openidea.1` had #4059 only). Upstream's own `java -jar ... --version` still reports `1.18.48`. -- SHA-256: `10f5cd1a32b946d3ff1c075735b94f35fffdbac11dea2be29d24dbf591dd51a4` +- SHA-256: `2978d8b2d55dac1bb4936ba44562bc4549931d4e71a7ebfeaebccd60bcdf7379` - License: [MIT, including bundled component notices](LICENSE), also retained inside the jar. -- Build environment: macOS arm64, OpenJDK 23.0.1, Apache Ant 1.10.15, upstream Ivy setup. +- Build environment: macOS arm64, Temurin 25.0.5, Apache Ant 1.10.15, upstream Ivy setup + (`openidea.1` was built with OpenJDK 23.0.1). Build using the upstream Ant entry point described in its contributing guide: @@ -35,16 +48,22 @@ git clone https://github.com/projectlombok/lombok.git cd lombok git checkout -b openidea-1.18.48 v1.18.48 git fetch https://github.com/chagong/lombok.git fix-equinox-bundle-wiring +git fetch https://github.com/Rawi01/lombok.git eclipse-constructor-call-statement git cherry-pick 2d535482a913de46c27d06c5b0b294918ede3f9c 3098f4dd78b5349c2f382e7310e64db810dd380b +git cherry-pick 7832faa49b35c839088866daf865384c82cd555f 3f3a80b857a969839ab1baba12767aec4965ac32 ant dist -cp dist/lombok.jar /path/to/openidea/plugins/lombok/lombok-1.18.48-openidea.1.jar +cp dist/lombok.jar /path/to/openidea/plugins/lombok/lombok-1.18.48-openidea.2.jar ``` The changelog context conflicts because the first commit adds a release-note line under the older development heading and the second removes it. Resolve mechanically by adding then removing -only that line, retaining the complete v1.18.48 changelog. The final source diff from v1.18.48 changes -only `src/eclipseAgent/lombok/launch/PatchFixesHider.java`, `test/core/src/lombok/TestEclipse.java`, -and `test/core/src/lombok/launch/PatchFixesHiderTest.java`; no other Java source changes were made. +only that line, retaining the complete v1.18.48 changelog (the second commit is then empty and +skipped). The #4089 commits apply cleanly. The final source diff from v1.18.48 changes +`src/eclipseAgent/lombok/launch/PatchFixesHider.java`, `test/core/src/lombok/TestEclipse.java`, +`test/core/src/lombok/launch/PatchFixesHiderTest.java` (#4059) and the Eclipse handlers +`EclipseHandlerUtil`, `HandleConstructor`, `HandleFieldNameConstants`, `HandleNonNull`, +`HandleSneakyThrows`, `HandleStandardException`, `HandleSuperBuilder`, `HandleUtilityClass` (#4089); +no other Java source changes were made. In the build checkout, the two remote resolvers in `buildScripts/ivysettings.xml` were reordered to try Maven Central before Eclipse staging; the local resolver and all dependency coordinates were retained. The JVM was configured to use the @@ -66,6 +85,19 @@ On macOS arm64 with JDT LS 1.63.0 / Equinox 3.25.0, server OpenJDK 25 and projec identical `javap` output, including default `void` setters. - Upstream `PatchFixesHiderTest` passed both the standard OSGi and legacy Equinox lookup tests. +`openidea.2` (#4089) on macOS arm64, JDT LS 1.63.0-202610191322 (ECJ +`compiler.batch_3.46.200.v20261008-1115`), server Temurin 25: + +- ECJ batch with the agent, compliance 17 and 25, against ECJ 3.46.200 and 3.46.100: `@SneakyThrows` + constructors with implicit `super()`, explicit `super()` and `this()`; `@NonNull` constructor + parameters; `@RequiredArgsConstructor` with an initialized final field, `@AllArgsConstructor`, + `@NoArgsConstructor`, `@Builder` record, `@Value @Builder`, `@UtilityClass`. `openidea.1` failed + with "Internal Error compiling" on 3.46.200; `openidea.2` compiled on both ECJ versions, the + programs ran with identical output, and `@NonNull` checks run after the constructor call again. +- Real JDT LS `java/buildWorkspace(true)` of the same sources with the agent: `openidea.1` reported + Failed with three internal errors and wrote no classes; `openidea.2` Succeeded with all classes. +- `plugins/java-usages/tests/verify.py` and `read-write.py` passed with `openidea.2`. + Windows and Linux runtime validation has not been performed. Rust tests cover source selection for both supported architectures on all three OS variants, offline provisioning, corruption repair, concurrent windows, explicit user overrides, and JDT LS workspace migration. diff --git a/plugins/lombok/SHA256SUMS b/plugins/lombok/SHA256SUMS index 67cbcd675..462614044 100644 --- a/plugins/lombok/SHA256SUMS +++ b/plugins/lombok/SHA256SUMS @@ -1 +1 @@ -10f5cd1a32b946d3ff1c075735b94f35fffdbac11dea2be29d24dbf591dd51a4 lombok-1.18.48-openidea.1.jar +2978d8b2d55dac1bb4936ba44562bc4549931d4e71a7ebfeaebccd60bcdf7379 lombok-1.18.48-openidea.2.jar diff --git a/plugins/lombok/lombok-1.18.48-openidea.1.jar b/plugins/lombok/lombok-1.18.48-openidea.2.jar similarity index 88% rename from plugins/lombok/lombok-1.18.48-openidea.1.jar rename to plugins/lombok/lombok-1.18.48-openidea.2.jar index d8a4dce2f..b4e1036c9 100644 Binary files a/plugins/lombok/lombok-1.18.48-openidea.1.jar and b/plugins/lombok/lombok-1.18.48-openidea.2.jar differ