Move remaining member rude edit analysis to semantics

src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.Methods.cs

@@ -62,26 +62,26 @@ static void Main(string[] args)
  public void Method_Body_Delete1()
  {
  var src1 = "class C { int M() { <AS:0>return 1;</AS:0> } }";
- var src2 = "class C { <AS:0>int M();</AS:0> }";
+ var src2 = "class C { <AS:0>extern int M();</AS:0> }";
 
  var edits = GetTopEdits(src1, src2);
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.MethodBodyDelete, "int M()", FeaturesResources.method));
+ Diagnostic(RudeEditKind.ModifiersUpdate, "extern int M()", FeaturesResources.method));
  }
 
  [Fact]
  public void Method_ExpressionBody_Delete1()
  {
  var src1 = "class C { int M() => <AS:0>1</AS:0>; }";
- var src2 = "class C { <AS:0>int M();</AS:0> }";
+ var src2 = "class C { <AS:0>extern int M();</AS:0> }";
 
  var edits = GetTopEdits(src1, src2);
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.MethodBodyDelete, "int M()", FeaturesResources.method));
+ Diagnostic(RudeEditKind.ModifiersUpdate, "extern int M()", FeaturesResources.method));
  }
 
  [Fact]
@@ -232,7 +232,7 @@ static void Swap<T>(T lhs, T rhs) where T : System.IComparable<T>
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.GenericMethodUpdate, "static void Swap<T>(T lhs, T rhs)", FeaturesResources.method));
+ Diagnostic(RudeEditKind.GenericMethodUpdate, "static void Swap<T>(T lhs, T rhs)"));
  }
 
  // Async
@@ -711,7 +711,7 @@ public T this[int i]
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.GenericTypeUpdate, "set", CSharpFeaturesResources.indexer_setter));
+ Diagnostic(RudeEditKind.GenericTypeUpdate, "set"));
  }
 
  [WorkItem(750244, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/750244")]
@@ -765,7 +765,7 @@ public T this[int i]
 
  // Rude edits of active statements (AS:1) are not reported if the top-level edits are rude.
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.GenericTypeUpdate, "set", CSharpFeaturesResources.indexer_setter),
+ Diagnostic(RudeEditKind.GenericTypeUpdate, "set"),
  Diagnostic(RudeEditKind.ActiveStatementUpdate, "stringCollection[1] = \"hello\";"));
  }
 
@@ -816,7 +816,7 @@ public T this[int i]
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.GenericTypeUpdate, "get", CSharpFeaturesResources.indexer_getter));
+ Diagnostic(RudeEditKind.GenericTypeUpdate, "get"));
  }
 
  [WorkItem(750244, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/750244")]
@@ -868,7 +868,7 @@ public T this[int i]
 
  // Rude edits of active statements (AS:1) are not reported if the top-level edits are rude.
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.GenericTypeUpdate, "get", CSharpFeaturesResources.indexer_getter),
+ Diagnostic(RudeEditKind.GenericTypeUpdate, "get"),
  Diagnostic(RudeEditKind.ActiveStatementUpdate, "Console.WriteLine(stringCollection[1]);"));
  }
 
@@ -919,7 +919,7 @@ public T this[int i]
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.GenericTypeUpdate, "set", CSharpFeaturesResources.indexer_setter));
+ Diagnostic(RudeEditKind.GenericTypeUpdate, "set"));
  }
 
  [Fact]
@@ -1018,7 +1018,7 @@ public T this[int i]
  var active = GetActiveStatements(src1, src2);
 
  edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.GenericTypeUpdate, "get", CSharpFeaturesResources.indexer_getter));
+ Diagnostic(RudeEditKind.GenericTypeUpdate, "get"));
  }
 
  [Fact]

src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs

@@ -1496,8 +1496,7 @@ class C
  var edits = GetTopEdits(src1, src2);
  var active = GetActiveStatements(src1, src2);
 
- edits.VerifyRudeDiagnostics(active,
- Diagnostic(RudeEditKind.MethodBodyAdd, "get", CSharpFeaturesResources.property_getter));
+ edits.VerifyRudeDiagnostics(active);
  }
 
  [Fact]

src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/EditAndContinueValidation.cs

@@ -52,30 +52,30 @@ internal static void VerifyRudeDiagnostics(
 
  internal static void VerifyLineEdits(
  this EditScript<SyntaxNode> editScript,
- IEnumerable<SourceLineUpdate> expectedLineEdits,
- IEnumerable<string> expectedNodeUpdates,
- params RudeEditDiagnosticDescription[] expectedDiagnostics)
+ SourceLineUpdate[] lineEdits,
+ SemanticEditDescription[]? semanticEdits = null,
+ RudeEditDiagnosticDescription[]? diagnostics = null)
  {
- Assert.NotEmpty(expectedLineEdits);
+ Assert.NotEmpty(lineEdits);
 
  VerifyLineEdits(
  editScript,
- new[] { new SequencePointUpdates(editScript.Match.OldRoot.SyntaxTree.FilePath, expectedLineEdits.ToImmutableArray()) },
- expectedNodeUpdates,
- expectedDiagnostics);
+ new[] { new SequencePointUpdates(editScript.Match.OldRoot.SyntaxTree.FilePath, lineEdits.ToImmutableArray()) },
+ semanticEdits,
+ diagnostics);
  }
 
  internal static void VerifyLineEdits(
  this EditScript<SyntaxNode> editScript,
- IEnumerable<SequencePointUpdates> expectedLineEdits,
- IEnumerable<string> expectedNodeUpdates,
- params RudeEditDiagnosticDescription[] expectedDiagnostics)
+ SequencePointUpdates[] lineEdits,
+ SemanticEditDescription[]? semanticEdits = null,
+ RudeEditDiagnosticDescription[]? diagnostics = null)
  {
  new CSharpEditAndContinueTestHelpers().VerifyLineEdits(
  editScript,
- expectedLineEdits,
- expectedNodeUpdates,
- expectedDiagnostics);
+ lineEdits,
+ semanticEdits,
+ diagnostics);
  }
 
  internal static void VerifySemanticDiagnostics(

src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/EditingTestBase.cs

@@ -64,18 +64,18 @@ internal static DocumentAnalysisResultsDescription DocumentResults(
  ActiveStatementsDescription? activeStatements = null,
  SemanticEditDescription[]? semanticEdits = null,
  RudeEditDiagnosticDescription[]? diagnostics = null)
- => new(activeStatements, semanticEdits, diagnostics);
+ => new(activeStatements, semanticEdits, lineEdits: null, diagnostics);
 
- private static SyntaxTree ParseSource(string markedSource)
+ private static SyntaxTree ParseSource(string markedSource, int documentIndex = 0)
  => SyntaxFactory.ParseSyntaxTree(
  ActiveStatementsDescription.ClearTags(markedSource),
  CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview),
- path: "test.cs");
+ path: documentIndex.ToString());
 
- internal static EditScript<SyntaxNode> GetTopEdits(string src1, string src2)
+ internal static EditScript<SyntaxNode> GetTopEdits(string src1, string src2, int documentIndex = 0)
  {
- var tree1 = ParseSource(src1);
- var tree2 = ParseSource(src2);
+ var tree1 = ParseSource(src1, documentIndex);
+ var tree2 = ParseSource(src2, documentIndex);
 
  tree1.GetDiagnostics().Verify();
  tree2.GetDiagnostics().Verify();