Support for partial type EnC and moving declarations across files (#5…

…1187) * Partial types Call AnalyzeChangedMemberBody from semantic analysis
dotnet · Feb 23, 2021 · fc7b737 · fc7b737
1 parent dbe9d2f
commit fc7b737
Show file tree

Hide file tree

Showing 83 changed files with 9,045 additions and 3,584 deletions.
diff --git a/src/Compilers/Core/Portable/Emit/EditAndContinue/DefinitionMap.cs b/src/Compilers/Core/Portable/Emit/EditAndContinue/DefinitionMap.cs
@@ -311,10 +311,16 @@ internal VariableSlotAllocator TryCreateVariableSlotAllocator(EmitBaseline basel
                 symbolMap = MapToMetadataSymbolMatcher;
             }
 
+            var previousMethod = mappedMethod.PreviousMethod;
+            if (previousMethod is null)
+            {
+                previousMethod = (IMethodSymbolInternal)symbolMap.MapDefinitionOrNamespace(topLevelMethod);
+            }
+
             return new EncVariableSlotAllocator(
                 symbolMap,
                 mappedMethod.SyntaxMap,
-                mappedMethod.PreviousMethod,
+                previousMethod,
                 methodId,
                 previousLocals,
                 lambdaMap,

diff --git a/src/Compilers/Core/Portable/Emit/SemanticEdit.cs b/src/Compilers/Core/Portable/Emit/SemanticEdit.cs
@@ -53,7 +53,7 @@ public struct SemanticEdit : IEquatable<SemanticEdit>
         /// </summary>
         /// <param name="kind">The type of edit.</param>
         /// <param name="oldSymbol">
-        /// The symbol from the earlier compilation, or null if the edit represents an addition.
+        /// The symbol from the earlier compilation, or null if the edit represents an addition or an update of the symbol from the previous compilation that exactly matches <paramref name="newSymbol"/>.
         /// </param>
         /// <param name="newSymbol">
         /// The symbol from the later compilation, or null if the edit represents a deletion.
@@ -74,7 +74,7 @@ public struct SemanticEdit : IEquatable<SemanticEdit>
         /// </exception>
         public SemanticEdit(SemanticEditKind kind, ISymbol? oldSymbol, ISymbol? newSymbol, Func<SyntaxNode, SyntaxNode?>? syntaxMap = null, bool preserveLocalVariables = false)
         {
-            if (oldSymbol == null && kind != SemanticEditKind.Insert)
+            if (oldSymbol == null && kind is not (SemanticEditKind.Insert or SemanticEditKind.Update))
             {
                 throw new ArgumentNullException(nameof(oldSymbol));
             }

diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.Methods.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.Methods.cs
@@ -7,11 +7,13 @@
 using Microsoft.CodeAnalysis.CSharp.UnitTests;
 using Microsoft.CodeAnalysis.EditAndContinue;
 using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Test.Utilities;
 using Roslyn.Test.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.CSharp.EditAndContinue.UnitTests
 {
+    [UseExportProvider]
     public class ActiveStatementTests_Methods : EditingTestBase
     {
         #region Methods
@@ -43,12 +45,17 @@ static void Main(string[] args)
 }
 ";
 
-            // TODO (bug 755959): better deleted active statement span
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
-            edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.Delete, "class C", FeaturesResources.method));
+            EditAndContinueValidation.VerifySemantics(
+                new[] { edits },
+                new[]
+                {
+                    DocumentResults(
+                        active,
+                        diagnostics: new[] { Diagnostic(RudeEditKind.Delete, "class C", DeletedSymbolDisplay(FeaturesResources.method, "Goo(int)")) })
+                });
         }
 
         [Fact]
@@ -550,7 +557,7 @@ class C
             var active = GetActiveStatements(src1, src2);
 
             edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.DeleteActiveStatement, "get"));
+                Diagnostic(RudeEditKind.DeleteActiveStatement, "get", FeaturesResources.code));
         }
 
         [Fact]
@@ -575,7 +582,7 @@ public void Property_BlockBodyToExpressionBody2()
             var active = GetActiveStatements(src1, src2);
 
             edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.Delete, "int P", CSharpFeaturesResources.property_setter));
+                Diagnostic(RudeEditKind.Delete, "int P", DeletedSymbolDisplay(CSharpFeaturesResources.property_setter, "P.set")));
         }
 
         [Fact]
@@ -601,7 +608,7 @@ class C
 
             // Can be improved with https://github.com/dotnet/roslyn/issues/22696
             edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.DeleteActiveStatement, "int P"));
+                Diagnostic(RudeEditKind.DeleteActiveStatement, "int P", FeaturesResources.code));
         }
 
         #endregion
@@ -654,7 +661,7 @@ public void Indexer_BlockBodyToExpressionBody2()
             var active = GetActiveStatements(src1, src2);
 
             edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.Delete, "int this[int a]", CSharpFeaturesResources.indexer_setter));
+                Diagnostic(RudeEditKind.Delete, "int this[int a]", DeletedSymbolDisplay(CSharpFeaturesResources.indexer_setter, "this[int].set")));
         }
 
         [Fact]
@@ -756,9 +763,10 @@ public T this[int i]
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
+            // Rude edits of active statements (AS:1) are not reported if the top-level edits are rude.
             edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.ActiveStatementUpdate, @"stringCollection[1] = ""hello"";"),
-                Diagnostic(RudeEditKind.GenericTypeUpdate, "set", CSharpFeaturesResources.indexer_setter));
+                Diagnostic(RudeEditKind.GenericTypeUpdate, "set", CSharpFeaturesResources.indexer_setter),
+                Diagnostic(RudeEditKind.ActiveStatementUpdate, "stringCollection[1] = \"hello\";"));
         }
 
         [Fact]
@@ -858,9 +866,10 @@ public T this[int i]
             var edits = GetTopEdits(src1, src2);
             var active = GetActiveStatements(src1, src2);
 
+            // Rude edits of active statements (AS:1) are not reported if the top-level edits are rude.
             edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.ActiveStatementUpdate, "Console.WriteLine(stringCollection[1]);"),
-                Diagnostic(RudeEditKind.GenericTypeUpdate, "get", CSharpFeaturesResources.indexer_getter));
+                Diagnostic(RudeEditKind.GenericTypeUpdate, "get", CSharpFeaturesResources.indexer_getter),
+                Diagnostic(RudeEditKind.ActiveStatementUpdate, "Console.WriteLine(stringCollection[1]);"));
         }
 
         [Fact]
@@ -959,7 +968,7 @@ public T this[int i]
             var active = GetActiveStatements(src1, src2);
 
             edits.VerifyRudeDiagnostics(active,
-                Diagnostic(RudeEditKind.DeleteActiveStatement, "{"));
+                Diagnostic(RudeEditKind.DeleteActiveStatement, "{", FeaturesResources.code));
         }
 
         [Fact]
@@ -1058,7 +1067,7 @@ public T this[int i]
             var active = GetActiveStatements(src1, src2);
 
             edits.VerifyRudeDiagnostics(active,
-                                Diagnostic(RudeEditKind.DeleteActiveStatement, "{"));
+                Diagnostic(RudeEditKind.DeleteActiveStatement, "{", FeaturesResources.code));
         }
 
         #endregion