diff --git a/src/Scripting/CSharp/Hosting/ObjectFormatter/CSharpTypeNameFormatter.cs b/src/Scripting/CSharp/Hosting/ObjectFormatter/CSharpTypeNameFormatter.cs index 6a7160c809c842e38155c672ef08c309adc08983..db81a1ccf3097b6f8222451958d1d5cc7a009c92 100644 --- a/src/Scripting/CSharp/Hosting/ObjectFormatter/CSharpTypeNameFormatter.cs +++ b/src/Scripting/CSharp/Hosting/ObjectFormatter/CSharpTypeNameFormatter.cs @@ -45,7 +45,7 @@ protected override string GetPrimitiveTypeName(SpecialType type) } } - public override string FormatTypeName(Type type, Options options) + public override string FormatTypeName(Type type, CommonTypeNameFormatterOptions options) { string stateMachineName; if (GeneratedNames.TryParseSourceMethodNameFromGeneratedName(type.Name, GeneratedNameKind.StateMachineType, out stateMachineName)) diff --git a/src/Scripting/CSharp/PublicAPI.Unshipped.txt b/src/Scripting/CSharp/PublicAPI.Unshipped.txt index 17ef1e16171724fabd7543443088b705c7684656..9ab2f38087f059b1ac07b1cec4d3a97c1a18cf16 100644 --- a/src/Scripting/CSharp/PublicAPI.Unshipped.txt +++ b/src/Scripting/CSharp/PublicAPI.Unshipped.txt @@ -26,7 +26,7 @@ override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpPrimitiveFormatte override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpPrimitiveFormatter.NullLiteral.get -> string override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpTypeNameFormatter.ArrayClosing.get -> string override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpTypeNameFormatter.ArrayOpening.get -> string -override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpTypeNameFormatter.FormatTypeName(System.Type type, Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options options) -> string +override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpTypeNameFormatter.FormatTypeName(System.Type type, Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions options) -> string override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpTypeNameFormatter.GenericParameterClosing.get -> string override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpTypeNameFormatter.GenericParameterOpening.get -> string override Microsoft.CodeAnalysis.CSharp.Scripting.Hosting.CSharpTypeNameFormatter.GetPrimitiveTypeName(Microsoft.CodeAnalysis.SpecialType type) -> string diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonObjectFormatter.Visitor.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonObjectFormatter.Visitor.cs index 4f349c2aa298efa1f0df6cec549831246160706f..fa1dabf5592cf70ff49d3a053ec5051310e407ef 100644 --- a/src/Scripting/Core/Hosting/ObjectFormatter/CommonObjectFormatter.Visitor.cs +++ b/src/Scripting/Core/Hosting/ObjectFormatter/CommonObjectFormatter.Visitor.cs @@ -21,8 +21,8 @@ private sealed partial class Visitor private readonly CommonObjectFormatter _formatter; private readonly BuilderOptions _builderOptions; - private CommonPrimitiveFormatter.Options _primitiveOptions; - private CommonTypeNameFormatter.Options _typeNameOptions; + private CommonPrimitiveFormatterOptions _primitiveOptions; + private CommonTypeNameFormatterOptions _typeNameOptions; private MemberDisplayFormat _memberDisplayFormat; private HashSet _lazyVisitedObjects; @@ -43,8 +43,8 @@ private HashSet VisitedObjects public Visitor( CommonObjectFormatter formatter, BuilderOptions builderOptions, - CommonPrimitiveFormatter.Options primitiveOptions, - CommonTypeNameFormatter.Options typeNameOptions, + CommonPrimitiveFormatterOptions primitiveOptions, + CommonTypeNameFormatterOptions typeNameOptions, MemberDisplayFormat memberDisplayFormat) { _formatter = formatter; @@ -787,10 +787,10 @@ private Builder FormatWithEmbeddedExpressions(Builder result, string format, obj else { MemberDisplayFormat oldMemberDisplayFormat = _memberDisplayFormat; - CommonPrimitiveFormatter.Options oldPrimitiveOptions = _primitiveOptions; + CommonPrimitiveFormatterOptions oldPrimitiveOptions = _primitiveOptions; _memberDisplayFormat = MemberDisplayFormat.Hidden; - _primitiveOptions = new CommonPrimitiveFormatter.Options(_primitiveOptions.UseHexadecimalNumbers, _primitiveOptions.IncludeCharacterCodePoints, omitStringQuotes: noQuotes); + _primitiveOptions = new CommonPrimitiveFormatterOptions(_primitiveOptions.UseHexadecimalNumbers, _primitiveOptions.IncludeCharacterCodePoints, omitStringQuotes: noQuotes); string _; FormatObjectRecursive(result, value, isRoot: false, debuggerDisplayName: out _); diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonObjectFormatter.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonObjectFormatter.cs index d1c06243bc14fb0cb31d75c53b9c3f361a3d6997..7e9f808c5a57e0f4078f84b7365e4724c34f046b 100644 --- a/src/Scripting/Core/Hosting/ObjectFormatter/CommonObjectFormatter.cs +++ b/src/Scripting/Core/Hosting/ObjectFormatter/CommonObjectFormatter.cs @@ -42,14 +42,14 @@ public override string FormatObject(object obj, PrintOptions options) maximumLineLength: int.MaxValue, maximumOutputLength: printOptions.MaximumOutputLength); - protected virtual CommonPrimitiveFormatter.Options GetPrimitiveOptions(PrintOptions printOptions) => - new CommonPrimitiveFormatter.Options( + protected virtual CommonPrimitiveFormatterOptions GetPrimitiveOptions(PrintOptions printOptions) => + new CommonPrimitiveFormatterOptions( useHexadecimalNumbers: printOptions.NumberRadix == NumberRadix.Hexadecimal, includeCodePoints: printOptions.EscapeNonPrintableCharacters, // TODO (acasey): not quite the same omitStringQuotes: false); - protected virtual CommonTypeNameFormatter.Options GetTypeNameOptions(PrintOptions printOptions) => - new CommonTypeNameFormatter.Options( + protected virtual CommonTypeNameFormatterOptions GetTypeNameOptions(PrintOptions printOptions) => + new CommonTypeNameFormatterOptions( useHexadecimalArrayBounds: printOptions.NumberRadix == NumberRadix.Hexadecimal, showNamespaces: false); @@ -101,7 +101,7 @@ internal virtual string FormatMethodSignature(MethodBase method) var builder = pooled.Builder; var declaringType = method.DeclaringType; - var options = new CommonTypeNameFormatter.Options(useHexadecimalArrayBounds: false, showNamespaces: true); + var options = new CommonTypeNameFormatterOptions(useHexadecimalArrayBounds: false, showNamespaces: true); builder.Append(TypeNameFormatter.FormatTypeName(declaringType, options)); builder.Append('.'); diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatter.Options.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatter.Options.cs deleted file mode 100644 index fb5ad09aa2181bf04f0f525f5f2d42b9d23e3cde..0000000000000000000000000000000000000000 --- a/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatter.Options.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.CodeAnalysis.Scripting.Hosting -{ - public abstract partial class CommonPrimitiveFormatter - { - public struct Options - { - public readonly bool UseHexadecimalNumbers; - public readonly bool IncludeCharacterCodePoints; - public readonly bool OmitStringQuotes; - - public Options(bool useHexadecimalNumbers, bool includeCodePoints, bool omitStringQuotes) - { - UseHexadecimalNumbers = useHexadecimalNumbers; - IncludeCharacterCodePoints = includeCodePoints; - OmitStringQuotes = omitStringQuotes; - } - } - } -} diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatter.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatter.cs index 63425c7b2c20ce3359fc8de2cc01b85436e4f836..887726394273122ee4fa88c980a96659e7e88937 100644 --- a/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatter.cs +++ b/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatter.cs @@ -35,7 +35,7 @@ public abstract partial class CommonPrimitiveFormatter /// /// Returns null if the type is not considered primitive in the target language. /// - public string FormatPrimitive(object obj, Options options) + public string FormatPrimitive(object obj, CommonPrimitiveFormatterOptions options) { if (ReferenceEquals(obj, VoidValue)) { diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatterOptions.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatterOptions.cs new file mode 100644 index 0000000000000000000000000000000000000000..52dbe3b4223809e8506d15e891ee0dd36e82280e --- /dev/null +++ b/src/Scripting/Core/Hosting/ObjectFormatter/CommonPrimitiveFormatterOptions.cs @@ -0,0 +1,18 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.CodeAnalysis.Scripting.Hosting +{ + public struct CommonPrimitiveFormatterOptions + { + public bool UseHexadecimalNumbers { get; } + public bool IncludeCharacterCodePoints { get; } + public bool OmitStringQuotes { get; } + + public CommonPrimitiveFormatterOptions(bool useHexadecimalNumbers, bool includeCodePoints, bool omitStringQuotes) + { + UseHexadecimalNumbers = useHexadecimalNumbers; + IncludeCharacterCodePoints = includeCodePoints; + OmitStringQuotes = omitStringQuotes; + } + } +} diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.Options.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.Options.cs deleted file mode 100644 index a99f65bbc62e9052fd7ffc708539f41570be1ec9..0000000000000000000000000000000000000000 --- a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.Options.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.CodeAnalysis.Scripting.Hosting -{ - public abstract partial class CommonTypeNameFormatter - { - public struct Options - { - public readonly bool UseHexadecimalArrayBounds; - public readonly bool ShowNamespaces; - - public Options(bool useHexadecimalArrayBounds, bool showNamespaces) - { - UseHexadecimalArrayBounds = useHexadecimalArrayBounds; - ShowNamespaces = showNamespaces; - } - } - } -} \ No newline at end of file diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs index 173d7ef15b109f81a130f6c286b997a027ab6942..231c657819f936b20b9896dd345ce52c13ea0e89 100644 --- a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs +++ b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs @@ -24,7 +24,7 @@ public abstract partial class CommonTypeNameFormatter protected abstract CommonPrimitiveFormatter PrimitiveFormatter { get; } // TODO (tomat): Use DebuggerDisplay.Type if specified? - public virtual string FormatTypeName(Type type, Options options) + public virtual string FormatTypeName(Type type, CommonTypeNameFormatterOptions options) { if (type == null) { @@ -56,7 +56,7 @@ public virtual string FormatTypeName(Type type, Options options) return FormatNonGenericTypeName(typeInfo, options); } - private static string FormatNonGenericTypeName(TypeInfo typeInfo, Options options) + private static string FormatNonGenericTypeName(TypeInfo typeInfo, CommonTypeNameFormatterOptions options) { if (options.ShowNamespaces) { @@ -83,7 +83,7 @@ private static string FormatNonGenericTypeName(TypeInfo typeInfo, Options option return typeName; } - public virtual string FormatTypeArguments(Type[] typeArguments, Options options) + public virtual string FormatTypeArguments(Type[] typeArguments, CommonTypeNameFormatterOptions options) { if (typeArguments == null) { @@ -123,7 +123,7 @@ public virtual string FormatTypeArguments(Type[] typeArguments, Options options) /// /// Formats an array type name (vector or multidimensional). /// - public virtual string FormatArrayTypeName(Type arrayType, Array arrayOpt, Options options) + public virtual string FormatArrayTypeName(Type arrayType, Array arrayOpt, CommonTypeNameFormatterOptions options) { if (arrayType == null) { @@ -200,7 +200,7 @@ public virtual string FormatArrayTypeName(Type arrayType, Array arrayOpt, Option private void AppendArrayBound(StringBuilder sb, long bound, bool useHexadecimalNumbers) { - var options = new CommonPrimitiveFormatter.Options(useHexadecimalNumbers, includeCodePoints: false, omitStringQuotes: false); + var options = new CommonPrimitiveFormatterOptions(useHexadecimalNumbers, includeCodePoints: false, omitStringQuotes: false); var formatted = int.MinValue <= bound && bound <= int.MaxValue ? PrimitiveFormatter.FormatPrimitive((int)bound, options) : PrimitiveFormatter.FormatPrimitive(bound, options); @@ -218,7 +218,7 @@ private void AppendArrayRank(StringBuilder sb, Type arrayType) sb.Append(']'); } - private string FormatGenericTypeName(TypeInfo typeInfo, Options options) + private string FormatGenericTypeName(TypeInfo typeInfo, CommonTypeNameFormatterOptions options) { var pooledBuilder = PooledStringBuilder.GetInstance(); var builder = pooledBuilder.Builder; @@ -272,7 +272,7 @@ private string FormatGenericTypeName(TypeInfo typeInfo, Options options) TypeInfo typeInfo, Type[] genericArguments, ref int genericArgIndex, - Options options) + CommonTypeNameFormatterOptions options) { // generic arguments of all the outer types and the current type; int currentArgCount = (typeInfo.IsGenericTypeDefinition ? typeInfo.GenericTypeParameters.Length : typeInfo.GenericTypeArguments.Length) - genericArgIndex; diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatterOptions.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatterOptions.cs new file mode 100644 index 0000000000000000000000000000000000000000..d548d9b7770d658cea1fcbdf25c190c811b341b7 --- /dev/null +++ b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatterOptions.cs @@ -0,0 +1,16 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.CodeAnalysis.Scripting.Hosting +{ + public struct CommonTypeNameFormatterOptions + { + public bool UseHexadecimalArrayBounds { get; } + public bool ShowNamespaces { get; } + + public CommonTypeNameFormatterOptions(bool useHexadecimalArrayBounds, bool showNamespaces) + { + UseHexadecimalArrayBounds = useHexadecimalArrayBounds; + ShowNamespaces = showNamespaces; + } + } +} \ No newline at end of file diff --git a/src/Scripting/Core/PublicAPI.Unshipped.txt b/src/Scripting/Core/PublicAPI.Unshipped.txt index a96c5a0c18bcb37a23585711215928d90c3492f4..96eb6fb1a0f46552481f94897a6b36456a9e0c50 100644 --- a/src/Scripting/Core/PublicAPI.Unshipped.txt +++ b/src/Scripting/Core/PublicAPI.Unshipped.txt @@ -8,13 +8,13 @@ Microsoft.CodeAnalysis.Scripting.Hosting.CommandLineScriptGlobals.Print(object v Microsoft.CodeAnalysis.Scripting.Hosting.CommandLineScriptGlobals.PrintOptions.get -> Microsoft.CodeAnalysis.Scripting.Hosting.PrintOptions Microsoft.CodeAnalysis.Scripting.Hosting.CommonObjectFormatter Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter -Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.FormatPrimitive(object obj, Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.Options options) -> string -Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.Options -Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.Options.Options(bool useHexadecimalNumbers, bool includeCodePoints, bool omitStringQuotes) -> void +Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.FormatPrimitive(object obj, Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatterOptions options) -> string +Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatterOptions +Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatterOptions.Options(bool useHexadecimalNumbers, bool includeCodePoints, bool omitStringQuotes) -> void Microsoft.CodeAnalysis.Scripting.Hosting.CommonStackTraceRewriter Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter -Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options -Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options.Options(bool useHexadecimalArrayBounds, bool showNamespaces) -> void +Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions +Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions.Options(bool useHexadecimalArrayBounds, bool showNamespaces) -> void Microsoft.CodeAnalysis.Scripting.Hosting.FileShadowCopy Microsoft.CodeAnalysis.Scripting.Hosting.FileShadowCopy.FullPath.get -> string Microsoft.CodeAnalysis.Scripting.Hosting.FileShadowCopy.OriginalPath.get -> string @@ -179,18 +179,18 @@ override Microsoft.CodeAnalysis.Scripting.ScriptMetadataResolver.ResolveMissingA override Microsoft.CodeAnalysis.Scripting.ScriptMetadataResolver.ResolveReference(string reference, string baseFilePath, Microsoft.CodeAnalysis.MetadataReferenceProperties properties) -> System.Collections.Immutable.ImmutableArray override Microsoft.CodeAnalysis.Scripting.ScriptSourceResolver.Equals(object obj) -> bool override Microsoft.CodeAnalysis.Scripting.ScriptSourceResolver.GetHashCode() -> int -readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.Options.IncludeCharacterCodePoints -> bool -readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.Options.OmitStringQuotes -> bool -readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.Options.UseHexadecimalNumbers -> bool -readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options.ShowNamespaces -> bool -readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options.UseHexadecimalArrayBounds -> bool +readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatterOptions.IncludeCharacterCodePoints -> bool +readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatterOptions.OmitStringQuotes -> bool +readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatterOptions.UseHexadecimalNumbers -> bool +readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions.ShowNamespaces -> bool +readonly Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions.UseHexadecimalArrayBounds -> bool static Microsoft.CodeAnalysis.Scripting.ScriptMetadataResolver.Default.get -> Microsoft.CodeAnalysis.Scripting.ScriptMetadataResolver static Microsoft.CodeAnalysis.Scripting.ScriptOptions.Default.get -> Microsoft.CodeAnalysis.Scripting.ScriptOptions static Microsoft.CodeAnalysis.Scripting.ScriptSourceResolver.Default.get -> Microsoft.CodeAnalysis.Scripting.ScriptSourceResolver -virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonObjectFormatter.GetPrimitiveOptions(Microsoft.CodeAnalysis.Scripting.Hosting.PrintOptions printOptions) -> Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatter.Options -virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonObjectFormatter.GetTypeNameOptions(Microsoft.CodeAnalysis.Scripting.Hosting.PrintOptions printOptions) -> Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options +virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonObjectFormatter.GetPrimitiveOptions(Microsoft.CodeAnalysis.Scripting.Hosting.PrintOptions printOptions) -> Microsoft.CodeAnalysis.Scripting.Hosting.CommonPrimitiveFormatterOptions +virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonObjectFormatter.GetTypeNameOptions(Microsoft.CodeAnalysis.Scripting.Hosting.PrintOptions printOptions) -> Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonObjectFormatter.StackTraceRewriter.get -> Microsoft.CodeAnalysis.Scripting.Hosting.StackTraceRewriter -virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.FormatArrayTypeName(System.Type arrayType, System.Array arrayOpt, Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options options) -> string -virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.FormatTypeArguments(System.Type[] typeArguments, Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options options) -> string -virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.FormatTypeName(System.Type type, Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options options) -> string +virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.FormatArrayTypeName(System.Type arrayType, System.Array arrayOpt, Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions options) -> string +virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.FormatTypeArguments(System.Type[] typeArguments, Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions options) -> string +virtual Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.FormatTypeName(System.Type type, Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions options) -> string virtual Microsoft.CodeAnalysis.Scripting.Hosting.StackTraceRewriter.Rewrite(System.Collections.Generic.IEnumerable frames) -> System.Collections.Generic.IEnumerable \ No newline at end of file diff --git a/src/Scripting/Core/Scripting.csproj b/src/Scripting/Core/Scripting.csproj index 9666489aef3618ab00d31703a3f6653c0d519dc2..a3089105e1710626308da3f73ca26bf30704efd9 100644 --- a/src/Scripting/Core/Scripting.csproj +++ b/src/Scripting/Core/Scripting.csproj @@ -79,9 +79,9 @@ - + - + diff --git a/src/Scripting/CoreTest/TestCSharpObjectFormatter.cs b/src/Scripting/CoreTest/TestCSharpObjectFormatter.cs index 42541dafe0c7684a98fce070789024c67d65549c..93048593c50572cfe3222ab3ee32addc68d8d542 100644 --- a/src/Scripting/CoreTest/TestCSharpObjectFormatter.cs +++ b/src/Scripting/CoreTest/TestCSharpObjectFormatter.cs @@ -24,7 +24,7 @@ public TestCSharpObjectFormatter(bool omitStringQuotes = false, int maximumLineL maximumLineLength: _maximumLineLength, maximumOutputLength: printOptions.MaximumOutputLength); - protected override CommonPrimitiveFormatter.Options GetPrimitiveOptions(PrintOptions printOptions) => - new CommonPrimitiveFormatter.Options(printOptions.NumberRadix == NumberRadix.Hexadecimal, printOptions.EscapeNonPrintableCharacters, _omitStringQuotes); + protected override CommonPrimitiveFormatterOptions GetPrimitiveOptions(PrintOptions printOptions) => + new CommonPrimitiveFormatterOptions(printOptions.NumberRadix == NumberRadix.Hexadecimal, printOptions.EscapeNonPrintableCharacters, _omitStringQuotes); } } \ No newline at end of file diff --git a/src/Scripting/CoreTest/TestVisualBasicObjectFormatter.cs b/src/Scripting/CoreTest/TestVisualBasicObjectFormatter.cs index 3611c297315b7c29883750bcc6f441988d1e4dd4..6578ae814920d947efc87c92dbda72470ebda23a 100644 --- a/src/Scripting/CoreTest/TestVisualBasicObjectFormatter.cs +++ b/src/Scripting/CoreTest/TestVisualBasicObjectFormatter.cs @@ -26,7 +26,7 @@ public sealed class TestVisualBasicObjectFormatter : VisualBasicObjectFormatter maximumLineLength: _maximumLineLength, maximumOutputLength: printOptions.MaximumOutputLength); - protected override CommonPrimitiveFormatter.Options GetPrimitiveOptions(PrintOptions printOptions) => - new CommonPrimitiveFormatter.Options(printOptions.NumberRadix == NumberRadix.Hexadecimal, printOptions.EscapeNonPrintableCharacters, _omitStringQuotes); + protected override CommonPrimitiveFormatterOptions GetPrimitiveOptions(PrintOptions printOptions) => + new CommonPrimitiveFormatterOptions(printOptions.NumberRadix == NumberRadix.Hexadecimal, printOptions.EscapeNonPrintableCharacters, _omitStringQuotes); } } \ No newline at end of file diff --git a/src/Scripting/VisualBasic/Hosting/ObjectFormatter/VisualBasicTypeNameFormatter.vb b/src/Scripting/VisualBasic/Hosting/ObjectFormatter/VisualBasicTypeNameFormatter.vb index 20f99e230c9f0fb73a40b213c40e30337abb4131..40e818b6245d8b423d23470c3ecad388c4d9d693 100644 --- a/src/Scripting/VisualBasic/Hosting/ObjectFormatter/VisualBasicTypeNameFormatter.vb +++ b/src/Scripting/VisualBasic/Hosting/ObjectFormatter/VisualBasicTypeNameFormatter.vb @@ -77,7 +77,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting End Property - Public Overrides Function FormatTypeName(type As Type, options As Options) As String + Public Overrides Function FormatTypeName(type As Type, options As CommonTypeNameFormatterOptions) As String ' TODO (https://github.com/dotnet/roslyn/issues/3739): handle generated type names (e.g. state machines as in C#) Return MyBase.FormatTypeName(type, options) diff --git a/src/Scripting/VisualBasic/PublicAPI.Unshipped.txt b/src/Scripting/VisualBasic/PublicAPI.Unshipped.txt index cee79f6c69a715ac3dd4e193d3dc40500b23a200..f83f686c4c3308a35e20bb17710a3a163f843d9d 100644 --- a/src/Scripting/VisualBasic/PublicAPI.Unshipped.txt +++ b/src/Scripting/VisualBasic/PublicAPI.Unshipped.txt @@ -24,7 +24,7 @@ Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicPrimit Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicPrimitiveFormatter.NullLiteral() -> String Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicTypeNameFormatter.ArrayClosing() -> String Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicTypeNameFormatter.ArrayOpening() -> String -Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicTypeNameFormatter.FormatTypeName(type As System.Type, options As Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatter.Options) -> String +Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicTypeNameFormatter.FormatTypeName(type As System.Type, options As Microsoft.CodeAnalysis.Scripting.Hosting.CommonTypeNameFormatterOptions) -> String Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicTypeNameFormatter.GenericParameterClosing() -> String Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicTypeNameFormatter.GenericParameterOpening() -> String Overrides Microsoft.CodeAnalysis.VisualBasic.Scripting.Hosting.VisualBasicTypeNameFormatter.GetPrimitiveTypeName(type As Microsoft.CodeAnalysis.SpecialType) -> String