From 601f19c615126324ab8f7d58b6783f44b5190d29 Mon Sep 17 00:00:00 2001 From: ChuckStoner Date: Fri, 6 Feb 2015 14:30:38 -0800 Subject: [PATCH] EE: Minor cleanup (changeset 1411863) --- .../InstructionDecoderTests.cs | 26 +++++++++---------- .../Source/ExpressionCompiler/FrameDecoder.cs | 2 +- .../Expansion/ResultsViewExpansion.cs | 2 +- .../Source/ResultProvider/ResultProvider.cs | 4 +-- .../Test/ExpressionCompiler/HoistedMeTests.vb | 1 - 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs index b5afbd978f8..7e33eba5029 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs @@ -15,7 +15,7 @@ namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator public class InstructionDecoderTests : ExpressionCompilerTestBase { [Fact, WorkItem(1107977)] - private void GetNameGenericAsync() + public void GetNameGenericAsync() { var source = @" using System.Threading.Tasks; @@ -32,9 +32,9 @@ static async Task M(T x) "C.M(T x)", GetName(source, "C.d__0.MoveNext", DkmVariableInfoFlags.Names | DkmVariableInfoFlags.Types)); } - [Fact] - private void GetNameLambda() + [Fact] + public void GetNameLambda() { var source = @" using System; @@ -50,9 +50,9 @@ void M() "C.M.AnonymousMethod__0_0()", GetName(source, "C.<>c.b__0_0", DkmVariableInfoFlags.Names | DkmVariableInfoFlags.Types)); } - [Fact] - private void GetNameGenericLambda() + [Fact] + public void GetNameGenericLambda() { var source = @" using System; @@ -68,9 +68,9 @@ class C "C.M.AnonymousMethod__0_0(U u)", GetName(source, "C.<>c__0.b__0_0", DkmVariableInfoFlags.Names | DkmVariableInfoFlags.Types)); } - [Fact] - private void GetNameProperties() + [Fact] + public void GetNameProperties() { var source = @" class C @@ -99,9 +99,9 @@ class C "C.this[object].set(object x, int value)", GetName(source, "C.set_Item", DkmVariableInfoFlags.Names | DkmVariableInfoFlags.Types)); } - [Fact] - private void GetNameExplicitInterfaceImplementation() + [Fact] + public void GetNameExplicitInterfaceImplementation() { var source = @" using System; @@ -114,9 +114,9 @@ class C : IDisposable "C.System.IDisposable.Dispose()", GetName(source, "C.System.IDisposable.Dispose", DkmVariableInfoFlags.Names | DkmVariableInfoFlags.Types)); } - [Fact] - private void GetNameExtensionMethod() + [Fact] + public void GetNameExtensionMethod() { var source = @" static class Extensions @@ -128,9 +128,9 @@ static class Extensions "Extensions.M(string this)", GetName(source, "Extensions.M", DkmVariableInfoFlags.Names | DkmVariableInfoFlags.Types)); } - [Fact] - private void GetNameArgumentFlagsNone() + [Fact] + public void GetNameArgumentFlagsNone() { var source = @" static class C diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/FrameDecoder.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/FrameDecoder.cs index ac3a55f979e..0ab210df78e 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/FrameDecoder.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/FrameDecoder.cs @@ -106,7 +106,7 @@ void IDkmLanguageFrameDecoder.GetFrameName(DkmInspectionContext inspectionContex } } - void IDkmLanguageFrameDecoder.GetFrameReturnType(DkmInspectionContext inspectionContext, DkmWorkList workList, DkmStackWalkFrame frame, DkmCompletionRoutine < DkmGetFrameReturnTypeAsyncResult > completionRoutine) + void IDkmLanguageFrameDecoder.GetFrameReturnType(DkmInspectionContext inspectionContext, DkmWorkList workList, DkmStackWalkFrame frame, DkmCompletionRoutine completionRoutine) { try { diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/ResultsViewExpansion.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/ResultsViewExpansion.cs index 7e1cf342f03..21302ea760f 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/ResultsViewExpansion.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/ResultsViewExpansion.cs @@ -41,7 +41,7 @@ internal static ResultsViewExpansion CreateExpansion(DkmClrValue value, Formatte var enumerableType = GetEnumerableType(value); if (enumerableType != null) { - var expansion = ResultsViewExpansion.CreateExpansion(value, enumerableType, formatter); + var expansion = CreateExpansion(value, enumerableType, formatter); if (expansion != null) { return expansion.CreateEvaluationResult(name, parent, formatter); diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.cs index 3879cc838f1..4d4fb918311 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.cs @@ -72,7 +72,7 @@ DkmClrValue IDkmClrResultProvider.GetClrValue(DkmSuccessEvaluationResult evaluat } } - void IDkmClrResultProvider.GetChildren(DkmEvaluationResult evaluationResult, DkmWorkList workList, int initialRequestSize, DkmInspectionContext inspectionContext, DkmCompletionRoutine < DkmGetChildrenAsyncResult > completionRoutine) + void IDkmClrResultProvider.GetChildren(DkmEvaluationResult evaluationResult, DkmWorkList workList, int initialRequestSize, DkmInspectionContext inspectionContext, DkmCompletionRoutine completionRoutine) { var dataItem = evaluationResult.GetDataItem(); if (dataItem == null) @@ -85,7 +85,7 @@ void IDkmClrResultProvider.GetChildren(DkmEvaluationResult evaluationResult, Dkm completionRoutine(GetChildren(inspectionContext, evaluationResult, dataItem, initialRequestSize)); } - void IDkmClrResultProvider.GetItems(DkmEvaluationResultEnumContext enumContext, DkmWorkList workList, int startIndex, int count, DkmCompletionRoutine < DkmEvaluationEnumAsyncResult > completionRoutine) + void IDkmClrResultProvider.GetItems(DkmEvaluationResultEnumContext enumContext, DkmWorkList workList, int startIndex, int count, DkmCompletionRoutine completionRoutine) { try { diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/HoistedMeTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/HoistedMeTests.vb index 8d955cc95c1..e07ccd8ddf1 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/HoistedMeTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/HoistedMeTests.vb @@ -4,7 +4,6 @@ Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation Imports Roslyn.Test.Utilities Imports Xunit -- GitLab