diff --git a/ILSpy/Analyzers/AnalyzerSearchTreeNode.cs b/ILSpy/Analyzers/AnalyzerSearchTreeNode.cs index 802d56403..157607d1c 100644 --- a/ILSpy/Analyzers/AnalyzerSearchTreeNode.cs +++ b/ILSpy/Analyzers/AnalyzerSearchTreeNode.cs @@ -54,6 +54,7 @@ namespace ICSharpCode.ILSpy.Analyzers var ts = new DecompilerTypeSystem(module, module.GetAssemblyResolver()); var context = new AnalyzerContext(ts) { CancellationToken = ct, + Language = Language, CodeMappingInfo = Language.GetCodeMappingInfo(module, analyzedEntity.MetadataToken) }; foreach (var result in entityAnalyzer.Analyze(analyzedEntity, context)) { diff --git a/ILSpy/Analyzers/IAnalyzer.cs b/ILSpy/Analyzers/IAnalyzer.cs index c73ef3d65..dee96c0ba 100644 --- a/ILSpy/Analyzers/IAnalyzer.cs +++ b/ILSpy/Analyzers/IAnalyzer.cs @@ -44,5 +44,6 @@ namespace ICSharpCode.ILSpy.Analyzers public IDecompilerTypeSystem TypeSystem { get; } public CancellationToken CancellationToken { get; internal set; } public CodeMappingInfo CodeMappingInfo { get; internal set; } + public Language Language { get; internal set; } } } diff --git a/ILSpy/Analyzers/ScopedWhereUsedAnalyzer.cs b/ILSpy/Analyzers/ScopedWhereUsedAnalyzer.cs index e346de9a5..676f6a3cc 100644 --- a/ILSpy/Analyzers/ScopedWhereUsedAnalyzer.cs +++ b/ILSpy/Analyzers/ScopedWhereUsedAnalyzer.cs @@ -113,7 +113,7 @@ namespace ICSharpCode.ILSpy.Analyzers IEnumerable FindReferencesInAssembly(PEFile module, CancellationToken ct) { var ts = new DecompilerTypeSystem(module, module.GetAssemblyResolver()); - var context = new AnalyzerContext(ts) { CancellationToken = ct }; + var context = new AnalyzerContext(ts) { CancellationToken = ct, Language = language }; foreach (var type in ts.MainAssembly.TypeDefinitions) { ct.ThrowIfCancellationRequested(); if (type.MetadataToken.IsNil) continue; @@ -128,7 +128,7 @@ namespace ICSharpCode.ILSpy.Analyzers IEnumerable FindReferencesInTypeScope(CancellationToken ct) { var ts = new DecompilerTypeSystem(assemblyScope.PEFile, assemblyScope.PEFile.GetAssemblyResolver()); - var context = new AnalyzerContext(ts) { CancellationToken = ct }; + var context = new AnalyzerContext(ts) { CancellationToken = ct, Language = language }; var types = TreeTraversal.PreOrder(typeScope, t => t.GetNestedTypes(options: GetMemberOptions.IgnoreInheritedMembers | GetMemberOptions.ReturnMemberDefinitions) .Select(td => td.GetDefinition())); @@ -146,7 +146,7 @@ namespace ICSharpCode.ILSpy.Analyzers IEnumerable FindReferencesInEnclosingTypeScope(CancellationToken ct) { var ts = new DecompilerTypeSystem(assemblyScope.PEFile, assemblyScope.PEFile.GetAssemblyResolver()); - var context = new AnalyzerContext(ts) { CancellationToken = ct }; + var context = new AnalyzerContext(ts) { CancellationToken = ct, Language = language }; var types = TreeTraversal.PreOrder(typeScope.DeclaringTypeDefinition, t => t.GetNestedTypes(options: GetMemberOptions.IgnoreInheritedMembers | GetMemberOptions.ReturnMemberDefinitions) .Select(td => td.GetDefinition()));