Skip to content

Fix: using async Task<LuaValue> functions with LuaMember (#160) #181

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: using async Task<LuaValue> functions with LuaMember (#160) #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/Lua.SourceGenerator/LuaObjectGenerator.Emit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,14 @@ static void EmitMethodFunction(string functionName, string chunkName, TypeMetada

if (methodMetadata.HasReturnValue)
{
if (SymbolEqualityComparer.Default.Equals(methodMetadata.Symbol.ReturnType, references.LuaValue))
var returnType = methodMetadata.Symbol.ReturnType;

if (returnType is INamedTypeSymbol named && named.OriginalDefinition.ToString() == "System.Threading.Tasks.Task<TResult>")
{
returnType = named.TypeArguments[0];
}

if (SymbolEqualityComparer.Default.Equals(returnType, references.LuaValue))
{
builder.AppendLine("buffer.Span[0] = result;");
}
Expand Down
23 changes: 23 additions & 0 deletions tests/Lua.Tests/LuaObjectTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ public static async Task MethodAsync()
await Task.CompletedTask;
}

[LuaMember]
public static async Task<LuaValue> MethodLuaValueAsync(bool condition)
{
await Task.Yield();
return condition ? new LuaValue(12) : LuaValue.Nil;
}

[LuaMember]
public static double StaticMethodWithReturnValue(double a, double b)
{
Expand Down Expand Up @@ -100,6 +107,22 @@ public async Task Test_MethodAsync()
Assert.That(results, Has.Length.EqualTo(0));
}

[Test]
public async Task Test_MethodLuaValueAsync()
{
var userData = new TestUserData();

var state = LuaState.Create();
state.Environment["test"] = userData;
var resultsNumber = await state.DoStringAsync("return test.MethodLuaValueAsync(true)");
var resultsNill = await state.DoStringAsync("return test.MethodLuaValueAsync(false)");

Assert.That(resultsNumber, Has.Length.EqualTo(1));
Assert.That(resultsNumber[0], Is.EqualTo(new LuaValue(12)));
Assert.That(resultsNill, Has.Length.EqualTo(1));
Assert.That(resultsNill[0], Is.EqualTo(LuaValue.Nil));
}

[Test]
public async Task Test_StaticMethodWithReturnValue()
{
Expand Down