Add support for C# 11 scoped parameter modifier.

ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs

@@ -2565,6 +2565,11 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
 				WriteKeyword(ParameterDeclaration.ThisModifierRole);
 				Space();
 			}
+			if (parameterDeclaration.IsRefScoped)
+			{
+				WriteKeyword(ParameterDeclaration.RefScopedRole);
+				Space();
+			}
 			switch (parameterDeclaration.ParameterModifier)
 			{
 				case ParameterModifier.Ref:
@@ -2584,6 +2589,11 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
 					Space();
 					break;
 			}
+			if (parameterDeclaration.IsValueScoped)
+			{
+				WriteKeyword(ParameterDeclaration.ValueScopedRole);
+				Space();
+			}
 			parameterDeclaration.Type.AcceptVisitor(this);
 			if (!parameterDeclaration.Type.IsNull && !string.IsNullOrEmpty(parameterDeclaration.Name))
 			{

ICSharpCode.Decompiler/CSharp/Syntax/TypeMembers/ParameterDeclaration.cs

@@ -34,17 +34,20 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
 		Ref,
 		Out,
 		Params,
-		In
+		In,
+		Scoped
 	}
 
 	public class ParameterDeclaration : AstNode
 	{
 		public static readonly Role<AttributeSection> AttributeRole = EntityDeclaration.AttributeRole;
+		public static readonly TokenRole ThisModifierRole = new TokenRole("this");
+		public static readonly TokenRole RefScopedRole = new TokenRole("scoped");
 		public static readonly TokenRole RefModifierRole = new TokenRole("ref");
 		public static readonly TokenRole OutModifierRole = new TokenRole("out");
-		public static readonly TokenRole ParamsModifierRole = new TokenRole("params");
-		public static readonly TokenRole ThisModifierRole = new TokenRole("this");
 		public static readonly TokenRole InModifierRole = new TokenRole("in");
+		public static readonly TokenRole ValueScopedRole = new TokenRole("scoped");
+		public static readonly TokenRole ParamsModifierRole = new TokenRole("params");
 
 		#region PatternPlaceholder
 		public static implicit operator ParameterDeclaration?(PatternMatching.Pattern pattern)
@@ -92,17 +95,14 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
 		}
 		#endregion
 
-		public override NodeType NodeType {
+		public override NodeType NodeType => NodeType.Unknown;
-			get {
-				return NodeType.Unknown;
-			}
-		}
 
 		public AstNodeCollection<AttributeSection> Attributes {
 			get { return GetChildrenByRole(AttributeRole); }
 		}
 
 		bool hasThisModifier;
+		bool isRefScoped, isValueScoped;
 
 		public CSharpTokenNode ThisKeyword {
 			get {
@@ -122,6 +122,22 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
 			}
 		}
 
+		public bool IsRefScoped {
+			get { return isRefScoped; }
+			set {
+				ThrowIfFrozen();
+				isRefScoped = value;
+			}
+		}
+
+		public bool IsValueScoped {
+			get { return isValueScoped; }
+			set {
+				ThrowIfFrozen();
+				isValueScoped = value;
+			}
+		}
+
 		ParameterModifier parameterModifier;
 
 		public ParameterModifier ParameterModifier {

ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs

@@ -1649,6 +1649,8 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
 			{
 				decl.ParameterModifier = ParameterModifier.Params;
 			}
+			decl.IsRefScoped = parameter.Lifetime.RefScoped;
+			decl.IsValueScoped = parameter.Lifetime.ValueScoped;
 			if (ShowAttributes)
 			{
 				decl.Attributes.AddRange(ConvertAttributes(parameter.GetAttributes()));

ICSharpCode.Decompiler/DecompilerSettings.cs

@@ -150,12 +150,13 @@ namespace ICSharpCode.Decompiler
 			if (languageVersion < CSharp.LanguageVersion.CSharp11_0)
 			{
 				parameterNullCheck = false;
+				lifetimeAnnotations = false;
 			}
 		}
 
 		public CSharp.LanguageVersion GetMinimumRequiredVersion()
 		{
-			if (parameterNullCheck)
+			if (parameterNullCheck || lifetimeAnnotations)
 				return CSharp.LanguageVersion.CSharp11_0;
 			if (fileScopedNamespaces || recordStructs)
 				return CSharp.LanguageVersion.CSharp10_0;
@@ -336,6 +337,25 @@ namespace ICSharpCode.Decompiler
 			}
 		}
 
+		bool lifetimeAnnotations = true;
+
+		/// <summary>
+		/// Use C# 9 <c>delegate* unmanaged</c> types.
+		/// If this option is disabled, function pointers will instead be decompiled with type `IntPtr`.
+		/// </summary>
+		[Category("C# 11.0 / VS 2022.4")]
+		[Description("DecompilerSettings.LifetimeAnnotations")]
+		public bool LifetimeAnnotations {
+			get { return lifetimeAnnotations; }
+			set {
+				if (lifetimeAnnotations != value)
+				{
+					lifetimeAnnotations = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		bool switchExpressions = true;
 
 		/// <summary>

ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs

@@ -120,11 +120,16 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		/// </summary>
 		FunctionPointers = 0x2000,
 		/// <summary>
+		/// Allow C# 11 scoped annotation. If this option is not enabled, LifetimeAnnotationAttribute
+		/// will be reported as custom attribute.
+		/// </summary>
+		LifetimeAnnotations = 0x4000,
+		/// <summary>
 		/// Default settings: typical options for the decompiler, with all C# languages features enabled.
 		/// </summary>
 		Default = Dynamic | Tuple | ExtensionMethods | DecimalConstants | ReadOnlyStructsAndParameters
 			| RefStructs | UnmanagedConstraints | NullabilityAnnotations | ReadOnlyMethods
-			| NativeIntegers | FunctionPointers
+			| NativeIntegers | FunctionPointers | LifetimeAnnotations
 	}
 
 	/// <summary>
@@ -160,6 +165,8 @@ namespace ICSharpCode.Decompiler.TypeSystem
 				typeSystemOptions |= TypeSystemOptions.NativeIntegers;
 			if (settings.FunctionPointers)
 				typeSystemOptions |= TypeSystemOptions.FunctionPointers;
+			if (settings.LifetimeAnnotations)
+				typeSystemOptions |= TypeSystemOptions.LifetimeAnnotations;
 			return typeSystemOptions;
 		}
 

ICSharpCode.Decompiler/TypeSystem/IParameter.cs

@@ -26,7 +26,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
 	/// <remarks>
 	/// Should match order in <see cref="CSharp.Syntax.FieldDirection"/>.
 	/// </remarks>
-	public enum ReferenceKind
+	public enum ReferenceKind : byte
 	{
 		None,
 		Out,
@@ -34,6 +34,12 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		In
 	}
 
+	public struct LifetimeAnnotation
+	{
+		public bool RefScoped;
+		public bool ValueScoped;
+	}
+
 	public interface IParameter : IVariable
 	{
 		/// <summary>
@@ -46,6 +52,11 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		/// </summary>
 		ReferenceKind ReferenceKind { get; }
 
+		/// <summary>
+		/// C# 11 scoped annotation.
+		/// </summary>
+		LifetimeAnnotation Lifetime { get; }
+
 		/// <summary>
 		/// Gets whether this parameter is a C# 'ref' parameter.
 		/// </summary>

ICSharpCode.Decompiler/TypeSystem/Implementation/AttributeListBuilder.cs

@@ -246,6 +246,9 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 						case "NullableContextAttribute":
 							return (options & TypeSystemOptions.NullabilityAnnotations) != 0
 								&& (target == SymbolKind.TypeDefinition || IsMethodLike(target));
+						case "LifetimeAnnotationAttribute":
+							return (options & TypeSystemOptions.LifetimeAnnotations) != 0
+								&& (target == SymbolKind.Parameter);
 						default:
 							return false;
 					}

ICSharpCode.Decompiler/TypeSystem/Implementation/DefaultParameter.cs

@@ -100,6 +100,8 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			get { return IsOptional; }
 		}
 
+		public LifetimeAnnotation Lifetime => default;
+
 		public object GetConstantValue(bool throwOnInvalidMetadata)
 		{
 			return defaultValue;

ICSharpCode.Decompiler/TypeSystem/Implementation/KnownAttributes.cs

@@ -91,6 +91,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		CallerMemberName,
 		CallerFilePath,
 		CallerLineNumber,
+		LifetimeAnnotation,
 
 		// Type parameter attributes:
 		IsUnmanaged,
@@ -162,6 +163,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
 			new TopLevelTypeName("System.Runtime.CompilerServices", nameof(CallerMemberNameAttribute)),
 			new TopLevelTypeName("System.Runtime.CompilerServices", nameof(CallerFilePathAttribute)),
 			new TopLevelTypeName("System.Runtime.CompilerServices", nameof(CallerLineNumberAttribute)),
+			new TopLevelTypeName("System.Runtime.CompilerServices", "LifetimeAnnotationAttribute"),
 			// Type parameter attributes:
 			new TopLevelTypeName("System.Runtime.CompilerServices", "IsUnmanagedAttribute"),
 			// Marshalling attributes:

ICSharpCode.Decompiler/TypeSystem/Implementation/MetadataParameter.cs

@@ -106,6 +106,38 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 			return ReferenceKind.Ref;
 		}
 
+		public LifetimeAnnotation Lifetime {
+			get {
+				if ((module.TypeSystemOptions & TypeSystemOptions.LifetimeAnnotations) == 0)
+				{
+					return default;
+				}
+
+				var metadata = module.metadata;
+				var parameterDef = metadata.GetParameter(handle);
+				foreach (var h in parameterDef.GetCustomAttributes())
+				{
+					var custom = metadata.GetCustomAttribute(h);
+					if (!custom.IsKnownAttribute(metadata, KnownAttribute.LifetimeAnnotation))
+						continue;
+
+					var value = custom.DecodeValue(module.TypeProvider);
+					if (value.FixedArguments.Length != 2)
+						continue;
+					if (value.FixedArguments[0].Value is bool refScoped
+						&& value.FixedArguments[1].Value is bool valueScoped)
+					{
+						return new LifetimeAnnotation {
+							RefScoped = refScoped,
+							ValueScoped = valueScoped
+						};
+					}
+				}
+
+				return default;
+			}
+		}
+
 		public bool IsParams {
 			get {
 				if (Type.Kind != TypeKind.Array)

ICSharpCode.Decompiler/TypeSystem/Implementation/SpecializedParameter.cs

@@ -51,6 +51,8 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
 		object IVariable.GetConstantValue(bool throwOnInvalidMetadata) => baseParameter.GetConstantValue(throwOnInvalidMetadata);
 		SymbolKind ISymbol.SymbolKind => SymbolKind.Parameter;
 
+		public LifetimeAnnotation Lifetime => baseParameter.Lifetime;
+
 		public override string ToString()
 		{
 			return DefaultParameter.ToString(this);

ILSpy/Languages/CSharpHighlightingTokenWriter.cs

@@ -262,6 +262,7 @@ namespace ICSharpCode.ILSpy
 				case "params":
 				case "ref":
 				case "out":
+				case "scoped":
 					color = parameterModifierColor;
 					break;
 				case "break":

ILSpy/Languages/CSharpLanguage.cs

@@ -115,7 +115,7 @@ namespace ICSharpCode.ILSpy
 						new LanguageVersion(Decompiler.CSharp.LanguageVersion.CSharp8_0.ToString(), "C# 8.0 / VS 2019"),
 						new LanguageVersion(Decompiler.CSharp.LanguageVersion.CSharp9_0.ToString(), "C# 9.0 / VS 2019.8"),
 						new LanguageVersion(Decompiler.CSharp.LanguageVersion.CSharp10_0.ToString(), "C# 10.0 / VS 2022"),
-						new LanguageVersion(Decompiler.CSharp.LanguageVersion.CSharp11_0.ToString(), "C# 11.0 / VS 2022.1"),
+						new LanguageVersion(Decompiler.CSharp.LanguageVersion.CSharp11_0.ToString(), "C# 11.0 / VS 2022.4"),
 					};
 				}
 				return versions;

ILSpy/Properties/Resources.Designer.cs

@@ -1073,6 +1073,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;scoped&apos; lifetime annotation.
+        /// </summary>
+        public static string DecompilerSettings_LifetimeAnnotations {
+            get {
+                return ResourceManager.GetString("DecompilerSettings.LifetimeAnnotations", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Use nint/nuint types.
         /// </summary>
@@ -1164,7 +1173,7 @@ namespace ICSharpCode.ILSpy.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Records.
+        ///   Looks up a localized string similar to Record classes.
         /// </summary>
         public static string DecompilerSettings_RecordClasses {
             get {
@@ -1172,6 +1181,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Record structs.
+        /// </summary>
+        public static string DecompilerSettings_RecordStructs {
+            get {
+                return ResourceManager.GetString("DecompilerSettings.RecordStructs", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Remove dead and side effect free code (use with caution!).
         /// </summary>

ILSpy/Properties/Resources.resx

@@ -381,6 +381,9 @@ Are you sure you want to continue?</value>
   <data name="DecompilerSettings.IsUnmanagedAttributeOnTypeParametersShouldBeReplacedWithUnmanagedConstraints" xml:space="preserve">
     <value>IsUnmanagedAttribute on type parameters should be replaced with 'unmanaged' constraints</value>
   </data>
+  <data name="DecompilerSettings.LifetimeAnnotations" xml:space="preserve">
+    <value>'scoped' lifetime annotation</value>
+  </data>
   <data name="DecompilerSettings.NativeIntegers" xml:space="preserve">
     <value>Use nint/nuint types</value>
   </data>
@@ -412,7 +415,10 @@ Are you sure you want to continue?</value>
     <value>Read-only methods</value>
   </data>
   <data name="DecompilerSettings.RecordClasses" xml:space="preserve">
-    <value>Records</value>
+    <value>Record classes</value>
+  </data>
+  <data name="DecompilerSettings.RecordStructs" xml:space="preserve">
+    <value>Record structs</value>
   </data>
   <data name="DecompilerSettings.RemoveDeadAndSideEffectFreeCodeUseWithCaution" xml:space="preserve">
     <value>Remove dead and side effect free code (use with caution!)</value>