Added a support for instructions.

Assembly stats are now hidden when no assembly is opened.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6386 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj

@@ -113,13 +113,13 @@
     <Compile Include="Src\Controls\DependencyEdge.cs" />
     <Compile Include="Src\Controls\DependencyGraph.cs" />
     <Compile Include="Src\Controls\DependencyGraphLayout.cs" />
-    <Compile Include="Src\Controls\DependencyMatrixControl.cs" />
-    <Compile Include="Src\Controls\DependencyMatrix.cs" />
+    <Compile Include="Src\Controls\DependencyMatrixControl.cs">
+      <SubType>Component</SubType>    </Compile>    <Compile Include="Src\Controls\DependencyMatrix.cs" />
     <Compile Include="Src\Controls\DependencyVertex.cs" />
     <Compile Include="Src\Controls\DependencyIconVertexConverter.cs" />
     <Compile Include="Src\Controls\Matrix.cs" />
-    <Compile Include="Src\Controls\MatrixControl.cs" />
-    <Compile Include="Src\Controls\TreeMatrixControl.xaml.cs">
+    <Compile Include="Src\Controls\MatrixControl.cs">
+      <SubType>Component</SubType>    </Compile>    <Compile Include="Src\Controls\TreeMatrixControl.xaml.cs">
       <DependentUpon>TreeMatrixControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
@@ -127,7 +127,7 @@
     <Compile Include="Src\Event.cs" />
     <Compile Include="Src\Field.cs" />
     <Compile Include="Src\INode.cs" />
-    <Compile Include="Src\NodeIconService.cs" />
+    <Compile Include="Src\Instruction.cs" />    <Compile Include="Src\NodeIconService.cs" />
     <Compile Include="Src\IDependency.cs" />
     <Compile Include="Src\MetricsReader.cs" />
     <Compile Include="Src\Method.cs" />

src/AddIns/Analysis/CodeQuality/Src/Instruction.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ICSharpCode.CodeQualityAnalysis
+{
+	public class Instruction
+	{
+		public Method DeclaringMethod { get; set; }
+		public string Operand { get; set; }
+	}
+}

src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml

@@ -113,7 +113,7 @@
 					<ProgressBar IsIndeterminate="True" Width="95" Height="15" />
 				</StackPanel>
 			</StatusBarItem>
-			<StatusBarItem HorizontalAlignment="Right">
+			<StatusBarItem HorizontalAlignment="Right" x:Name="assemblyStats" Visibility="Hidden">
 				<StackPanel Orientation="Horizontal">
 					<StatusBarItem>
 						<StackPanel Orientation="Horizontal">
@@ -142,7 +142,7 @@
 					<StatusBarItem>
 						<StackPanel Orientation="Horizontal">
 							<TextBlock Text="IL instructions: " />
-							<TextBlock Text="TBD" />
+							<TextBlock Text="{Binding Path=MetricsReader.MainModule.InstructionsCount}" />
 						</StackPanel>
 					</StatusBarItem>
 				</StackPanel>

src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml.cs

@@ -34,10 +34,10 @@ namespace ICSharpCode.CodeQualityAnalysis
 		private MetricsReader metricsReader;
 		public event PropertyChangedEventHandler PropertyChanged;
 		
-		public MetricsReader MetricsReader 
-		{ 
+		public MetricsReader MetricsReader
+		{
 			get
-			{ 
+			{
 				return metricsReader;
 			}
 			
@@ -54,10 +54,10 @@ namespace ICSharpCode.CodeQualityAnalysis
 		}
 		
 		private void NotifyPropertyChanged(string propertyName)
-        {
-            if (PropertyChanged != null)
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-        }
+		{
+			if (PropertyChanged != null)
+				PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+		}
 
 		private void btnOpenAssembly_Click(object sender, RoutedEventArgs e)
 		{
@@ -72,12 +72,14 @@ namespace ICSharpCode.CodeQualityAnalysis
 				return;
 			
 			progressBar.Visibility = Visibility.Visible;
+			assemblyStats.Visibility = Visibility.Hidden;
 			fileAssemblyLoading.Text = System.IO.Path.GetFileName(fileDialog.FileName);
 			
 			var worker = new BackgroundWorker();
-			worker.DoWork += (source, args) => MetricsReader = new MetricsReader(fileDialog.FileName);			
-			worker.RunWorkerCompleted += (source, args) => { 
+			worker.DoWork += (source, args) => MetricsReader = new MetricsReader(fileDialog.FileName);
+			worker.RunWorkerCompleted += (source, args) => {
 				progressBar.Visibility = Visibility.Hidden;
+				assemblyStats.Visibility = Visibility.Visible;
 				FillMatrix();
 			};
 			

src/AddIns/Analysis/CodeQuality/Src/Method.cs

@@ -9,207 +9,213 @@ using QuickGraph;
 
 namespace ICSharpCode.CodeQualityAnalysis
 {
-    public class Method : INode
-    {
-        /// <summary>
-        /// Parameters which are used by method
-        /// </summary>
-        public ISet<MethodParameter> Parameters { get; private set; }
-
-        /// <summary>
-        /// Types which are used in body of method
-        /// </summary>
-        public ISet<Type> TypeUses { get; private set; }
-
-        /// <summary>
-        /// Methods which are called in body of method
-        /// </summary>
-        public ISet<Method> MethodUses { get; private set; }
-
-        /// <summary>
-        /// Fields which are accesed in body of method
-        /// </summary>
-        public ISet<Field> FieldUses { get; private set; }
-        
-        /// <summary>
-        /// A name of method
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// A return type of method
-        /// </summary>
-        public Type ReturnType { get; set; }
-
-        /// <summary>
-        /// Type which owns this method
-        /// </summary>
-        public Type Owner { get; set; }
-
-        /// <summary>
-        /// Whether the method is constructor or not
-        /// </summary>
-        public bool IsConstructor { get; set; }
-
-        /// <summary>
-        /// Whether the method is public
-        /// </summary>
-        public bool IsPublic { get; set; }
-
-        /// <summary>
-        /// Whether the method is private
-        /// </summary>
-        public bool IsPrivate { get; set; }
-
-        /// <summary>
-        /// Whether the method is protected
-        /// </summary>
-        public bool IsProtected { get; set; }
-
-        /// <summary>
-        /// Whether the method is static
-        /// </summary>
-        public bool IsStatic { get; set; }
-
-        /// <summary>
-        /// Whether the method is sealed
-        /// </summary>
-        public bool IsSealed { get; set; }
-
-        /// <summary>
-        /// Whether the method is abstract
-        /// </summary>
-        public bool IsAbstract { get; set; }
-
-        /// <summary>
-        /// Whether the method is setter
-        /// </summary>
-        public bool IsSetter { get; set; }
-
-        /// <summary>
-        /// Whether the method is getter
-        /// </summary>
-        public bool IsGetter { get; set; }
-
-        /// <summary>
-        /// Whether the method is virtual
-        /// </summary>
-        public bool IsVirtual { get; set; }
-
-        /// <summary>
-        /// If the return type is generic instance so all types used in generic are presented in this set.
-        /// </summary>
-        public ISet<Type> GenericReturnTypes { get; private set; }
-
-        /// <summary>
-        /// Whether the return type is generic instance
-        /// </summary>
-        public bool IsReturnTypeGenericInstance { get; set; }
-
-        public Method()
-        {
-            Parameters = new HashSet<MethodParameter>();
-
-            TypeUses = new HashSet<Type>();
-            MethodUses = new HashSet<Method>();
-            FieldUses = new HashSet<Field>();
-            GenericReturnTypes = new HashSet<Type>();
-
-            ReturnType = null;
-            Owner = null;
-
-            IsReturnTypeGenericInstance = false;
-
-            Dependency = null;
-        }
-        
-        public Relationship GetRelationship(INode node)
-        {
-        	Relationship relationship = new Relationship();
-        	return relationship;
-        }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-
-        public IDependency Dependency { get; set; }
-
-        public string GetInfo()
-        {
-            var builder = new StringBuilder();
-            builder.AppendLine("Method Summary");
-            builder.Append(Environment.NewLine);
-            builder.AppendLine(String.Format("Name: {0}", Name));
-            builder.AppendLine(String.Format("Parameters: {0}", Parameters.Count));
-            // more to come
-
-            builder.Append(Environment.NewLine);
-
-            if (IsAbstract)
-                builder.AppendLine("IsAbstract");
-            if (IsConstructor)
-                builder.AppendLine("IsConstructor");
-            if (IsGetter)
-                builder.AppendLine("IsGetter");
-            if (IsSetter)
-                builder.AppendLine("IsSetter");
-            if (IsPrivate)
-                builder.AppendLine("IsPrivate");
-            if (IsProtected)
-                builder.AppendLine("IsProtected");
-            if (IsPublic)
-                builder.AppendLine("IsPublic");
-            if (IsSealed)
-                builder.AppendLine("IsSealed");
-            if (IsStatic)
-                builder.AppendLine("IsStatic");
-            if (IsVirtual)
-                builder.AppendLine("IsVirtual");
-
-            return builder.ToString();
-        }
-        
-        public BitmapSource Icon { get { return NodeIconService.GetIcon(this); } }
-    }
-
-    public class MethodParameter
-    {
-        /// <summary>
-        /// The type of the parameter
-        /// </summary>
-        public Type ParameterType { get; set; }
-
-        /// <summary>
-        /// Whether the parameter is generic instance
-        /// </summary>
-        public bool IsGenericInstance { get; set; }
-
-        /// <summary>
-        /// Whether the parameter is in
-        /// </summary>
-        public bool IsIn { get; set; }
-
-        /// <summary>
-        /// Whether the parameter is out
-        /// </summary>
-        public bool IsOut { get; set; }
-
-        /// <summary>
-        /// Whether the parameter is optional
-        /// </summary>
-        public bool IsOptional { get; set; }
-
-        /// <summary>
-        /// If the parameter is generic instance so all types used in generic are presented in this set.
-        /// </summary>
-        public ISet<Type> GenericTypes { get; set; }
-
-        public MethodParameter()
-        {
-            GenericTypes = new HashSet<Type>();
-            IsGenericInstance = false;
-        }
-    }
+	public class Method : INode
+	{
+		/// <summary>
+		/// Parameters which are used by method
+		/// </summary>
+		public ISet<MethodParameter> Parameters { get; private set; }
+
+		/// <summary>
+		/// Types which are used in body of method
+		/// </summary>
+		public ISet<Type> TypeUses { get; private set; }
+
+		/// <summary>
+		/// Methods which are called in body of method
+		/// </summary>
+		public ISet<Method> MethodUses { get; private set; }
+
+		/// <summary>
+		/// Fields which are accesed in body of method
+		/// </summary>
+		public ISet<Field> FieldUses { get; private set; }
+
+		/// <summary>
+		/// Instructions inside of the method
+		/// </summary>
+		public ISet<Instruction> Instructions { get; private set; }
+		
+		/// <summary>
+		/// A name of method
+		/// </summary>
+		public string Name { get; set; }
+
+		/// <summary>
+		/// A return type of method
+		/// </summary>
+		public Type ReturnType { get; set; }
+
+		/// <summary>
+		/// Type which owns this method
+		/// </summary>
+		public Type Owner { get; set; }
+
+		/// <summary>
+		/// Whether the method is constructor or not
+		/// </summary>
+		public bool IsConstructor { get; set; }
+
+		/// <summary>
+		/// Whether the method is public
+		/// </summary>
+		public bool IsPublic { get; set; }
+
+		/// <summary>
+		/// Whether the method is private
+		/// </summary>
+		public bool IsPrivate { get; set; }
+
+		/// <summary>
+		/// Whether the method is protected
+		/// </summary>
+		public bool IsProtected { get; set; }
+
+		/// <summary>
+		/// Whether the method is static
+		/// </summary>
+		public bool IsStatic { get; set; }
+
+		/// <summary>
+		/// Whether the method is sealed
+		/// </summary>
+		public bool IsSealed { get; set; }
+
+		/// <summary>
+		/// Whether the method is abstract
+		/// </summary>
+		public bool IsAbstract { get; set; }
+
+		/// <summary>
+		/// Whether the method is setter
+		/// </summary>
+		public bool IsSetter { get; set; }
+
+		/// <summary>
+		/// Whether the method is getter
+		/// </summary>
+		public bool IsGetter { get; set; }
+
+		/// <summary>
+		/// Whether the method is virtual
+		/// </summary>
+		public bool IsVirtual { get; set; }
+
+		/// <summary>
+		/// If the return type is generic instance so all types used in generic are presented in this set.
+		/// </summary>
+		public ISet<Type> GenericReturnTypes { get; private set; }
+
+		/// <summary>
+		/// Whether the return type is generic instance
+		/// </summary>
+		public bool IsReturnTypeGenericInstance { get; set; }
+
+		public Method()
+		{
+			Parameters = new HashSet<MethodParameter>();
+
+			TypeUses = new HashSet<Type>();
+			MethodUses = new HashSet<Method>();
+			FieldUses = new HashSet<Field>();
+			Instructions = new HashSet<Instruction>();
+			GenericReturnTypes = new HashSet<Type>();
+
+			ReturnType = null;
+			Owner = null;
+
+			IsReturnTypeGenericInstance = false;
+
+			Dependency = null;
+		}
+		
+		public Relationship GetRelationship(INode node)
+		{
+			Relationship relationship = new Relationship();
+			return relationship;
+		}
+
+		public override string ToString()
+		{
+			return Name;
+		}
+
+		public IDependency Dependency { get; set; }
+
+		public string GetInfo()
+		{
+			var builder = new StringBuilder();
+			builder.AppendLine("Method Summary");
+			builder.Append(Environment.NewLine);
+			builder.AppendLine(String.Format("Name: {0}", Name));
+			builder.AppendLine(String.Format("Parameters: {0}", Parameters.Count));
+			// more to come
+
+			builder.Append(Environment.NewLine);
+
+			if (IsAbstract)
+				builder.AppendLine("IsAbstract");
+			if (IsConstructor)
+				builder.AppendLine("IsConstructor");
+			if (IsGetter)
+				builder.AppendLine("IsGetter");
+			if (IsSetter)
+				builder.AppendLine("IsSetter");
+			if (IsPrivate)
+				builder.AppendLine("IsPrivate");
+			if (IsProtected)
+				builder.AppendLine("IsProtected");
+			if (IsPublic)
+				builder.AppendLine("IsPublic");
+			if (IsSealed)
+				builder.AppendLine("IsSealed");
+			if (IsStatic)
+				builder.AppendLine("IsStatic");
+			if (IsVirtual)
+				builder.AppendLine("IsVirtual");
+
+			return builder.ToString();
+		}
+		
+		public BitmapSource Icon { get { return NodeIconService.GetIcon(this); } }
+	}
+
+	public class MethodParameter
+	{
+		/// <summary>
+		/// The type of the parameter
+		/// </summary>
+		public Type ParameterType { get; set; }
+
+		/// <summary>
+		/// Whether the parameter is generic instance
+		/// </summary>
+		public bool IsGenericInstance { get; set; }
+
+		/// <summary>
+		/// Whether the parameter is in
+		/// </summary>
+		public bool IsIn { get; set; }
+
+		/// <summary>
+		/// Whether the parameter is out
+		/// </summary>
+		public bool IsOut { get; set; }
+
+		/// <summary>
+		/// Whether the parameter is optional
+		/// </summary>
+		public bool IsOptional { get; set; }
+
+		/// <summary>
+		/// If the parameter is generic instance so all types used in generic are presented in this set.
+		/// </summary>
+		public ISet<Type> GenericTypes { get; set; }
+
+		public MethodParameter()
+		{
+			GenericTypes = new HashSet<Type>();
+			IsGenericInstance = false;
+		}
+	}
 }

src/AddIns/Analysis/CodeQuality/Src/MetricsReader.cs

@@ -131,19 +131,19 @@ namespace ICSharpCode.CodeQualityAnalysis
 				IsStruct = typeDefinition.IsValueType && !typeDefinition.IsEnum && typeDefinition.IsSealed,
 				IsInternal = typeDefinition.IsNotPublic,
 				IsDelegate = (typeDefinition.BaseType != null ?
-				              typeDefinition.BaseType.FullName == "System.MulticastDelegate" : false),
+							  typeDefinition.BaseType.FullName == "System.MulticastDelegate" : false),
 				IsNestedPrivate = typeDefinition.IsNestedPrivate,
 				IsNestedPublic = typeDefinition.IsNestedPublic,
 				IsNestedProtected = (!typeDefinition.IsNestedPrivate && !typeDefinition.IsNestedPublic &&
-				                     typeDefinition.IsNestedFamily)
+									 typeDefinition.IsNestedFamily)
 			};
 
 			// try find namespace
 			var nsName = GetNamespaceName(typeDefinition);
 
 			var ns = (from n in module.Namespaces
-			          where n.Name == nsName
-			          select n).SingleOrDefault();
+					  where n.Name == nsName
+					  select n).SingleOrDefault();
 
 			if (ns == null)
 			{
@@ -182,9 +182,9 @@ namespace ICSharpCode.CodeQualityAnalysis
 					if (typeDefinition.BaseType != null)
 					{
 						var baseType = (from n in module.Namespaces
-						                from t in n.Types
-						                where (t.FullName == FormatTypeName(typeDefinition.BaseType, true))
-						                select t).SingleOrDefault();
+										from t in n.Types
+										where (t.FullName == FormatTypeName(typeDefinition.BaseType, true))
+										select t).SingleOrDefault();
 
 						type.BaseType = baseType; // if baseType is null so propably inherits from another assembly
 
@@ -192,7 +192,7 @@ namespace ICSharpCode.CodeQualityAnalysis
 						{
 							type.IsBaseTypeGenericInstance = true;
 							type.GenericBaseTypes.UnionWith(ReadGenericArguments(type.Namespace.Module,
-							                                                     (GenericInstanceType)typeDefinition.BaseType));
+																				 (GenericInstanceType)typeDefinition.BaseType));
 						}
 					}
 
@@ -202,9 +202,9 @@ namespace ICSharpCode.CodeQualityAnalysis
 						foreach (var ic in typeDefinition.Interfaces)
 						{
 							var implementedIc = (from n in module.Namespaces
-							                     from t in n.Types
-							                     where (t.FullName == FormatTypeName(ic, true))
-							                     select t).SingleOrDefault();
+												 from t in n.Types
+												 where (t.FullName == FormatTypeName(ic, true))
+												 select t).SingleOrDefault();
 
 							if (implementedIc != null)
 								type.ImplementedInterfaces.Add(implementedIc);
@@ -212,7 +212,7 @@ namespace ICSharpCode.CodeQualityAnalysis
 							if (ic.IsGenericInstance)
 							{
 								type.GenericBaseTypes.UnionWith(ReadGenericArguments(type.Namespace.Module,
-								                                                     (GenericInstanceType)ic));
+																					 (GenericInstanceType)ic));
 							}
 						}
 					}
@@ -307,7 +307,7 @@ namespace ICSharpCode.CodeQualityAnalysis
 				{
 					field.IsGenericInstance = true;
 					field.GenericTypes.UnionWith(ReadGenericArguments(type.Namespace.Module,
-					                                                  (GenericInstanceType)fieldDefinition.FieldType));
+																	  (GenericInstanceType)fieldDefinition.FieldType));
 				}
 
 				field.FieldType = fieldType;
@@ -351,7 +351,7 @@ namespace ICSharpCode.CodeQualityAnalysis
 				{
 					method.IsReturnTypeGenericInstance = true;
 					method.GenericReturnTypes.UnionWith(ReadGenericArguments(type.Namespace.Module,
-					                                                         (GenericInstanceType) methodDefinition.ReturnType));
+																			 (GenericInstanceType) methodDefinition.ReturnType));
 				}
 
 				// reading types from parameters
@@ -378,7 +378,7 @@ namespace ICSharpCode.CodeQualityAnalysis
 						{
 							param.IsGenericInstance = true;
 							param.GenericTypes = ReadGenericArguments(type.Namespace.Module,
-							                                          (GenericInstanceType) parameter.ParameterType);
+																	  (GenericInstanceType) parameter.ParameterType);
 						}
 
 						method.Parameters.Add(param);
@@ -391,8 +391,8 @@ namespace ICSharpCode.CodeQualityAnalysis
 			foreach (MethodDefinition methodDefinition in methods)
 			{
 				var method = (from m in type.Methods
-				              where m.Name == FormatMethodName(methodDefinition)
-				              select m).SingleOrDefault();
+							  where m.Name == FormatMethodName(methodDefinition)
+							  select m).SingleOrDefault();
 
 				if (methodDefinition.Body != null)
 				{
@@ -408,36 +408,42 @@ namespace ICSharpCode.CodeQualityAnalysis
 		/// <param name="methodDefinition">A method definition with instructions</param>
 		/// <param name="instructions">A collection of instructions</param>
 		public void ReadInstructions(Method method, MethodDefinition methodDefinition,
-		                             Collection<Instruction> instructions)
+									 Collection<Mono.Cecil.Cil.Instruction> instructions)
 		{
-			foreach (Instruction instruction in instructions)
+			foreach (var instruction in instructions)
 			{
-				var instr = ReadInstruction(instruction);
+				method.Instructions.Add(new Instruction
+				                        	{
+				                        		DeclaringMethod = method,
+												// Operand = instruction.Operand.ToString() // for now operand as string should be enough
+				                        	});
 
-				if (instr is MethodDefinition)
+				var operand = ReadOperand(instruction);
+
+				if (operand is MethodDefinition)
 				{
-					var md = instr as MethodDefinition;
-                   var type = (from n in method.Owner.Namespace.Module.Namespaces
-                             from t in n.Types
-                             where t.FullName == FormatTypeName(md.DeclaringType, true)
-                             select t).SingleOrDefault();
+					var md = operand as MethodDefinition;
+					var type = (from n in method.Owner.Namespace.Module.Namespaces
+							 from t in n.Types
+							 where t.FullName == FormatTypeName(md.DeclaringType, true)
+							 select t).SingleOrDefault();
 
 					method.TypeUses.Add(type);
 
 					var findTargetMethod = (from m in type.Methods
-					                        where m.Name == FormatMethodName(md)
-					                        select m).SingleOrDefault();
+											where m.Name == FormatMethodName(md)
+											select m).SingleOrDefault();
 
 					if (findTargetMethod != null && type == method.Owner)
 						method.MethodUses.Add(findTargetMethod);
 				}
 
-				if (instr is FieldDefinition)
+				if (operand is FieldDefinition)
 				{
-					var fd = instr as FieldDefinition;
+					var fd = operand as FieldDefinition;
 					var field = (from f in method.Owner.Fields
-					             where f.Name == fd.Name
-					             select f).SingleOrDefault();
+								 where f.Name == fd.Name
+								 select f).SingleOrDefault();
 
 					if (field != null)
 						method.FieldUses.Add(field);
@@ -445,6 +451,25 @@ namespace ICSharpCode.CodeQualityAnalysis
 			}
 		}
 
+		/// <summary>
+		/// Reads an instruction operand by recursive calling until non-instruction
+		/// operand is found
+		/// </summary>
+		/// <param name="instruction">An instruction with operand</param>
+		/// <returns>An instruction operand</returns>
+		public object ReadOperand(Mono.Cecil.Cil.Instruction instruction)
+		{
+			if (instruction.Operand == null)
+				return null;
+
+			var nextInstruction = instruction.Operand as Mono.Cecil.Cil.Instruction;
+
+			if (nextInstruction != null)
+				return ReadOperand(nextInstruction);
+
+			return instruction.Operand;
+		}
+
 		/// <summary>
 		/// Reads generic arguments from type and returns them as a set of types
 		/// </summary>
@@ -473,25 +498,6 @@ namespace ICSharpCode.CodeQualityAnalysis
 			return types;
 		}
 
-		/// <summary>
-		/// Reads instruction operand by recursive calling until non-instruction
-		/// operand is found
-		/// </summary>
-		/// <param name="instruction">An instruction with operand</param>
-		/// <returns>An instruction operand</returns>
-		public object ReadInstruction(Instruction instruction)
-		{
-			if (instruction.Operand == null)
-				return null;
-			
-			var nextInstruction = instruction.Operand as Instruction;
-
-			if (nextInstruction != null)
-				return ReadInstruction(nextInstruction);
-			
-			return instruction.Operand;
-		}
-
 		/// <summary>
 		/// Formats method name by adding parameters to it. If there are not any parameters
 		/// only empty brackers will be added.

src/AddIns/Analysis/CodeQuality/Src/Module.cs

@@ -95,6 +95,13 @@ namespace ICSharpCode.CodeQualityAnalysis
 			}
 		}
 
+		public int InstructionsCount
+		{
+			get {
+				return Namespaces.Sum(ns => ns.Types.Sum(type => type.Methods.Sum(method => method.Instructions.Count)));
+			}
+		}
+
 		public string GetInfo()
 		{
 			var builder = new StringBuilder();