Make ObjectFormatter internal

src/Interactive/EditorFeatures/Core/InteractiveEditorFeatures.csproj

@@ -24,7 +24,6 @@
     <ProjectReference Include="..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
       <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
       <Name>Workspaces.Desktop</Name>
-      <Aliases>global</Aliases>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>

src/Interactive/Features/Interactive/Core/SerializableAssemblyLoadResult.cs

-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-
-using System;
-using Microsoft.CodeAnalysis.Scripting.Hosting;
-
-namespace Microsoft.CodeAnalysis.Interactive
-{
-    [Serializable]
-    public struct SerializableAssemblyLoadResult
-    {
-        public bool IsSuccessful { get; }
-        public string Path { get; }
-        public string OriginalPath { get; }
-
-        private SerializableAssemblyLoadResult(AssemblyLoadResult result)
-        {
-            Path = result.Path;
-            OriginalPath = result.OriginalPath;
-            IsSuccessful = result.IsSuccessful;
-        }
-
-        public static implicit operator SerializableAssemblyLoadResult(AssemblyLoadResult result)
-        {
-            return new SerializableAssemblyLoadResult(result);
-        }
-
-        public static implicit operator AssemblyLoadResult(SerializableAssemblyLoadResult result)
-        {
-            return new AssemblyLoadResult(result.Path, result.OriginalPath, result.IsSuccessful);
-        }
-    }
-}

src/Interactive/Features/InteractiveFeatures.csproj

@@ -18,12 +18,10 @@
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
       <Name>CodeAnalysis</Name>
-      <Aliases>global</Aliases>
     </ProjectReference>
     <ProjectReference Include="..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
       <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
       <Name>Workspaces.Desktop</Name>
-      <Aliases>global</Aliases>
     </ProjectReference>
     <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
@@ -95,7 +93,6 @@
     <Compile Include="Interactive\Core\RemoteExecutionResult.cs" />
     <Compile Include="Interactive\Core\InteractiveHost.RemoteService.cs" />
     <Compile Include="Interactive\Core\HostObject\SearchPaths.cs" />
-    <Compile Include="Interactive\Core\SerializableAssemblyLoadResult.cs" />
     <Compile Include="Interactive\Core\HostObject\SynchronizedVersionedList.cs" />
   </ItemGroup>
   <ItemGroup>

src/Scripting/CSharp/CSharpObjectFormatter.cs

@@ -7,7 +7,7 @@
 
 namespace Microsoft.CodeAnalysis.Scripting.CSharp
 {
-    public sealed class CSharpObjectFormatter : ObjectFormatter
+    internal sealed class CSharpObjectFormatter : ObjectFormatter
     {
         public static readonly CSharpObjectFormatter Instance = new CSharpObjectFormatter();
 

src/Scripting/CSharp/CSharpScripting.csproj

@@ -58,11 +58,15 @@
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="csi" />
+     <!-- TODO: remove, see https://github.com/dotnet/roslyn/issues/5661 -->
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures" />
+    <!-- /TODO -->
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.Emit.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Emit.UnitTests" />
     <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
     <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.CSharp.Desktop.UnitTests" />
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />

src/Scripting/CSharp/PublicAPI.Unshipped.txt

-Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter
 Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScript
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatArrayTypeName(System.Type arrayType, System.Array arrayOpt, Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions options) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatGeneratedTypeName(System.Type type) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(System.DateTime value) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(bool value) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(byte value, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(char c, bool quote, bool includeCodePoints = false, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(decimal value) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(double value) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(float value) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(int value, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(long value, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(sbyte value, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(short value, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(string value, bool quote, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(uint value, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(ulong value, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatLiteral(ushort value, bool useHexadecimalNumbers = false) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.FormatMemberName(System.Reflection.MemberInfo member) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.GenericParameterClosing.get -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.GenericParameterOpening.get -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.GetPrimitiveTypeName(Microsoft.CodeAnalysis.SpecialType type) -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.IsHiddenMember(System.Reflection.MemberInfo member) -> bool
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.NullLiteral.get -> string
-override Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.VoidDisplayString.get -> object
 static Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScript.Create(string code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, System.Type globalsType = null, Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader assemblyLoader = null) -> Microsoft.CodeAnalysis.Scripting.Script<object>
 static Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScript.Create<T>(string code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, System.Type globalsType = null, Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader assemblyLoader = null) -> Microsoft.CodeAnalysis.Scripting.Script<T>
 static Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScript.EvaluateAsync(string code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, object globals = null, System.Type globalsType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<object>
 static Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScript.EvaluateAsync<T>(string code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, object globals = null, System.Type globalsType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<T>
 static Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScript.RunAsync(string code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, object globals = null, System.Type globalsType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.CodeAnalysis.Scripting.ScriptState<object>>
-static Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScript.RunAsync<T>(string code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, object globals = null, System.Type globalsType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.CodeAnalysis.Scripting.ScriptState<T>>
-static readonly Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter.Instance -> Microsoft.CodeAnalysis.Scripting.CSharp.CSharpObjectFormatter
\ No newline at end of file
+static Microsoft.CodeAnalysis.Scripting.CSharp.CSharpScript.RunAsync<T>(string code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, object globals = null, System.Type globalsType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.CodeAnalysis.Scripting.ScriptState<T>>
\ No newline at end of file

src/Scripting/Core/AssemblyLoader/AssemblyLoadResult.cs

@@ -5,7 +5,7 @@ namespace Microsoft.CodeAnalysis.Scripting.Hosting
     /// <summary>
     /// The result of loading an assembly reference to the interactive session.
     /// </summary>
-    public struct AssemblyLoadResult
+    internal struct AssemblyLoadResult
     {
         /// <summary>
         /// True if the assembly was loaded by the assembly loader, false if has been loaded before.

src/Scripting/Core/AssemblyLoader/InteractiveAssemblyLoader.cs

@@ -150,7 +150,7 @@ private AssemblyAndLocation Load(string reference)
         /// <exception cref="ArgumentException"><paramref name="path"/> is not an existing path.</exception>
         /// <exception cref="ArgumentException"><paramref name="path"/> is not an existing assembly file path.</exception>
         /// <exception cref="TargetInvocationException">The assembly resolver threw an exception.</exception>
-        public AssemblyLoadResult LoadFromPath(string path)
+        internal AssemblyLoadResult LoadFromPath(string path)
         {
             if (path == null)
             {

src/Scripting/Core/MemberDisplayFormat.cs

@@ -2,7 +2,7 @@
 
 namespace Microsoft.CodeAnalysis.Scripting
 {
-    public enum MemberDisplayFormat
+    internal enum MemberDisplayFormat
     {
         /// <summary>
         /// Display just a simple description of the object, like type name or ToString(). Don't

src/Scripting/Core/ObjectFormatter.Formatter.cs

@@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Scripting
 {
     using TypeInfo = System.Reflection.TypeInfo;
 
-    public abstract partial class ObjectFormatter
+    internal abstract partial class ObjectFormatter
     {
         // internal for testing
         internal sealed class Formatter

src/Scripting/Core/ObjectFormatter.cs

@@ -7,17 +7,17 @@
 using System.Reflection;
 using System.Text;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Collections;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Scripting
 {
-    using Collections;
     using TypeInfo = System.Reflection.TypeInfo;
 
     /// <summary>
     /// Object pretty printer.
     /// </summary>
-    public abstract partial class ObjectFormatter
+    internal abstract partial class ObjectFormatter
     {
         protected ObjectFormatter()
         {

src/Scripting/Core/ObjectFormattingOptions.cs

@@ -4,7 +4,7 @@
 
 namespace Microsoft.CodeAnalysis.Scripting
 {
-    public sealed class ObjectFormattingOptions
+    internal sealed class ObjectFormattingOptions
     {
         public static readonly ObjectFormattingOptions Default = new ObjectFormattingOptions();
 

src/Scripting/Core/PublicAPI.Unshipped.txt

 Microsoft.CodeAnalysis.Scripting.CompilationErrorException
 Microsoft.CodeAnalysis.Scripting.CompilationErrorException.Diagnostics.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Diagnostic>
-Microsoft.CodeAnalysis.Scripting.Hosting.AssemblyLoadResult
-Microsoft.CodeAnalysis.Scripting.Hosting.AssemblyLoadResult.AssemblyLoadResult(string path, string originalPath, bool isSuccessful) -> void
-Microsoft.CodeAnalysis.Scripting.Hosting.AssemblyLoadResult.IsSuccessful.get -> bool
-Microsoft.CodeAnalysis.Scripting.Hosting.AssemblyLoadResult.OriginalPath.get -> string
-Microsoft.CodeAnalysis.Scripting.Hosting.AssemblyLoadResult.Path.get -> string
 Microsoft.CodeAnalysis.Scripting.Hosting.CommandLineHostObject
 Microsoft.CodeAnalysis.Scripting.Hosting.CommandLineHostObject.Args -> string[]
 Microsoft.CodeAnalysis.Scripting.Hosting.CommandLineHostObject.ExitCode -> int
@@ -12,7 +7,6 @@ Microsoft.CodeAnalysis.Scripting.Hosting.CommandLineHostObject.Print(object valu
 Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader
 Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader.Dispose() -> void
 Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader.InteractiveAssemblyLoader(Microsoft.CodeAnalysis.Scripting.Hosting.MetadataShadowCopyProvider shadowCopyProvider = null) -> void
-Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader.LoadFromPath(string path) -> Microsoft.CodeAnalysis.Scripting.Hosting.AssemblyLoadResult
 Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader.RegisterDependency(Microsoft.CodeAnalysis.AssemblyIdentity dependency, string path) -> void
 Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader.RegisterDependency(System.Reflection.Assembly dependency) -> void
 Microsoft.CodeAnalysis.Scripting.Hosting.MetadataShadowCopy
@@ -30,27 +24,6 @@ Microsoft.CodeAnalysis.Scripting.Hosting.MetadataShadowCopyProvider.SuppressShad
 Microsoft.CodeAnalysis.Scripting.Hosting.ShadowCopy
 Microsoft.CodeAnalysis.Scripting.Hosting.ShadowCopy.FullPath.get -> string
 Microsoft.CodeAnalysis.Scripting.Hosting.ShadowCopy.OriginalPath.get -> string
-Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat
-Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat.Inline = 1 -> Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat
-Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat.InlineValue = 2 -> Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat
-Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat.List = 3 -> Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat
-Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat.NoMembers = 0 -> Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat
-Microsoft.CodeAnalysis.Scripting.ObjectFormatter
-Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatObject(object obj, Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions options = null) -> string
-Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatTypeName(System.Type type, Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions options) -> string
-Microsoft.CodeAnalysis.Scripting.ObjectFormatter.ObjectFormatter() -> void
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.Copy(Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat? memberFormat = null, bool? quoteStrings = null, bool? useHexadecimalNumbers = null, bool? includeCodePoints = null, int? maxLineLength = null, int? maxOutputLength = null, string memberIndentation = null, string ellipsis = null, string newLine = null) -> Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.Ellipsis.get -> string
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.IncludeCodePoints.get -> bool
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.MaxLineLength.get -> int
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.MaxOutputLength.get -> int
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.MemberFormat.get -> Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.MemberIndentation.get -> string
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.NewLine.get -> string
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.ObjectFormattingOptions(Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat memberFormat = Microsoft.CodeAnalysis.Scripting.MemberDisplayFormat.NoMembers, bool quoteStrings = true, bool useHexadecimalNumbers = false, bool includeCodePoints = false, int maxLineLength = 2147483647, int maxOutputLength = 2147483647, string memberIndentation = null, string ellipsis = null, string lineBreak = null) -> void
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.QuoteStrings.get -> bool
-Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.UseHexadecimalNumbers.get -> bool
 Microsoft.CodeAnalysis.Scripting.Script
 Microsoft.CodeAnalysis.Scripting.Script.Build(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void
 Microsoft.CodeAnalysis.Scripting.Script.Code.get -> string
@@ -124,33 +97,7 @@ Microsoft.CodeAnalysis.Scripting.ScriptVariable.Name.get -> string
 Microsoft.CodeAnalysis.Scripting.ScriptVariable.Type.get -> System.Type
 Microsoft.CodeAnalysis.Scripting.ScriptVariable.Value.get -> object
 Microsoft.CodeAnalysis.Scripting.ScriptVariable.Value.set -> void
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatArrayTypeName(System.Type arrayType, System.Array arrayOpt, Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions options) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatGeneratedTypeName(System.Type type) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(System.DateTime value) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(bool value) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(byte value, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(char value, bool quote, bool includeCodePoints = false, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(decimal value) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(double value) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(float value) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(int value, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(long value, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(sbyte value, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(short value, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(string value, bool quote, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(uint value, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(ulong value, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatLiteral(ushort value, bool useHexadecimalNumbers = false) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatMemberName(System.Reflection.MemberInfo member) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.GenericParameterClosing.get -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.GenericParameterOpening.get -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.GetPrimitiveTypeName(Microsoft.CodeAnalysis.SpecialType type) -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.NullLiteral.get -> string
-abstract Microsoft.CodeAnalysis.Scripting.ObjectFormatter.VoidDisplayString.get -> object
 abstract Microsoft.CodeAnalysis.Scripting.Script.ReturnType.get -> System.Type
 override Microsoft.CodeAnalysis.Scripting.Script<T>.ReturnType.get -> System.Type
 readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommandLineHostObject.CancellationToken -> System.Threading.CancellationToken
-static readonly Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions.Default -> Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions
 static readonly Microsoft.CodeAnalysis.Scripting.ScriptOptions.Default -> Microsoft.CodeAnalysis.Scripting.ScriptOptions
-virtual Microsoft.CodeAnalysis.Scripting.ObjectFormatter.FormatMethodSignature(System.Reflection.MethodBase method) -> string
-virtual Microsoft.CodeAnalysis.Scripting.ObjectFormatter.IsHiddenMember(System.Reflection.MemberInfo member) -> bool
\ No newline at end of file

src/Scripting/Core/Scripting.csproj

@@ -100,10 +100,12 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Scripting.VisualBasic" />
     <InternalsVisibleTo Include="csi" />
-    <InternalsVisibleTo Include="vbi" />
+    <InternalsVisibleTo Include="vbi" />    
     <!-- TODO: remove, see https://github.com/dotnet/roslyn/issues/5661 -->
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.InteractiveFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.InteractiveEditorFeatures" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests" />
     <!-- /TODO -->
     <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />

src/Scripting/CoreTest/ObjectFormatterTestBase.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
+using System.Text.RegularExpressions;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Scripting.UnitTests
 {
     public abstract class ObjectFormatterTestBase
     {
-        protected static readonly ObjectFormattingOptions s_hexa = new ObjectFormattingOptions(useHexadecimalNumbers: true);
-        protected static readonly ObjectFormattingOptions s_memberList = new ObjectFormattingOptions(memberFormat: MemberDisplayFormat.List);
-        protected static readonly ObjectFormattingOptions s_inline = new ObjectFormattingOptions(memberFormat: MemberDisplayFormat.Inline);
+        internal static readonly ObjectFormattingOptions s_hexa = new ObjectFormattingOptions(useHexadecimalNumbers: true);
+        internal static readonly ObjectFormattingOptions s_memberList = new ObjectFormattingOptions(memberFormat: MemberDisplayFormat.List);
+        internal static readonly ObjectFormattingOptions s_inline = new ObjectFormattingOptions(memberFormat: MemberDisplayFormat.Inline);
 
         public void AssertMembers(string str, params string[] expected)
         {
@@ -37,9 +38,9 @@ public void AssertMembers(string str, params string[] expected)
 
         public string FilterDisplayString(string str)
         {
-            str = System.Text.RegularExpressions.Regex.Replace(str, @"Id = \d+", "Id = *");
-            str = System.Text.RegularExpressions.Regex.Replace(str, @"Id=\d+", "Id=*");
-            str = System.Text.RegularExpressions.Regex.Replace(str, @"Id: \d+", "Id: *");
+            str = Regex.Replace(str, @"Id = \d+", "Id = *");
+            str = Regex.Replace(str, @"Id=\d+", "Id=*");
+            str = Regex.Replace(str, @"Id: \d+", "Id: *");
 
             return str;
         }

src/Scripting/CoreTest/ScriptingTest.csproj

@@ -25,7 +25,6 @@
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
       <Name>CodeAnalysis</Name>
-      <Aliases>global</Aliases>
     </ProjectReference>
     <ProjectReference Include="..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
       <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>

src/Scripting/VisualBasic/BasicScripting.vbproj

@@ -61,10 +61,14 @@
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="vbi" />
+    <!-- TODO: remove, see https://github.com/dotnet/roslyn/issues/5661 -->
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures" />
+    <!-- /TODO -->
     <InternalsVisibleToTest Include="Roslyn.Compilers.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Emit.UnitTests" />
     <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.UnitTests" />
     <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.UnitTests" />
+    <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.Scripting.VisualBasic.Desktop.UnitTests" />
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />

src/Scripting/VisualBasic/PublicAPI.Unshipped.txt

-Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter
 Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicScript
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatArrayTypeName(arrayType As System.Type, arrayOpt As System.Array, options As Microsoft.CodeAnalysis.Scripting.ObjectFormattingOptions) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatGeneratedTypeName(type As System.Type) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(c As Char, quote As Boolean, includeCodePoints As Boolean = False, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Boolean) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Byte, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Date) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Decimal) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Double) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Integer, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Long, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As SByte, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Short, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As Single) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As String, quote As Boolean, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As UInteger, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As ULong, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatLiteral(value As UShort, useHexadecimalNumbers As Boolean = False) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.FormatMemberName(member As System.Reflection.MemberInfo) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.GenericParameterClosing() -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.GenericParameterOpening() -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.GetPrimitiveTypeName(type As Microsoft.CodeAnalysis.SpecialType) -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.IsHiddenMember(member As System.Reflection.MemberInfo) -> Boolean
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.NullLiteral() -> String
-Overrides Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.VoidDisplayString() -> Object
 Shared Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicScript.Create(Of T)(code As String, options As Microsoft.CodeAnalysis.Scripting.ScriptOptions = Nothing, globalsType As System.Type = Nothing, assemblyLoader As Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader = Nothing) -> Microsoft.CodeAnalysis.Scripting.Script(Of T)
 Shared Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicScript.Create(code As String, options As Microsoft.CodeAnalysis.Scripting.ScriptOptions = Nothing, globalsType As System.Type = Nothing, assemblyLoader As Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader = Nothing) -> Microsoft.CodeAnalysis.Scripting.Script(Of Object)
 Shared Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicScript.EvaluateAsync(Of T)(code As String, options As Microsoft.CodeAnalysis.Scripting.ScriptOptions = Nothing, globals As Object = Nothing, cancellationToken As System.Threading.CancellationToken = Nothing) -> System.Threading.Tasks.Task(Of T)
 Shared Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicScript.EvaluateAsync(code As String, options As Microsoft.CodeAnalysis.Scripting.ScriptOptions = Nothing, globals As Object = Nothing, cancellationToken As System.Threading.CancellationToken = Nothing) -> System.Threading.Tasks.Task(Of Object)
 Shared Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicScript.RunAsync(Of T)(code As String, options As Microsoft.CodeAnalysis.Scripting.ScriptOptions = Nothing, globals As Object = Nothing, cancellationToken As System.Threading.CancellationToken = Nothing) -> System.Threading.Tasks.Task(Of Microsoft.CodeAnalysis.Scripting.ScriptState(Of T))
-Shared Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicScript.RunAsync(code As String, options As Microsoft.CodeAnalysis.Scripting.ScriptOptions = Nothing, globals As Object = Nothing, cancellationToken As System.Threading.CancellationToken = Nothing) -> System.Threading.Tasks.Task(Of Microsoft.CodeAnalysis.Scripting.ScriptState(Of Object))
-Shared ReadOnly Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter.Instance -> Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicObjectFormatter
\ No newline at end of file
+Shared Microsoft.CodeAnalysis.Scripting.VisualBasic.VisualBasicScript.RunAsync(code As String, options As Microsoft.CodeAnalysis.Scripting.ScriptOptions = Nothing, globals As Object = Nothing, cancellationToken As System.Threading.CancellationToken = Nothing) -> System.Threading.Tasks.Task(Of Microsoft.CodeAnalysis.Scripting.ScriptState(Of Object))
\ No newline at end of file

src/Scripting/VisualBasic/VisualBasicObjectFormatter.vb

@@ -6,7 +6,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic
 
 Namespace Microsoft.CodeAnalysis.Scripting.VisualBasic
 
-    Public NotInheritable Class VisualBasicObjectFormatter
+    Friend NotInheritable Class VisualBasicObjectFormatter
         Inherits ObjectFormatter
 
         Public Shared ReadOnly Instance As VisualBasicObjectFormatter = New VisualBasicObjectFormatter()