diff --git a/Example.Backend/Example.Backend.csproj b/Example.Backend/Example.Backend.csproj index 70c6be2..3a78ec5 100644 --- a/Example.Backend/Example.Backend.csproj +++ b/Example.Backend/Example.Backend.csproj @@ -7,7 +7,7 @@ enable - 9 + 12 true diff --git a/Example.Backend/PrinterFactory.cs b/Example.Backend/PrinterFactory.cs index c79888f..cd18317 100644 --- a/Example.Backend/PrinterFactory.cs +++ b/Example.Backend/PrinterFactory.cs @@ -11,7 +11,7 @@ namespace Example.Backend { private readonly List _printers = new(); - public IPrinter Create(string printerName) + public IPrinter Create(in string printerName) { Console.WriteLine("Creating printer"); return new Printer { Name = printerName }; diff --git a/Example.Frontend/Example.Frontend.csproj b/Example.Frontend/Example.Frontend.csproj index 9deed54..a9525b4 100644 --- a/Example.Frontend/Example.Frontend.csproj +++ b/Example.Frontend/Example.Frontend.csproj @@ -6,7 +6,7 @@ enable - 9 + 12 diff --git a/Example.Shared/IPrinterFactory.cs b/Example.Shared/IPrinterFactory.cs index de7a2b0..28e2fae 100644 --- a/Example.Shared/IPrinterFactory.cs +++ b/Example.Shared/IPrinterFactory.cs @@ -6,7 +6,7 @@ namespace Example.Shared [SharedObjectInterface] public interface IPrinterFactory : IShared { - IPrinter Create(string printerName); + IPrinter Create(in string printerName); void Register(IPrinter printer); IPrinter GetPrinterByName(string printerName); IPrinter GetFirstPrinter(); diff --git a/mROA.Codegen/LICENSE-2.0.txt b/mROA.Codegen/LICENSE-2.0.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/mROA.Codegen/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/mROA.Codegen/TemplateDocumentExtensions.cs b/mROA.Codegen/TemplateDocumentExtensions.cs index 8889bd1..11afd1c 100644 --- a/mROA.Codegen/TemplateDocumentExtensions.cs +++ b/mROA.Codegen/TemplateDocumentExtensions.cs @@ -7,7 +7,7 @@ namespace mROA.Codegen { public static TemplateDocument CloneInnerTemplate(this TemplateDocument template, string tag) { - var innerTemplate = template[tag] as InnerTemplateSection + var innerTemplate = template[tag] as InnerTemplateSection ?? throw new InvalidOperationException(); var clone = innerTemplate.InnerTemplate.Clone(); return (TemplateDocument)clone; diff --git a/mROA.Codegen/Templates/EventBinderTemplate.cs b/mROA.Codegen/Templates/EventBinderTemplate.cs index 5c325cb..5f61b94 100644 --- a/mROA.Codegen/Templates/EventBinderTemplate.cs +++ b/mROA.Codegen/Templates/EventBinderTemplate.cs @@ -10,34 +10,36 @@ namespace mROA.Codegen.Templates private const string ParametersDeclarationTag = "parametersDeclaration"; private const string CommandIdTag = "commandId"; private const string TransferParametersTag = "transferParameters"; - - public EventBinderTemplate(TemplateDocument template) : base(template) { } + + public EventBinderTemplate(TemplateDocument template) : base(template) + { + } public void DefineCallFilter(string value) { Define(CallFilterTag, value); } - + public void DefineType(string value) { Define(TypeTag, value); } - + public void DefineEventName(string value) { Define(EventNameTag, value); } - + public void DefineParametersDeclaration(string value) { Define(ParametersDeclarationTag, value); } - + public void DefineCommandIdTag(string value) { Define(CommandIdTag, value); } - + public void DefineTransferParameters(string value) { Define(TransferParametersTag, value); diff --git a/mROA.Codegen/Templates/IndexProviderTemplate.cs b/mROA.Codegen/Templates/IndexProviderTemplate.cs index cac9637..9ef6131 100644 --- a/mROA.Codegen/Templates/IndexProviderTemplate.cs +++ b/mROA.Codegen/Templates/IndexProviderTemplate.cs @@ -3,25 +3,27 @@ namespace mROA.Codegen.Templates public class IndexProviderTemplate : TemplateView { private const string TemplateFile = "IndexProvider.cstmpl"; - + private const string NamespaceTag = "namespace"; private const string LevelTag = "level"; private const string LenTag = "len"; private const string IndexSpanTag = "indexSpan"; private const string RemoteTypePairTag = "remoteTypePair"; - - public IndexProviderTemplate() : base(TemplateFile) { } + + public IndexProviderTemplate() : base(TemplateFile) + { + } public void DefineNamespace(string value) { Define(NamespaceTag, value); } - + public void DefineLevel(string value) { Define(LevelTag, value); } - + public void DefineLen(string value) { Define(LenTag, value); @@ -31,7 +33,7 @@ namespace mROA.Codegen.Templates { Insert(IndexSpanTag, value); } - + public void InsertRemoteTypePair(string value) { Insert(RemoteTypePairTag, value); diff --git a/mROA.Codegen/Templates/InvokerTemplate.cs b/mROA.Codegen/Templates/InvokerTemplate.cs index f7d0e47..73ad0bc 100644 --- a/mROA.Codegen/Templates/InvokerTemplate.cs +++ b/mROA.Codegen/Templates/InvokerTemplate.cs @@ -12,33 +12,35 @@ namespace mROA.Codegen.Templates private const string CancellationTag = "cancellation"; private const string IsTrustedTag = "isTrusted"; - public InvokerTemplate(TemplateDocument template) : base(template) { } + public InvokerTemplate(TemplateDocument template) : base(template) + { + } public void DefineIsVoid(string value) { Define(IsVoidTag, value); } - + public void DefineReturnType(string value) { Define(ReturnTypeTag, value); } - + public void DefineParametersType(string value) { Define(ParametersTypeTag, value); } - + public void DefineSuitableType(string value) { Define(SuitableTypeTag, value); } - + public void DefineFuncInvoking(string value) { Define(FuncInvokingTag, value); } - + public void DefineIsTrusted(string value) { Define(IsTrustedTag, value); diff --git a/mROA.Codegen/Templates/MethodRepoTemplate.cs b/mROA.Codegen/Templates/MethodRepoTemplate.cs index 9be1276..7061710 100644 --- a/mROA.Codegen/Templates/MethodRepoTemplate.cs +++ b/mROA.Codegen/Templates/MethodRepoTemplate.cs @@ -3,25 +3,27 @@ namespace mROA.Codegen.Templates public class MethodRepoTemplate : TemplateView { private const string TemplateFile = "MethodRepo.cstmpl"; - + private const string SyncInvokerTemplate = "syncInvoker"; private const string AsyncInvokerTemplate = "asyncInvoker"; - + private const string InvokerTag = "invoker"; - public MethodRepoTemplate() : base(TemplateFile) { } + public MethodRepoTemplate() : base(TemplateFile) + { + } public void InsertInvoke(string value) { Insert(InvokerTag, value); } - + public InvokerTemplate CloneInnerSyncInvoker() { var template = CloneInner(SyncInvokerTemplate); return new InvokerTemplate(template); } - + public InvokerTemplate CloneInnerAsyncInvoker() { var template = CloneInner(AsyncInvokerTemplate); diff --git a/mROA.Codegen/Templates/ObjectBinderTemplate.cs b/mROA.Codegen/Templates/ObjectBinderTemplate.cs index 57221b4..9fd8671 100644 --- a/mROA.Codegen/Templates/ObjectBinderTemplate.cs +++ b/mROA.Codegen/Templates/ObjectBinderTemplate.cs @@ -5,11 +5,13 @@ namespace mROA.Codegen.Templates public partial class ObjectBinderTemplate : TemplateView { private const string EventBinderTemplateTag = "eventBinderTemplate"; - + private const string TypeTag = "type"; private const string EventBinderTag = "eventBinder"; - public ObjectBinderTemplate(TemplateDocument template) : base(template) { } + public ObjectBinderTemplate(TemplateDocument template) : base(template) + { + } public void DefineType(string value) { @@ -20,7 +22,7 @@ namespace mROA.Codegen.Templates { Insert(EventBinderTag, value); } - + public EventBinderTemplate CloneInnerEventBinder() { var template = CloneInner(EventBinderTemplateTag); diff --git a/mROA.Codegen/Templates/PartialInterfaceTemplate.cs b/mROA.Codegen/Templates/PartialInterfaceTemplate.cs index 2441e2a..f1a6c25 100644 --- a/mROA.Codegen/Templates/PartialInterfaceTemplate.cs +++ b/mROA.Codegen/Templates/PartialInterfaceTemplate.cs @@ -3,18 +3,20 @@ namespace mROA.Codegen.Templates public class PartialInterfaceTemplate : TemplateView { private const string TemplateFile = "PartialInterface.cstmpl"; - + private const string NameTag = "name"; private const string NamespaceTag = "namespace"; private const string SignatureTag = "signature"; - public PartialInterfaceTemplate() : base(TemplateFile) { } + public PartialInterfaceTemplate() : base(TemplateFile) + { + } public void DefineName(string value) { Define(NameTag, value); } - + public void DefineNamespace(string value) { Define(NamespaceTag, value); diff --git a/mROA.Codegen/Templates/ProxyTemplate.cs b/mROA.Codegen/Templates/ProxyTemplate.cs index d66f03e..cb173bc 100644 --- a/mROA.Codegen/Templates/ProxyTemplate.cs +++ b/mROA.Codegen/Templates/ProxyTemplate.cs @@ -1,26 +1,28 @@ namespace mROA.Codegen.Templates -{ +{ public class ProxyTemplate : TemplateView { private const string TemplateFile = "Proxy.cstmpl"; - + private const string ClassNameTag = "className"; private const string OriginalNameTag = "originalName"; - private const string NamespaceNameTag= "namespaceName"; + private const string NamespaceNameTag = "namespaceName"; private const string MethodsTag = "methods"; - public ProxyTemplate() : base(TemplateFile) { } + public ProxyTemplate() : base(TemplateFile) + { + } public void DefineClassName(string value) { Define(ClassNameTag, value); } - + public void DefineOriginalName(string value) { Define(OriginalNameTag, value); } - + public void DefineNamespaceName(string value) { Define(NamespaceNameTag, value); diff --git a/mROA.Codegen/Templates/RemoteTypeBinderTemplate.cs b/mROA.Codegen/Templates/RemoteTypeBinderTemplate.cs index 9aa9add..7ff1dcf 100644 --- a/mROA.Codegen/Templates/RemoteTypeBinderTemplate.cs +++ b/mROA.Codegen/Templates/RemoteTypeBinderTemplate.cs @@ -3,18 +3,20 @@ namespace mROA.Codegen.Templates public class RemoteTypeBinderTemplate : TemplateView { private const string TemplateFile = "RemoteTypeBinder.cstmpl"; - + private const string ObjectBinderTemplateTag = "objectBinderTemplate"; private const string EventBinderTag = "eventBinder"; - public RemoteTypeBinderTemplate() : base(TemplateFile) { } - + public RemoteTypeBinderTemplate() : base(TemplateFile) + { + } + public ObjectBinderTemplate CloneInnerObjectBinder() { var template = CloneInner(ObjectBinderTemplateTag); return new ObjectBinderTemplate(template); } - + public void InsertEventBinder(string value) { Insert(EventBinderTag, value); diff --git a/mROA.Codegen/Templates/TemplateView.cs b/mROA.Codegen/Templates/TemplateView.cs index 75fa1d4..95b5d40 100644 --- a/mROA.Codegen/Templates/TemplateView.cs +++ b/mROA.Codegen/Templates/TemplateView.cs @@ -6,12 +6,12 @@ namespace mROA.Codegen.Templates public abstract class TemplateView { private readonly TemplateDocument _template; - + protected TemplateView(string templateFile) { _template = TemplateReader.FromEmbeddedResource(templateFile); } - + protected TemplateView(TemplateDocument template) { _template = template; diff --git a/mROA.Codegen/mROA.Codegen.csproj b/mROA.Codegen/mROA.Codegen.csproj index 371bc18..de7483a 100644 --- a/mROA.Codegen/mROA.Codegen.csproj +++ b/mROA.Codegen/mROA.Codegen.csproj @@ -17,10 +17,18 @@ https://github.com/YaslePoy/mROA git True - 2.0.7 + 3.0.3 mroaLogo.png + + LICENSE-2.0.txt + + + + + + all @@ -32,8 +40,8 @@ - True - + True + @@ -49,9 +57,9 @@ - - + + - + \ No newline at end of file diff --git a/mROA.Codegen/mROASourceGenerator.cs b/mROA.Codegen/mROASourceGenerator.cs index 7274098..0ac740c 100644 --- a/mROA.Codegen/mROASourceGenerator.cs +++ b/mROA.Codegen/mROASourceGenerator.cs @@ -30,7 +30,7 @@ namespace mROA.Codegen private static readonly Predicate ParameterFilterForType = i => i.Name is "CancellationToken" or "RequestContext"; - + private int _currentInternalCallIndex; public void Initialize(IncrementalGeneratorInitializationContext context) @@ -71,7 +71,7 @@ namespace mROA.Codegen if (compilation.AssemblyName == null) throw new InvalidOperationException(); - + indexProviderTemplate.DefineNamespace(compilation.AssemblyName); var invokers = new List(); var declarations = classes.ToList(); @@ -137,15 +137,18 @@ namespace mROA.Codegen // declaredMethods.Add(impl); break; case IEventSymbol eventSymbol: - proxyTemplate.InsertMethods($"public event {eventSymbol.Type.ToUnityString()}? {eventSymbol.Name};"); + proxyTemplate.InsertMethods( + $"public event {eventSymbol.Type.ToUnityString()}? {eventSymbol.Name};"); // declaredMethods.Add( // $"public event {eventSymbol.Type.ToDisplayString()}? {eventSymbol.Name};"); break; } - GenerateEventImplementation(proxyTemplate, methodRepoTemplate, typeBinder, classSymbol, invokers, context); + GenerateEventImplementation(proxyTemplate, methodRepoTemplate, typeBinder, classSymbol, invokers, + context); var endInvokers = invokers.Count; - indexProviderTemplate.InsertIndexSpan($"{{ typeof({originalName}), new[] {{ {CodegenUtilities.JoinWithComa(Enumerable.Range(startInvokers, endInvokers - startInvokers).Select(i => i.ToString()))} }} }},"); + indexProviderTemplate.InsertIndexSpan( + $"{{ typeof({originalName}), new[] {{ {CodegenUtilities.JoinWithComa(Enumerable.Range(startInvokers, endInvokers - startInvokers).Select(i => i.ToString()))} }} }},"); proxyTemplate.DefineClassName(className); proxyTemplate.DefineOriginalName(originalName); proxyTemplate.DefineNamespaceName(namespaceName); @@ -157,7 +160,8 @@ namespace mROA.Codegen #if !DONT_ADD context.AddSource($"{className}.g.cs", SourceText.From(code, Encoding.UTF8)); #endif - indexProviderTemplate.InsertRemoteTypePair($"{{ typeof({classSymbol.ToUnityString()}), (id, r, c, indices) => new {namespaceName}.{className}(id, r, c, indices) }}"); + indexProviderTemplate.InsertRemoteTypePair( + $"{{ typeof({classSymbol.ToUnityString()}), (id, r, c, indices) => new {namespaceName}.{className}(id, r, c, indices) }}"); } if (totalMethods.Count != 0) @@ -184,7 +188,8 @@ namespace mROA.Codegen } } - private void GenerateEventImplementation(ProxyTemplate proxyTemplate, MethodRepoTemplate methodRepoTemplate, RemoteTypeBinderTemplate remoteTypeBinder, INamedTypeSymbol classSymbol, + private void GenerateEventImplementation(ProxyTemplate proxyTemplate, MethodRepoTemplate methodRepoTemplate, + RemoteTypeBinderTemplate remoteTypeBinder, INamedTypeSymbol classSymbol, List invokers, SourceProductionContext context) { var events = classSymbol.AllInterfaces.Add(classSymbol).SelectMany(i => i.GetMembers()) @@ -195,7 +200,7 @@ namespace mROA.Codegen var partialInterfaceTemplate = new PartialInterfaceTemplate(); partialInterfaceTemplate.DefineName(classSymbol.Name); partialInterfaceTemplate.DefineNamespace(classSymbol.ContainingNamespace.ToDisplayString()); - + var objectBinderTemplate = remoteTypeBinder.CloneInnerObjectBinder(); foreach (var currentEvent in events) { @@ -207,7 +212,7 @@ namespace mROA.Codegen GenerateEventCode(methodRepoTemplate, currentEvent, invokers, classSymbol); GenerateBinderCode(objectBinderTemplate, currentEvent, classSymbol); } - + objectBinderTemplate.DefineType(classSymbol.ToUnityString()); var partialInterface = partialInterfaceTemplate.Compile(); var binder = objectBinderTemplate.Compile(); @@ -235,7 +240,8 @@ namespace mROA.Codegen return caller; } - private void GenerateDeclaredMethod(ProxyTemplate proxyTemplate, MethodRepoTemplate methodRepoTemplate, IMethodSymbol method, List invokers, + private void GenerateDeclaredMethod(ProxyTemplate proxyTemplate, MethodRepoTemplate methodRepoTemplate, + IMethodSymbol method, List invokers, INamedTypeSymbol baseInterface) { var sb = new StringBuilder(); @@ -317,7 +323,7 @@ namespace mROA.Codegen var parametersInsertList = new List(); var useCancellationToken = false; - + foreach (var parameter in method.Parameters) switch (parameter.Type.Name) { @@ -374,7 +380,7 @@ namespace mROA.Codegen invokerTemplate.DefineSuitableType(baseInterface.ToUnityString()); invokerTemplate.DefineFuncInvoking(funcInvoking); invokerTemplate.DefineIsTrusted((!isUntrusted).ToString().ToLower()); - + backend = invokerTemplate.Compile(); } @@ -383,7 +389,8 @@ namespace mROA.Codegen invokers.Add(backend); } - private void GenerateBinderCode(ObjectBinderTemplate objectBinderTemplate, IEventSymbol eventSymbol, INamedTypeSymbol baseType) + private void GenerateBinderCode(ObjectBinderTemplate objectBinderTemplate, IEventSymbol eventSymbol, + INamedTypeSymbol baseType) { var eventBinderTemplate = objectBinderTemplate.CloneInnerEventBinder(); @@ -397,7 +404,7 @@ namespace mROA.Codegen var transferParameters = CodegenUtilities.JoinWithComa(parameters.Select(i => (i, pi++)) .Where(i => !ParameterFilterForType(i.i)) .Select(i => "p" + i.Item2)); - + var requestIndex = parameters.FindIndex(i => i.Name == "RequestContext"); if (requestIndex != -1) { @@ -408,13 +415,15 @@ namespace mROA.Codegen eventBinderTemplate.DefineType(baseType.ToUnityString()); eventBinderTemplate.DefineEventName(eventSymbol.Name); eventBinderTemplate.DefineParametersDeclaration(parametersDeclaration); - eventBinderTemplate.DefineCommandIdTag($"context.CallIndexProvider.GetIndices(typeof({baseType.ToUnityString()}))[{index}]"); + eventBinderTemplate.DefineCommandIdTag( + $"context.CallIndexProvider.GetIndices(typeof({baseType.ToUnityString()}))[{index}]"); eventBinderTemplate.DefineTransferParameters(transferParameters); var eventBinderCode = eventBinderTemplate.Compile(); objectBinderTemplate.InsertEventBinder(eventBinderCode); } - private void GenerateEventCode(MethodRepoTemplate methodRepoTemplate, IEventSymbol eventSymbol, List invokers, ITypeSymbol baseInterface) + private void GenerateEventCode(MethodRepoTemplate methodRepoTemplate, IEventSymbol eventSymbol, + List invokers, ITypeSymbol baseInterface) { var level = "\t\t\t"; @@ -487,7 +496,8 @@ namespace mROA.Codegen invokerTemplate.DefineReturnType(method.ReturnType.ToUnityString()); invokerTemplate.DefineParametersType(parameterTypes); invokerTemplate.DefineSuitableType(baseInterface.ToUnityString()); - invokerTemplate.DefineFuncInvoking($"(i as {method.ContainingType.ToUnityString()})[{parameterInserts}]"); + invokerTemplate.DefineFuncInvoking( + $"(i as {method.ContainingType.ToUnityString()})[{parameterInserts}]"); invokerTemplate.DefineIsTrusted("true"); backend = invokerTemplate.Compile(); @@ -499,7 +509,8 @@ namespace mROA.Codegen invokerTemplate.DefineReturnType(method.ReturnType.ToUnityString()); invokerTemplate.DefineParametersType(""); invokerTemplate.DefineSuitableType(baseInterface.ToUnityString()); - invokerTemplate.DefineFuncInvoking($"(i as {method.ContainingType.ToUnityString()}).{(method.AssociatedSymbol as IPropertySymbol)!.Name}"); + invokerTemplate.DefineFuncInvoking( + $"(i as {method.ContainingType.ToUnityString()}).{(method.AssociatedSymbol as IPropertySymbol)!.Name}"); invokerTemplate.DefineIsTrusted("true"); backend = invokerTemplate.Compile(); @@ -523,13 +534,14 @@ namespace mROA.Codegen var valueInsert = CodegenUtilities.Caster(method.Parameters.Last().Type, "parameters[" + (method.Parameters.Length - 1) + "]"); - + var invokerTemplate = methodRepoTemplate.CloneInnerSyncInvoker(); invokerTemplate.DefineIsVoid("true"); invokerTemplate.DefineReturnType(method.ReturnType.ToUnityString()); invokerTemplate.DefineParametersType(parameterTypes); invokerTemplate.DefineSuitableType(baseInterface.ToUnityString()); - invokerTemplate.DefineFuncInvoking($"(i as {method.ContainingType.ToUnityString()})[{parameterInserts}] = {valueInsert}"); + invokerTemplate.DefineFuncInvoking( + $"(i as {method.ContainingType.ToUnityString()})[{parameterInserts}] = {valueInsert}"); invokerTemplate.DefineIsTrusted("true"); backend = invokerTemplate.Compile(); @@ -541,7 +553,8 @@ namespace mROA.Codegen invokerTemplate.DefineReturnType(method.ReturnType.ToUnityString()); invokerTemplate.DefineParametersType($"typeof({method.Parameters.First().Type.ToUnityString()})"); invokerTemplate.DefineSuitableType(baseInterface.ToUnityString()); - invokerTemplate.DefineFuncInvoking($"(i as {method.ContainingType.ToUnityString()}).{(method.AssociatedSymbol as IPropertySymbol)!.Name} = {CodegenUtilities.Caster((method.AssociatedSymbol as IPropertySymbol)!.Type, "parameters[0]")}"); + invokerTemplate.DefineFuncInvoking( + $"(i as {method.ContainingType.ToUnityString()}).{(method.AssociatedSymbol as IPropertySymbol)!.Name} = {CodegenUtilities.Caster((method.AssociatedSymbol as IPropertySymbol)!.Type, "parameters[0]")}"); invokerTemplate.DefineIsTrusted("true"); backend = invokerTemplate.Compile(); @@ -580,7 +593,9 @@ namespace mROA.Codegen public static string ToFullString(IParameterSymbol parameter) { - return parameter.Type.ToUnityString() + " " + parameter.Name; + var coreString = $"{parameter.Type.ToUnityString()} {parameter.Name}"; + if (parameter.RefKind == RefKind.In) coreString = $"in {coreString}"; + return coreString; } public static string ToFullString(ITypeSymbol type)