cleanup refactoring

Author: DavidMuellerGetinge

src/coverlet.core/Symbols/CecilSymbolHelper.cs

@@ -553,11 +553,9 @@ static bool CheckForAsyncEnumerator(List<Instruction> instructions, Instruction
  (instructions[currentIndex - 2].OpCode == OpCodes.Ldarg ||
  instructions[currentIndex - 2].OpCode == OpCodes.Ldarg_0) &&
  instructions[currentIndex - 1].OpCode == OpCodes.Ldfld &&
- (
- (instructions[currentIndex - 1].Operand is FieldDefinition field && IsCompilerGenerated(field) && field.FieldType.FullName.StartsWith("System.Collections.Generic.IAsyncEnumerator")) ||
- (instructions[currentIndex - 1].Operand is FieldReference fieldRef && IsCompilerGenerated(fieldRef.Resolve()) && fieldRef.FieldType.FullName.StartsWith("System.Collections.Generic.IAsyncEnumerator"))
- )
- )
+ IsCompilerGeneratedField(instructions[currentIndex - 1], out FieldDefinition field) &&
+ field.FieldType.FullName.StartsWith("System.Collections.Generic.IAsyncEnumerator")
+ )
  {
  return true;
  }
@@ -598,10 +596,8 @@ static bool CheckIfExceptionThrown(List<Instruction> instructions, Instruction i
  for (int i = currentIndex - 1; i >= minFieldIndex; --i)
  {
  if (instructions[i].OpCode == OpCodes.Ldfld &&
- (
- (instructions[i].Operand is FieldDefinition field && IsCompilerGenerated(field) && field.FieldType.FullName == "System.Object") ||
- (instructions[i].Operand is FieldReference fieldRef && IsCompilerGenerated(fieldRef.Resolve()) && fieldRef.FieldType.FullName == "System.Object")
- ))
+ IsCompilerGeneratedField(instructions[i], out FieldDefinition field) &&
+ field.FieldType.FullName == "System.Object")
  {
  // We expect the call to GetResult() to be no more than four
  // instructions before the loading of the field's value.
@@ -932,10 +928,8 @@ static bool DisposeCheck(List<Instruction> instructions, Instruction instruction
 
  if (currentIndex >= 2 &&
  instructions[currentIndex - 1].OpCode == OpCodes.Ldfld &&
- (
- (instructions[currentIndex - 1].Operand is FieldDefinition field && IsCompilerGenerated(field) && field.FullName.EndsWith("__disposeMode")) ||
- (instructions[currentIndex - 1].Operand is FieldReference fieldRef && IsCompilerGenerated(fieldRef.Resolve()) && fieldRef.FullName.EndsWith("__disposeMode"))
- ) &&
+ IsCompilerGeneratedField(instructions[currentIndex - 1], out FieldDefinition field) &&
+ field.FullName.EndsWith("__disposeMode") &&
  (instructions[currentIndex - 2].OpCode == OpCodes.Ldarg ||
  instructions[currentIndex - 2].OpCode == OpCodes.Ldarg_0))
  {

test/coverlet.core.tests/Coverage/CoverageTests.AwaitUsing.cs

@@ -17,7 +17,7 @@ public void AwaitUsing()
  string path = Path.GetTempFileName();
  try
  {
- FunctionExecutor.RunInProcess(async (string[] pathSerialize) =>
+ FunctionExecutor.Run(async (string[] pathSerialize) =>
  {
  CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run<AwaitUsing>(async instance =>
  {

test/coverlet.core.tests/Coverage/InstrumenterHelper.Assertions.cs

@@ -30,7 +30,7 @@ public static CoverageResult GenerateReport(this CoverageResult coverageResult,
  {
  Process.Start("cmd", "/C " + Path.GetFullPath(Path.Combine(directory, "index.htm")));
  }
- Process.Start("cmd", "/C " + Path.GetFullPath(Path.Combine(directory, "index.htm")));
+
  return coverageResult;
  }