Skip to content

Commit 7351a07

Browse files
Revert
1 parent c6e400a commit 7351a07

24 files changed

+2769
-2748
lines changed

src/Interactive/Host/Interactive/Core/InteractiveHost.InitializedRemoteService.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace Microsoft.CodeAnalysis.Interactive;
6-
7-
internal partial class InteractiveHost
5+
namespace Microsoft.CodeAnalysis.Interactive
86
{
9-
private readonly struct InitializedRemoteService
7+
internal partial class InteractiveHost
108
{
11-
public readonly RemoteService? Service;
12-
public readonly RemoteExecutionResult InitializationResult;
13-
14-
public InitializedRemoteService(RemoteService service, RemoteExecutionResult initializationResult)
9+
private readonly struct InitializedRemoteService
1510
{
16-
Service = service;
17-
InitializationResult = initializationResult;
11+
public readonly RemoteService? Service;
12+
public readonly RemoteExecutionResult InitializationResult;
13+
14+
public InitializedRemoteService(RemoteService service, RemoteExecutionResult initializationResult)
15+
{
16+
Service = service;
17+
InitializationResult = initializationResult;
18+
}
1819
}
1920
}
2021
}

src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs

Lines changed: 191 additions & 190 deletions
Large diffs are not rendered by default.

src/Interactive/Host/Interactive/Core/InteractiveHost.RemoteService.cs

Lines changed: 210 additions & 209 deletions
Large diffs are not rendered by default.

src/Interactive/Host/Interactive/Core/InteractiveHost.Service.cs

Lines changed: 628 additions & 627 deletions
Large diffs are not rendered by default.

src/Interactive/Host/Interactive/Core/InteractiveHost.ShadowCopyReference.cs

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,39 @@
44

55
using Microsoft.CodeAnalysis.Scripting.Hosting;
66

7-
namespace Microsoft.CodeAnalysis.Interactive;
8-
9-
internal partial class InteractiveHost
7+
namespace Microsoft.CodeAnalysis.Interactive
108
{
11-
/// <summary>
12-
/// Specialize <see cref="PortableExecutableReference"/> with path being the original path of the copy.
13-
/// Logically this reference represents that file, the fact that we load the image from a copy is an implementation detail.
14-
/// </summary>
15-
private sealed class ShadowCopyReference : PortableExecutableReference
9+
internal partial class InteractiveHost
1610
{
17-
private readonly MetadataShadowCopyProvider _provider;
18-
19-
public ShadowCopyReference(MetadataShadowCopyProvider provider, string originalPath, MetadataReferenceProperties properties)
20-
: base(properties, originalPath)
11+
/// <summary>
12+
/// Specialize <see cref="PortableExecutableReference"/> with path being the original path of the copy.
13+
/// Logically this reference represents that file, the fact that we load the image from a copy is an implementation detail.
14+
/// </summary>
15+
private sealed class ShadowCopyReference : PortableExecutableReference
2116
{
22-
_provider = provider;
23-
}
17+
private readonly MetadataShadowCopyProvider _provider;
2418

25-
protected override DocumentationProvider CreateDocumentationProvider()
26-
{
27-
// TODO (tomat): use file next to the dll (or shadow copy)
28-
return DocumentationProvider.Default;
29-
}
19+
public ShadowCopyReference(MetadataShadowCopyProvider provider, string originalPath, MetadataReferenceProperties properties)
20+
: base(properties, originalPath)
21+
{
22+
_provider = provider;
23+
}
3024

31-
protected override Metadata GetMetadataImpl()
32-
{
33-
return _provider.GetMetadata(FilePath, Properties.Kind);
34-
}
25+
protected override DocumentationProvider CreateDocumentationProvider()
26+
{
27+
// TODO (tomat): use file next to the dll (or shadow copy)
28+
return DocumentationProvider.Default;
29+
}
3530

36-
protected override PortableExecutableReference WithPropertiesImpl(MetadataReferenceProperties properties)
37-
{
38-
return new ShadowCopyReference(_provider, FilePath!, properties);
31+
protected override Metadata GetMetadataImpl()
32+
{
33+
return _provider.GetMetadata(FilePath, Properties.Kind);
34+
}
35+
36+
protected override PortableExecutableReference WithPropertiesImpl(MetadataReferenceProperties properties)
37+
{
38+
return new ShadowCopyReference(_provider, FilePath!, properties);
39+
}
3940
}
4041
}
4142
}

0 commit comments

Comments
 (0)