EnC: Check member modifier updates in semantic analysis (#54406)

dotnet · Jun 29, 2021 · 09512f4 · 09512f4
1 parent ef549bc
commit 09512f4
Show file tree

Hide file tree

Showing 13 changed files with 1,852 additions and 996 deletions.
diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
@@ -1867,7 +1867,7 @@ public C() {}
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.ModifiersUpdate, "const int a = 1", FeaturesResources.const_field));
+ Diagnostic(RudeEditKind.ModifiersUpdate, "a = 1", FeaturesResources.const_field));
  }
 
  [Fact]
@@ -1917,7 +1917,7 @@ public C() {}
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.ModifiersUpdate, "const int a = 1, b = 2", FeaturesResources.const_field));
+ Diagnostic(RudeEditKind.ModifiersUpdate, "a = 1", FeaturesResources.const_field));
  }
 
  [Fact]

diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/CSharpEditAndContinueTestHelpers.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/CSharpEditAndContinueTestHelpers.cs
@@ -11,6 +11,7 @@
 using Microsoft.CodeAnalysis.EditAndContinue;
 using Microsoft.CodeAnalysis.EditAndContinue.UnitTests;
 using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.CSharp.EditAndContinue.UnitTests

diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/EditingTestBase.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/EditingTestBase.cs
@@ -15,6 +15,7 @@
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue;
+using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.CSharp.EditAndContinue.UnitTests
@@ -34,6 +35,17 @@ internal enum MethodKind
  ConstructorWithParameters
  }
 
+ public static string GetResource(string keyword)
+ => keyword switch
+ {
+ "class" => FeaturesResources.class_,
+ "struct" => CSharpFeaturesResources.struct_,
+ "interface" => FeaturesResources.interface_,
+ "record" => CSharpFeaturesResources.record_,
+ "record struct" => CSharpFeaturesResources.record_struct,
+ _ => throw ExceptionUtilities.UnexpectedValue(keyword)
+ };
+
  internal static SemanticEditDescription[] NoSemanticEdits = Array.Empty<SemanticEditDescription>();
 
  internal static RudeEditDiagnosticDescription Diagnostic(RudeEditKind rudeEditKind, string squiggle, params string[] arguments)