Analyzers/AnalyzerScope loops endlessly when analysing public inner c…

…lass

ILSpy.Tests/Analyzers/AnalyserScopeTests.cs

@@ -0,0 +1,52 @@
+using System.Linq;
+using System.Threading.Tasks;
+
+using ICSharpCode.Decompiler;
+using ICSharpCode.Decompiler.CSharp.Resolver;
+using ICSharpCode.Decompiler.Metadata;
+using ICSharpCode.Decompiler.TypeSystem;
+using ICSharpCode.ILSpy.Analyzers;
+
+using Mono.Cecil;
+
+using NUnit.Framework;
+
+namespace ICSharpCode.ILSpy.Tests.Analyzers
+{
+
+	[TestFixture]
+	public class AnalyzerScopeTests
+	{
+		public class TestClass
+		{
+
+		}
+
+
+		[Test]
+		public void WhenPublicNestedClass_ThenNotInfiniteLoop()
+		{
+			// Given
+			ILSpyX.AssemblyList assemblyList = new ILSpyX.AssemblyList();
+			var file = new PEFile(this.GetType().Assembly.Location);
+			var td = file.Metadata.TypeDefinitions.First(td => td.GetFullTypeName(file.Metadata).Name == nameof(TestClass));
+
+			Decompiler.Metadata.IAssemblyResolver assemblyResolver = new UniversalAssemblyResolver(null, false, null);
+			ICompilation compilation = new DecompilerTypeSystem(file, assemblyResolver);
+			ITypeResolveContext context = new CSharpResolver(compilation);
+			var module = ((IModuleReference)file).Resolve(context) as MetadataModule;
+			IEntity entity = module.GetDefinition(td);
+
+			// When 
+			var task = Task.Run(() => {
+				var target = new AnalyzerScope(assemblyList, entity);
+			});
+
+			var result = Task.WaitAny(new[] { task, Task.Delay(500) }); // 0.5 seconds
+
+			// Then
+			Assert.That(result == 0, "The constructor should completes in no longer than 10 seconds");
+		}
+
+	}
+}

ILSpy.Tests/ILSpy.Tests.csproj

@@ -34,6 +34,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="Analyzers\AnalyserScopeTests.cs" />
     <Compile Include="Analyzers\MemberImplementsInterfaceAnalyzerTests.cs" />
     <Compile Include="Analyzers\MethodUsesAnalyzerTests.cs" />
     <Compile Include="Analyzers\TestCases\MainAssembly.cs" />

ILSpy/Analyzers/AnalyzerScope.cs

@@ -122,7 +122,7 @@ static void DetermineEffectiveAccessibility(IEntity input, out ITypeDefinition t
 			while (typeScope != null && !accessibility.LessThanOrEqual(Accessibility.Private))
 			{
 				accessibility = accessibility.Intersect(typeScope.Accessibility);
-				typeScope = prevTypeScope.DeclaringTypeDefinition;
+				typeScope = typeScope.DeclaringTypeDefinition;
 			}
 			if (typeScope == null)
 			{