add resource name into classes

enable futures.wit test

Author: yowl

crates/csharp/src/function.rs

@@ -1073,14 +1073,20 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                     interop_name = format!("Imports.{interop_name}");
                 }
 
-                let mut resource_type_name = String::new();
-                if let FunctionKind::Method(resource_type_id) = self.kind {
-                    resource_type_name = format!(
-                        ".{}",
-                        self.interface_gen.csharp_gen.all_resources[resource_type_id].name.to_upper_camel_case()
-                    );
-                }
-                
+                let resource_type_name = match self.kind {
+                    FunctionKind::Method(resource_type_id) | 
+                    FunctionKind::Static(resource_type_id) | 
+                    FunctionKind::Constructor(resource_type_id) => {
+                        format!(
+                            ".{}",
+                            self.interface_gen.csharp_gen.all_resources[resource_type_id]
+                                .name
+                                .to_upper_camel_case()
+                        )
+                    }
+                    _ => String::new(),
+                };
+
                 uwriteln!(
                     self.src,
                     "{assignment} {interop_name}{resource_type_name}.{func_name}WasmInterop.wasmImport{func_name}({operands});"

crates/csharp/src/interface.rs

@@ -813,7 +813,7 @@ impl InterfaceGenerator<'_> {
                     resource_type_name.unwrap()
                 }
                 else {
-                    format!("{}Impl.{export_name}", interface_name.strip_prefix("I").unwrap())
+                    format!("{}Impl", interface_name.strip_prefix("I").unwrap())
                 };
 
             uwriteln!(

crates/test/src/csharp.rs

@@ -45,7 +45,6 @@ impl LanguageMethods for Csharp {
             name,
             "resources-with-streams.wit"
                 | "resources-with-futures.wit"
-                | "futures.wit"
                 | "streams.wit"
                 | "error-context.wit"
                 | "resource-fallible-constructor.wit"

tests/runtime-async/async/simple-future/runner.cs

@@ -1,27 +1,27 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
-using RunnerWorld.wit.imports.my.test;
+using RunnerWorld.wit.Imports.my.test;
 using RunnerWorld;
 
 public class Program
 {
     public static async Task Main(string[] args)
     {
         {
-            var (reader, writer) = II.ReadFutureVoidNew();
+            var (reader, writer) = IIImports.ReadFutureVoidNew();
 
             var writeTask = writer.Write();
             Debug.Assert(!writeTask.IsCompleted);
 
-            var task = II.ReadFuture(reader);
+            var task = IIImports.ReadFuture(reader);
             Debug.Assert(task.IsCompleted);
 
-            var set = II.WaitableSetNew();
-            II.Join(writer, set);
+            var set = IIImports.WaitableSetNew();
+            IIImports.Join(writer, set);
 
             var ev = new EventWaitable();
-            var status = II.WaitableSetWait(set);
+            var status = IIImports.WaitableSetWait(set);
             Debug.Assert(status.Event == EventCode.FutureWrite);
             Debug.Assert(status.Waitable == writer.Handle);
             Debug.Assert(status.Status.IsCompleted);
@@ -32,19 +32,19 @@ public static async Task Main(string[] args)
         }   
 
         {
-            var (reader, writer) = II.DropFutureVoidNew();
+            var (reader, writer) = IIImports.DropFutureVoidNew();
 
             var writeTask = writer.Write();
             Debug.Assert(!writeTask.IsCompleted);
 
-            var task = II.DropFuture(reader);
+            var task = IIImports.DropFuture(reader);
             Debug.Assert(task.IsCompleted);
 
-            var set = II.WaitableSetNew();
-            II.Join(writer, set);
+            var set = IIImports.WaitableSetNew();
+            IIImports.Join(writer, set);
 
             var ev = new EventWaitable();
-            var status = II.WaitableSetWait(set);
+            var status = IIImports.WaitableSetWait(set);
             Debug.Assert(status.Event == EventCode.FutureWrite);
             Debug.Assert(status.Waitable == writer.Handle);
             Debug.Assert(status.Status.IsDropped);

tests/runtime-async/async/simple-future/test.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics;
 
-namespace TestWorld.wit.exports.my.test
+namespace TestWorld.wit.Exports.my.test
 {
-    public class IImpl : II
+    public class IExportsImpl : IIExports
     {
         public static Task ReadFuture(FutureReader reader)
         {

tests/runtime-async/async/simple-import-params-results/runner.cs

@@ -1,28 +1,28 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
-using RunnerWorld.wit.imports.a.b;
+using RunnerWorld.wit.Imports.a.b;
 using System.Text;
 
 public class Program
 {
     public static async Task Main(string[] args)
     {
-        var t = II.OneArgument(1);
+        var t = IIImports.OneArgument(1);
         Debug.Assert(t.IsCompletedSuccessfully);
 
-        var tOneResult = II.OneResult();
+        var tOneResult = IIImports.OneResult();
         Debug.Assert(tOneResult.IsCompletedSuccessfully);
         Debug.Assert(tOneResult.Result == 2);
 
-        var tOneArgumentAndResult = II.OneArgumentAndResult(3);
+        var tOneArgumentAndResult = IIImports.OneArgumentAndResult(3);
         Debug.Assert(tOneArgumentAndResult.IsCompletedSuccessfully);
         Debug.Assert(tOneArgumentAndResult.Result == 4);
 
-        var tTwoArguments = II.TwoArguments(5, 6);
+        var tTwoArguments = IIImports.TwoArguments(5, 6);
         Debug.Assert(tTwoArguments.IsCompletedSuccessfully);
 
-        var tTwoArgumentsAndResult = II.TwoArgumentsAndResult(7, 8);
+        var tTwoArgumentsAndResult = IIImports.TwoArgumentsAndResult(7, 8);
         Debug.Assert(tTwoArgumentsAndResult.IsCompletedSuccessfully);
         Debug.Assert(tTwoArgumentsAndResult.Result == 9);
     }

tests/runtime-async/async/simple-import-params-results/test.cs

@@ -1,9 +1,9 @@
 using System.Diagnostics;
-using TestWorld.wit.exports.a.b;
+using TestWorld.wit.Exports.a.b;
 
-namespace TestWorld.wit.exports.a.b
+namespace TestWorld.wit.Exports.a.b
 {
-    public class IImpl : II
+    public class IExportsImpl : IIExports
     {
         public static async Task OneArgument(uint x)
         {
@@ -33,5 +33,30 @@ public static async Task<uint> TwoArgumentsAndResult(uint x, uint y)
             Debug.Assert(y == 8);
             return 9;
         }
+
+        public static int OneArgumentCallback()
+        {
+            throw new NotImplementedException();
+        }
+
+        public static int OneResultCallback()
+        {
+            throw new NotImplementedException();
+        }
+
+        public static int OneArgumentAndResultCallback()
+        {
+            throw new NotImplementedException();
+        }
+
+        public static int TwoArgumentsCallback()
+        {
+            throw new NotImplementedException();
+        }
+
+        public static int TwoArgumentsAndResultCallback()
+        {
+            throw new NotImplementedException();
+        }
     }
 }