fix cross-interface symbol resolution in Java guest generator (#458)

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Author: dicej

crates/gen-guest-teavm-java/src/lib.rs

@@ -10,7 +10,8 @@ use wit_bindgen_core::{
     wit_parser::{
         abi::{AbiVariant, Bindgen, Bitcast, Instruction, LiftLower, WasmType},
         Case, Docs, Enum, Flags, FlagsRepr, Function, FunctionKind, Int, InterfaceId, Record,
-        Resolve, Result_, SizeAlign, Tuple, Type, TypeDefKind, TypeId, Union, Variant, WorldId,
+        Resolve, Result_, SizeAlign, Tuple, Type, TypeDef, TypeDefKind, TypeId, TypeOwner, Union,
+        Variant, WorldId,
     },
     Files, InterfaceGenerator as _, Ns, WorldGenerator,
 };
@@ -53,6 +54,7 @@ pub struct TeaVmJava {
     needs_result: bool,
     classes: HashMap<String, String>,
     sizes: SizeAlign,
+    interface_names: HashMap<InterfaceId, String>,
 }
 
 impl TeaVmJava {
@@ -85,6 +87,7 @@ impl WorldGenerator for TeaVmJava {
         id: InterfaceId,
         _files: &mut Files,
     ) {
+        self.interface_names.insert(id, name.to_owned());
         let mut gen = self.interface(resolve, name);
         gen.types(id);
 
@@ -119,6 +122,7 @@ impl WorldGenerator for TeaVmJava {
         id: InterfaceId,
         _files: &mut Files,
     ) {
+        self.interface_names.insert(id, name.to_owned());
         let mut gen = self.interface(resolve, name);
         gen.types(id);
 
@@ -318,10 +322,18 @@ struct InterfaceGenerator<'a> {
 }
 
 impl InterfaceGenerator<'_> {
-    fn qualifier(&self, when: bool) -> String {
+    fn qualifier(&self, when: bool, ty: &TypeDef) -> String {
+        if let TypeOwner::Interface(id) = &ty.owner {
+            if let Some(name) = self.gen.interface_names.get(id) {
+                if name != self.name {
+                    return format!("{}.", name.to_upper_camel_case());
+                }
+            }
+        }
+
         if when {
-            let iface = self.name.to_upper_camel_case();
-            format!("{iface}.")
+            let name = self.name.to_upper_camel_case();
+            format!("{name}.")
         } else {
             String::new()
         }
@@ -596,7 +608,7 @@ impl InterfaceGenerator<'_> {
                         if let Some(name) = &ty.name {
                             format!(
                                 "{}{}",
-                                self.qualifier(qualifier),
+                                self.qualifier(qualifier, ty),
                                 name.to_upper_camel_case()
                             )
                         } else {

crates/gen-guest-teavm-java/tests/codegen.rs

@@ -4,9 +4,6 @@ use std::path::Path;
 use std::process::Command;
 
 macro_rules! codegen_test {
-    // TODO: should get this test working
-    (use_across_interfaces $($x:tt)*) => {};
-
     ($id:ident $name:tt $test:tt) => {
         #[test]
         fn $id() {
@@ -35,21 +32,24 @@ fn verify(dir: &Path, name: &str) {
     fs::create_dir_all(package_dir).unwrap();
 
     let upper = name.to_upper_camel_case();
-    for file_name in [
-        format!("{upper}World.java"),
-        format!("{upper}.java"),
-        format!("{upper}Impl.java"),
-    ] {
-        let src = &dir.join(&file_name);
-        let dst = &package_dir.join(&file_name);
-        if src.exists() {
-            fs::rename(src, dst).unwrap();
+
+    let src_files = fs::read_dir(&dir).unwrap().filter_map(|entry| {
+        let path = entry.unwrap().path();
+        if let Some("java") = path.extension().map(|ext| ext.to_str().unwrap()) {
+            Some(path)
+        } else {
+            None
         }
+    });
+
+    for src in src_files {
+        let dst = &package_dir.join(src.file_name().unwrap());
+        fs::rename(src, dst).unwrap();
     }
 
     fs::write(
         dir.join("pom.xml"),
-        pom_xml(&[&format!("wit_{snake}.{upper}",)]),
+        pom_xml(&[&format!("wit_{snake}.{upper}")]),
     )
     .unwrap();
     fs::write(java_dir.join("Main.java"), include_bytes!("Main.java")).unwrap();