Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Double nested classes.
  • Loading branch information
maraf authored and github-actions committed Aug 31, 2022
commit 4e22e6299af3be8c0929b7dd6f49a9b08546f7a0
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private static string GetQualifiedName(StubEnvironment env, IMethodSymbol method

nameBuilder.Append(namePart);
}
else
else if (namePart.Kind != SymbolDisplayPartKind.Punctuation)
{
throw new InvalidOperationException($"Name kind '{namePart.Kind}' should be reached");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1206,47 +1206,55 @@ public void JsExportStringNoNs()
public void JsExportStructClassRecords()
{
var actual = JavaScriptTestHelper.invokeStructClassRecords("test");
Assert.Equal(40, actual.Length);
Assert.Equal(48, actual.Length);
Assert.Equal("test11", actual[0]);
Assert.Equal("test12", actual[1]);
Assert.Equal("test13", actual[2]);
Assert.Equal("test14", actual[3]);
Assert.Equal("test15", actual[4]);
Assert.Equal("test21", actual[5]);
Assert.Equal("test22", actual[6]);
Assert.Equal("test23", actual[7]);
Assert.Equal("test24", actual[8]);
Assert.Equal("test25", actual[9]);
Assert.Equal("test31", actual[10]);
Assert.Equal("test32", actual[11]);
Assert.Equal("test33", actual[12]);
Assert.Equal("test34", actual[13]);
Assert.Equal("test35", actual[14]);
Assert.Equal("test41", actual[15]);
Assert.Equal("test42", actual[16]);
Assert.Equal("test43", actual[17]);
Assert.Equal("test44", actual[18]);
Assert.Equal("test45", actual[19]);
Assert.Equal("test51", actual[20]);
Assert.Equal("test52", actual[21]);
Assert.Equal("test53", actual[22]);
Assert.Equal("test54", actual[23]);
Assert.Equal("test55", actual[24]);
Assert.Equal("test61", actual[25]);
Assert.Equal("test62", actual[26]);
Assert.Equal("test63", actual[27]);
Assert.Equal("test64", actual[28]);
Assert.Equal("test65", actual[29]);
Assert.Equal("test71", actual[30]);
Assert.Equal("test72", actual[31]);
Assert.Equal("test73", actual[32]);
Assert.Equal("test74", actual[33]);
Assert.Equal("test75", actual[34]);
Assert.Equal("test81", actual[35]);
Assert.Equal("test82", actual[36]);
Assert.Equal("test83", actual[37]);
Assert.Equal("test84", actual[38]);
Assert.Equal("test85", actual[39]);
Assert.Equal("test16", actual[5]);
Assert.Equal("test17", actual[6]);
Assert.Equal("test18", actual[7]);
Assert.Equal("test19", actual[8]);
Assert.Equal("test21", actual[9]);
Assert.Equal("test22", actual[10]);
Assert.Equal("test23", actual[11]);
Assert.Equal("test24", actual[12]);
Assert.Equal("test25", actual[13]);
Assert.Equal("test31", actual[14]);
Assert.Equal("test32", actual[15]);
Assert.Equal("test33", actual[16]);
Assert.Equal("test34", actual[17]);
Assert.Equal("test35", actual[18]);
Assert.Equal("test41", actual[19]);
Assert.Equal("test42", actual[20]);
Assert.Equal("test43", actual[21]);
Assert.Equal("test44", actual[22]);
Assert.Equal("test45", actual[23]);
Assert.Equal("test51", actual[24]);
Assert.Equal("test52", actual[25]);
Assert.Equal("test53", actual[26]);
Assert.Equal("test54", actual[27]);
Assert.Equal("test55", actual[28]);
Assert.Equal("test56", actual[29]);
Assert.Equal("test57", actual[30]);
Assert.Equal("test58", actual[31]);
Assert.Equal("test59", actual[32]);
Assert.Equal("test61", actual[33]);
Assert.Equal("test62", actual[34]);
Assert.Equal("test63", actual[35]);
Assert.Equal("test64", actual[36]);
Assert.Equal("test65", actual[37]);
Assert.Equal("test71", actual[38]);
Assert.Equal("test72", actual[39]);
Assert.Equal("test73", actual[40]);
Assert.Equal("test74", actual[41]);
Assert.Equal("test75", actual[42]);
Assert.Equal("test81", actual[43]);
Assert.Equal("test82", actual[44]);
Assert.Equal("test83", actual[45]);
Assert.Equal("test84", actual[46]);
Assert.Equal("test85", actual[47]);
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -949,24 +949,48 @@ public partial class NestedClass
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "12";

public partial class DoubleNestedClass
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "13";
}
}

public partial record class NestedRecordClass
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "13";
public static string EchoString(string message) => message + "14";

public partial record class DoubleNestedRecordClass
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "15";
}
}

public partial struct NestedStruct
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "14";
public static string EchoString(string message) => message + "16";

public partial struct DoubleNestedStruct
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "17";
}
}

public partial record struct NestedRecordStruct
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "15";
public static string EchoString(string message) => message + "18";

public partial record struct DoubleNestedRecordStruct
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "19";
}
}
}

Expand Down Expand Up @@ -1070,24 +1094,48 @@ public partial class NestedClass
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "52";

public partial class DoubleNestedClass
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "53";
}
}

public partial record class NestedRecordClass
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "53";
public static string EchoString(string message) => message + "54";

public partial record class DoubleNestedRecordClass
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "55";
}
}

public partial struct NestedStruct
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "54";
public static string EchoString(string message) => message + "56";

public partial struct DoubleNestedStruct
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "57";
}
}

public partial record struct NestedRecordStruct
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "55";
public static string EchoString(string message) => message + "58";

public partial record struct DoubleNestedRecordStruct
{
[System.Runtime.InteropServices.JavaScript.JSExport]
public static string EchoString(string message) => message + "59";
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,13 @@ export function invokeStructClassRecords(arg1) {
return [
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.NestedClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.NestedClass.DoubleNestedClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.NestedRecordClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.NestedRecordClass.DoubleNestedRecordClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.NestedStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.NestedStruct.DoubleNestedStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.NestedRecordStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelper.NestedRecordStruct.DoubleNestedRecordStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelperStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelperStruct.NestedClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelperStruct.NestedRecordClass.EchoString(arg1),
Expand All @@ -195,9 +199,13 @@ export function invokeStructClassRecords(arg1) {
dllExports.JavaScriptTestHelperNamespace.JavaScriptTestHelperRecordStruct.NestedRecordStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.NestedClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.NestedClass.DoubleNestedClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.NestedRecordClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.NestedRecordClass.DoubleNestedRecordClass.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.NestedStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.NestedStruct.DoubleNestedStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.NestedRecordStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperNoNamespace.NestedRecordStruct.DoubleNestedRecordStruct.EchoString(arg1),
dllExports.JavaScriptTestHelperStructNoNamespace.EchoString(arg1),
dllExports.JavaScriptTestHelperStructNoNamespace.NestedClass.EchoString(arg1),
dllExports.JavaScriptTestHelperStructNoNamespace.NestedRecordClass.EchoString(arg1),
Expand Down