From 71173337fcc908feaaf3cfcffeaaa3f88f047d1d Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sun, 4 May 2025 22:41:04 +0200
Subject: [PATCH] Fixup 1st commit

---
 .../IdentifierExpressionBackreference.cs      | 10 +++++-----
 .../ICSharpCode.Decompiler.csproj             | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)
 rename ICSharpCode.Decompiler/CSharp/Syntax/{ => PatternMatching}/IdentifierExpressionBackreference.cs (84%)

diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/IdentifierExpressionBackreference.cs
similarity index 84%
rename from ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs
rename to ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/IdentifierExpressionBackreference.cs
index 78ee9359d..0975b686a 100644
--- a/ICSharpCode.Decompiler/CSharp/Syntax/IdentifierExpressionBackreference.cs
+++ b/ICSharpCode.Decompiler/CSharp/Syntax/PatternMatching/IdentifierExpressionBackreference.cs
@@ -19,12 +19,12 @@
 using System;
 using System.Linq;
 
-namespace ICSharpCode.Decompiler.CSharp.Syntax
+namespace ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching
 {
 	/// <summary>
 	/// Matches identifier expressions that have the same identifier as the referenced variable/type definition/method definition.
 	/// </summary>
-	public class IdentifierExpressionBackreference : PatternMatching.Pattern
+	public class IdentifierExpressionBackreference : Pattern
 	{
 		readonly string referencedGroupName;
 
@@ -39,12 +39,12 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
 			this.referencedGroupName = referencedGroupName;
 		}
 
-		public override bool DoMatch(PatternMatching.INode other, PatternMatching.Match match)
+		public override bool DoMatch(INode other, Match match)
 		{
-			IdentifierExpression ident = other as IdentifierExpression;
+			var ident = other as IdentifierExpression;
 			if (ident == null || ident.TypeArguments.Any())
 				return false;
-			AstNode referenced = (AstNode)match.Get(referencedGroupName).Last();
+			var referenced = (AstNode)match.Get(referencedGroupName).Last();
 			if (referenced == null)
 				return false;
 			return ident.Identifier == referenced.GetChildByRole(Roles.Identifier).Name;
diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
index 23a46a09a..07b13a6d1 100644
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
@@ -28,7 +28,7 @@
     <GenerateAssemblyInformationalVersionAttribute>False</GenerateAssemblyInformationalVersionAttribute>
 
     <EnableDefaultItems>false</EnableDefaultItems>
-    <LangVersion>11</LangVersion>
+    <LangVersion>preview</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
@@ -99,6 +99,11 @@
     <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[8.0.0]" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\ICSharpCode.Decompiler.Generators\ICSharpCode.Decompiler.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ICSharpCode.Decompiler.Generators.Attributes\ICSharpCode.Decompiler.Generators.Attributes.csproj" OutputItemType="Analyzer" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="CSharp\Annotations.cs" />
     <Compile Include="CSharp\CallBuilder.cs" />
@@ -108,6 +113,11 @@
     <Compile Include="Disassembler\IEntityProcessor.cs" />
     <Compile Include="Disassembler\SortByNameProcessor.cs" />
     <Compile Include="IL\Transforms\RemoveUnconstrainedGenericReferenceTypeCheck.cs" />
+    <Compile Include="IL\Instructions.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Instructions.tt</DependentUpon>
+    </Compile>
     <Compile Include="Metadata\MetadataFile.cs" />
     <Compile Include="Metadata\ModuleReferenceMetadata.cs" />
     <Compile Include="NRTAttributes.cs" />
@@ -227,7 +237,7 @@
     <Compile Include="CSharp\Syntax\GeneralScope\UsingDeclaration.cs" />
     <Compile Include="CSharp\Syntax\IAstVisitor.cs" />
     <Compile Include="CSharp\Syntax\Identifier.cs" />
-    <Compile Include="CSharp\Syntax\IdentifierExpressionBackreference.cs" />
+    <Compile Include="CSharp\Syntax\PatternMatching\IdentifierExpressionBackreference.cs" />
     <Compile Include="CSharp\Syntax\MemberType.cs" />
     <Compile Include="CSharp\Syntax\Modifiers.cs" />
     <Compile Include="CSharp\Syntax\NodeType.cs" />
@@ -505,11 +515,6 @@
     <Compile Include="IL\ControlFlow\LoopDetection.cs" />
     <Compile Include="IL\ControlFlow\SwitchAnalysis.cs" />
     <Compile Include="IL\ControlFlow\SwitchDetection.cs" />
-    <Compile Include="IL\Instructions.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Instructions.tt</DependentUpon>
-    </Compile>
     <Compile Include="IL\Instructions\Comp.cs" />
     <Compile Include="IL\Instructions\BinaryNumericInstruction.cs" />
     <Compile Include="IL\Instructions\Block.cs" />