Skip to content

Commit fc296f0

Browse files
committed
Move EnC manager implementation down to Features layer
1 parent e34ee23 commit fc296f0

File tree

129 files changed

+4993
-4351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+4993
-4351
lines changed

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
<MicrosoftVisualStudioComponentModelHostVersion>16.0.198-g52de9c2988</MicrosoftVisualStudioComponentModelHostVersion>
9696
<MicrosoftVisualStudioCompositionVersion>15.5.23</MicrosoftVisualStudioCompositionVersion>
9797
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
98-
<MicrosoftVisualStudioDebuggerUIInterfacesVersion>15.0.27309-vsucorediag</MicrosoftVisualStudioDebuggerUIInterfacesVersion>
99-
<MicrosoftVisualStudioDebuggerEngineimplementationVersion>16.0.2032702 </MicrosoftVisualStudioDebuggerEngineimplementationVersion>
100-
<MicrosoftVisualStudioDebuggerMetadataimplementationVersion>16.0.2032702 </MicrosoftVisualStudioDebuggerMetadataimplementationVersion>
98+
<MicrosoftVisualStudioDebuggerUIInterfacesVersion>16.0.28725.96</MicrosoftVisualStudioDebuggerUIInterfacesVersion>
99+
<MicrosoftVisualStudioDebuggerEngineimplementationVersion>16.1.1040302-preview</MicrosoftVisualStudioDebuggerEngineimplementationVersion>
100+
<MicrosoftVisualStudioDebuggerMetadataimplementationVersion>16.1.1040302-preview</MicrosoftVisualStudioDebuggerMetadataimplementationVersion>
101101
<MicrosoftVisualStudioDesignerInterfacesVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesVersion>
102102
<MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>16.0.28226-alpha</MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion>
103103
<MicrosoftVisualStudioSDKEmbedInteropTypesVersion>15.0.27</MicrosoftVisualStudioSDKEmbedInteropTypesVersion>
@@ -155,7 +155,7 @@
155155
<MSBuildStructuredLoggerVersion>2.0.61</MSBuildStructuredLoggerVersion>
156156
<MDbgVersion>0.1.0</MDbgVersion>
157157
<MonoOptionsVersion>4.4.0</MonoOptionsVersion>
158-
<MoqVersion>4.7.99</MoqVersion>
158+
<MoqVersion>4.10.1</MoqVersion>
159159
<NerdbankFullDuplexStreamVersion>1.0.1</NerdbankFullDuplexStreamVersion>
160160
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
161161
<NuGetPackagingVersion>4.9.2</NuGetPackagingVersion>

src/Compilers/Test/Utilities/CSharp/EditAndContinueTestUtilities.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ public static IEnumerable<string> InspectClosures(this EditAndContinueMethodDebu
2727
=> debugInfo.Closures.IsDefault ? null :
2828
debugInfo.Closures.Select(c => $"Offset={c.SyntaxOffset} Id={c.ClosureId.Generation}#{c.ClosureId.Ordinal}");
2929

30+
public static EmitBaseline GetInitialEmitBaseline(this EmitBaseline baseline)
31+
=> baseline.InitialBaseline;
32+
3033
#endregion
3134
}
3235
}

src/EditorFeatures/CSharpTest/EditAndContinue/CSharpEditAndContinueAnalyzerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ public static void Main()
424424
Assert.False(result.HasChanges);
425425
Assert.False(result.HasChangesAndErrors);
426426
Assert.False(result.HasChangesAndCompilationErrors);
427-
Assert.True(result.RudeEditErrors.IsDefaultOrEmpty);
427+
Assert.True(result.RudeEditErrors.IsEmpty);
428428
}
429429
}
430430

src/EditorFeatures/Core/Implementation/EditAndContinue/ActiveStatementTrackingService.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public TrackingSession(ActiveStatementTrackingService service, EditSession editS
120120
// fire and forget on a background thread:
121121
try
122122
{
123-
Task.Run(TrackActiveSpansAsync, _editSession.Cancellation.Token);
123+
Task.Run(TrackActiveSpansAsync, _editSession.CancellationToken);
124124
}
125125
catch (TaskCanceledException)
126126
{
@@ -148,7 +148,7 @@ private async Task DocumentOpenedAsync(Document document)
148148
{
149149
try
150150
{
151-
var baseActiveStatements = await _editSession.BaseActiveStatements.GetValueAsync(_editSession.Cancellation.Token).ConfigureAwait(false);
151+
var baseActiveStatements = await _editSession.BaseActiveStatements.GetValueAsync(_editSession.CancellationToken).ConfigureAwait(false);
152152

153153
if (baseActiveStatements.DocumentMap.TryGetValue(document.Id, out var documentActiveStatements) &&
154154
TryGetSnapshot(document, out var snapshot))
@@ -188,7 +188,7 @@ private async Task TrackActiveSpansAsync()
188188
{
189189
try
190190
{
191-
var baseActiveStatements = await _editSession.BaseActiveStatements.GetValueAsync(_editSession.Cancellation.Token).ConfigureAwait(false);
191+
var baseActiveStatements = await _editSession.BaseActiveStatements.GetValueAsync(_editSession.CancellationToken).ConfigureAwait(false);
192192

193193
lock (_trackingSpans)
194194
{
@@ -244,7 +244,7 @@ private async Task RefreshTrackingSpansAsync(Document document, ITextSnapshot sn
244244
{
245245
try
246246
{
247-
var documentAnalysis = await _editSession.GetDocumentAnalysis(document).GetValueAsync(_editSession.Cancellation.Token).ConfigureAwait(false);
247+
var documentAnalysis = await _editSession.GetDocumentAnalysis(document).GetValueAsync(_editSession.CancellationToken).ConfigureAwait(false);
248248

249249
// Do nothing if the statements aren't available (in presence of compilation errors).
250250
if (!documentAnalysis.ActiveStatements.IsDefault)

src/EditorFeatures/Core/Implementation/EditAndContinue/EditAndContinueDiagnosticUpdateSource.cs

Lines changed: 0 additions & 149 deletions
This file was deleted.

src/EditorFeatures/Core/Implementation/EditAndContinue/ReadOnlyDocumentTracker.cs

Lines changed: 0 additions & 130 deletions
This file was deleted.

src/EditorFeatures/Test/EditAndContinue/DebuggeeModuleMetadataCacheTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

33
using System;
4-
using Microsoft.CodeAnalysis.EditAndContinue;
54
using Roslyn.Test.Utilities;
65
using Xunit;
76

8-
namespace Microsoft.CodeAnalysis.Editor.UnitTests.EditAndContinue
7+
namespace Microsoft.CodeAnalysis.EditAndContinue.UnitTests
98
{
109
public sealed class DebuggeeModuleMetadataCacheTests
1110
{

0 commit comments

Comments
 (0)