diff options
| author | Min Huang <huangmin@microsoft.com> | 2022-11-11 07:15:37 +0300 |
|---|---|---|
| committer | Min Huang <huangmin@microsoft.com> | 2022-11-11 07:15:37 +0300 |
| commit | 357b97fbe41ecf770635e4b47f227edb9fff5f9d (patch) | |
| tree | eb424c91fe6e035f6f6aa8133faf7b752ebda98a | |
| parent | 0702b18b7570af772613c4a1386f10e30c7dfbd7 (diff) | |
updatemh/static-virtual
| -rw-r--r-- | mdoc/Consts.cs | 2 | ||||
| -rw-r--r-- | mdoc/Mono.Documentation/Updater/Formatters/CSharpFullMemberFormatter.cs | 4 | ||||
| -rw-r--r-- | mdoc/mdoc.Test/FormatterTests.cs | 2 | ||||
| -rw-r--r-- | mdoc/mdoc.Test/SampleClasses/SomeStruct.cs | 1 | ||||
| -rw-r--r-- | mdoc/mdoc.Test/SampleClasses/StructWithReadOnlyMethod.cs | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/mdoc/Consts.cs b/mdoc/Consts.cs index dc451503..fa011231 100644 --- a/mdoc/Consts.cs +++ b/mdoc/Consts.cs @@ -54,6 +54,8 @@ namespace Mono.Documentation public const string TupleElementNamesAttribute = "System.Runtime.CompilerServices.TupleElementNamesAttribute"; public const string IsExternalInit = "System.Runtime.CompilerServices.IsExternalInit"; public const string NativeIntegerAttribute = "System.Runtime.CompilerServices.NativeIntegerAttribute"; + public const string ScopedRefAttribute= "System.Runtime.CompilerServices.ScopedRefAttribute"; + public const string LifetimeAnnotationAttribute = "System.Runtime.CompilerServices.LifetimeAnnotationAttribute"; public const string CallConvPrefix = "System.Runtime.CompilerServices.CallConv"; } } diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CSharpFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CSharpFullMemberFormatter.cs index 8d063b7c..ec0f2057 100644 --- a/mdoc/Mono.Documentation/Updater/Formatters/CSharpFullMemberFormatter.cs +++ b/mdoc/Mono.Documentation/Updater/Formatters/CSharpFullMemberFormatter.cs @@ -615,8 +615,8 @@ namespace Mono.Documentation.Updater.Formatters if (parameter.HasCustomAttributes) { var isScoped = parameter.CustomAttributes.Any( - ca => ca.AttributeType.Name == "ScopedRefAttribute" - || ca.AttributeType.Name == "LifetimeAnnotationAttribute"); // Workaround as complier in ci pipeline has delay for update. + ca => ca.AttributeType.FullName == Consts.ScopedRefAttribute + || ca.AttributeType.FullName == Consts.LifetimeAnnotationAttribute); // Workaround as complier in ci pipeline has delay for update. if (isScoped) buf.AppendFormat("scoped "); } diff --git a/mdoc/mdoc.Test/FormatterTests.cs b/mdoc/mdoc.Test/FormatterTests.cs index 20c6a1dd..187c7fa2 100644 --- a/mdoc/mdoc.Test/FormatterTests.cs +++ b/mdoc/mdoc.Test/FormatterTests.cs @@ -435,7 +435,7 @@ namespace mdoc.Test [Test] public void CSharpReadOnlyPropertyTest() { - TestPropertySignature(typeof(SampleClasses.SomeStruct), "public string Property { get; }", "Property"); + TestPropertySignature(typeof(SampleClasses.StructWithReadOnlyMethod), "public string Property { get; }", "Property"); } [TestCase("Sum", "public readonly double Sum ();")] diff --git a/mdoc/mdoc.Test/SampleClasses/SomeStruct.cs b/mdoc/mdoc.Test/SampleClasses/SomeStruct.cs index 74bf4c45..49fa8900 100644 --- a/mdoc/mdoc.Test/SampleClasses/SomeStruct.cs +++ b/mdoc/mdoc.Test/SampleClasses/SomeStruct.cs @@ -5,6 +5,5 @@ public int IntMember; public static int StaticMember; public TestClass TestClassMember; - public string Property { get; } } }
\ No newline at end of file diff --git a/mdoc/mdoc.Test/SampleClasses/StructWithReadOnlyMethod.cs b/mdoc/mdoc.Test/SampleClasses/StructWithReadOnlyMethod.cs index b61b2811..69b950ef 100644 --- a/mdoc/mdoc.Test/SampleClasses/StructWithReadOnlyMethod.cs +++ b/mdoc/mdoc.Test/SampleClasses/StructWithReadOnlyMethod.cs @@ -11,5 +11,7 @@ } readonly int Struct_Interface_A.GetNum() => 1; + + public string Property { get; } } } |