Browse Source

string.Format converted to interpolated string

pull/12226/head
John Doe 3 years ago
parent
commit
15b42836b1
  1. 4
      src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
  2. 8
      src/Avalonia.Remote.Protocol/MetsysBson.cs
  3. 5
      src/Avalonia.X11/X11Structs.cs

4
src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs

@ -1113,11 +1113,11 @@ namespace Avalonia.Controls
} }
if (value < Minimum) if (value < Minimum)
{ {
throw new ArgumentOutOfRangeException(nameof(value), string.Format("Value must be greater than Minimum value of {0}", Minimum)); throw new ArgumentOutOfRangeException(nameof(value), $"Value must be greater than Minimum value of {Minimum}");
} }
else if (value > Maximum) else if (value > Maximum)
{ {
throw new ArgumentOutOfRangeException(nameof(value), string.Format("Value must be less than Maximum value of {0}", Maximum)); throw new ArgumentOutOfRangeException(nameof(value), $"Value must be less than Maximum value of {Maximum}");
} }
} }

8
src/Avalonia.Remote.Protocol/MetsysBson.cs

@ -752,7 +752,7 @@ namespace Metsys.Bson
if (memberExpression.Expression.NodeType != ExpressionType.Parameter && memberExpression.Expression.NodeType != ExpressionType.Convert) if (memberExpression.Expression.NodeType != ExpressionType.Parameter && memberExpression.Expression.NodeType != ExpressionType.Convert)
{ {
throw new ArgumentException(string.Format("Expression '{0}' must resolve to top-level member.", lambdaExpression), nameof(lambdaExpression)); throw new ArgumentException($"Expression '{lambdaExpression}' must resolve to top-level member.", nameof(lambdaExpression));
} }
return memberExpression.Member.Name; return memberExpression.Member.Name;
default: default:
@ -942,7 +942,7 @@ namespace Metsys.Bson
return new ListWrapper(); return new ListWrapper();
} }
} }
throw new BsonException(string.Format("Collection of type {0} cannot be deserialized", type.FullName)); throw new BsonException($"Collection of type {type.FullName} cannot be deserialized");
} }
public abstract void Add(object value); public abstract void Add(object value);
@ -1514,7 +1514,7 @@ namespace Metsys.Bson.Configuration
result = Visit((MemberExpression)expression.Left); result = Visit((MemberExpression)expression.Left);
} }
var index = Expression.Lambda(expression.Right).Compile().DynamicInvoke(); var index = Expression.Lambda(expression.Right).Compile().DynamicInvoke();
return result + string.Format("[{0}]", index); return result + $"[{index}]";
} }
private string Visit(MemberExpression expression) private string Visit(MemberExpression expression)
@ -1540,7 +1540,7 @@ namespace Metsys.Bson.Configuration
if (expression.Method.Name == "get_Item" && expression.Arguments.Count == 1) if (expression.Method.Name == "get_Item" && expression.Arguments.Count == 1)
{ {
var index = Expression.Lambda(expression.Arguments[0]).Compile().DynamicInvoke(); var index = Expression.Lambda(expression.Arguments[0]).Compile().DynamicInvoke();
name += string.Format("[{0}]", index); name += $"[{index}]";
} }
return name; return name;
} }

5
src/Avalonia.X11/X11Structs.cs

@ -1109,7 +1109,7 @@ namespace Avalonia.X11 {
public override string ToString () public override string ToString ()
{ {
return string.Format("MotifWmHints <flags={0}, functions={1}, decorations={2}, input_mode={3}, status={4}", (MotifFlags) flags.ToInt32 (), (MotifFunctions) functions.ToInt32 (), (MotifDecorations) decorations.ToInt32 (), (MotifInputMode) input_mode.ToInt32 (), status.ToInt32 ()); return $"MotifWmHints <flags={(MotifFlags)flags.ToInt32()}, functions={(MotifFunctions)functions.ToInt32()}, decorations={(MotifDecorations)decorations.ToInt32()}, input_mode={(MotifInputMode)input_mode.ToInt32()}, status={status.ToInt32()}";
} }
} }
@ -1707,8 +1707,7 @@ namespace Avalonia.X11 {
public override string ToString () public override string ToString ()
{ {
return string.Format ("XCursorImage (version: {0}, size: {1}, width: {2}, height: {3}, xhot: {4}, yhot: {5}, delay: {6}, pixels: {7}", return $"XCursorImage (version: {version}, size: {size}, width: {width}, height: {height}, xhot: {xhot}, yhot: {yhot}, delay: {delay}, pixels: {pixels}";
version, size, width, height, xhot, yhot, delay, pixels);
} }
} ; } ;

Loading…
Cancel
Save