Skip to content

Commit 186666b

Browse files
rename GetAccurateName
1 parent 93a3e98 commit 186666b

10 files changed

Lines changed: 37 additions & 39 deletions

File tree

Code/ArgumentSystem/Arguments/ValueArgument.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace SER.Code.ArgumentSystem.Arguments;
99

1010
public class ValueArgument<T>(string name) : Argument(name) where T : Value
1111
{
12-
public override string InputDescription => $"a value of type {typeof(T).GetAccurateName()}";
12+
public override string InputDescription => $"a value of type {typeof(T).AccurateName}";
1313

1414
[UsedImplicitly]
1515
public DynamicTryGet<T> GetConvertSolution(BaseToken token)

Code/ArgumentSystem/MethodArgumentDispatcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static ConverterInfo GetConverterInfo(Type argType)
4747
return ConverterCache[argType] = new ConverterInfo(instanceMethod);
4848
}
4949

50-
throw new AndrzejFuckedUpException($"No suitable GetConvertSolution method found for {argType.GetAccurateName()}.");
50+
throw new AndrzejFuckedUpException($"No suitable GetConvertSolution method found for {argType.AccurateName}.");
5151
}
5252

5353
public TryGet<ArgumentValueInfo?> TryGetValueInfo(BaseToken token, int index)

Code/ArgumentSystem/Structures/Option.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ public static implicit operator Option(string value)
1313
public static Option Enum<T>(string? name = null) where T : struct, Enum
1414
{
1515
HelpInfoStorage.UsedEnums.Add(typeof(T));
16-
return new(name ?? typeof(T).Name.LowerFirst(), $"Returns a {typeof(T).GetAccurateName()} enum value");
16+
return new(name ?? typeof(T).Name.LowerFirst(), $"Returns a {typeof(T).AccurateName} enum value");
1717
}
1818

1919
public static Option Reference<T>(string value) where T : class
2020
{
21-
return new(value, $"Returns a reference to {typeof(T).GetAccurateName()} object");
21+
return new(value, $"Returns a reference to {typeof(T).AccurateName} object");
2222
}
2323
}

Code/ContextSystem/Contexts/VariableDefinition/VariableDefinitionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public abstract class VariableDefinitionContext<TVarToken, TValue, TVariable>(TV
2727
{
2828
protected virtual (TryAddTokenRes result, Func<TValue> parser) AdditionalParsing(BaseToken token)
2929
{
30-
return (TryAddTokenRes.Error($"Value '{token.RawRep}' ({token.GetType().GetAccurateName()}) cannot be assigned to {typeof(TVarToken).GetAccurateName()} variable"), null!);
30+
return (TryAddTokenRes.Error($"Value '{token.RawRep}' ({token.GetType().AccurateName}) cannot be assigned to {typeof(TVarToken).AccurateName} variable"), null!);
3131
}
3232

3333
protected Func<BaseToken, Func<TValue>?>? AdditionalTokenParser = null;

Code/EventSystem/EventHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private static void OnNonArgumentedEvent(string evName)
150150

151151
private static void OnArgumentedEvent<T>(string evName, T ev) where T : EventArgs
152152
{
153-
Log.Debug($"[Arg] Event '{evName}' triggered with {typeof(T).GetAccurateName()}.");
153+
Log.Debug($"[Arg] Event '{evName}' triggered with {typeof(T).AccurateName}.");
154154

155155
if (ev is ICancellableEvent cancellable && DisabledEvents.Contains(evName))
156156
{

Code/Extensions/TypeExtensions.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,32 @@ public static class TypeExtensions
66
{
77
extension(Type type)
88
{
9-
public string AccurateName => GetAccurateName(type);
10-
}
11-
12-
// done by chatgpt
13-
public static string GetAccurateName(this Type type)
14-
{
15-
if (!type.IsGenericType)
16-
return type.Name;
9+
public string AccurateName
10+
{
11+
get
12+
{
13+
if (!type.IsGenericType)
14+
return type.Name;
1715

18-
var sb = new StringBuilder();
19-
string name = type.Name;
20-
int index = name.IndexOf('`');
21-
if (index > 0)
22-
name = name[..index];
16+
var sb = new StringBuilder();
17+
string name = type.Name;
18+
int index = name.IndexOf('`');
19+
if (index > 0)
20+
name = name[..index];
2321

24-
sb.Append(name);
25-
sb.Append('<');
26-
var args = type.GetGenericArguments();
27-
for (int i = 0; i < args.Length; i++)
28-
{
29-
if (i > 0)
30-
sb.Append(", ");
31-
sb.Append(args[i].GetAccurateName()); // recursion for nested generics
22+
sb.Append(name);
23+
sb.Append('<');
24+
var args = type.GetGenericArguments();
25+
for (int i = 0; i < args.Length; i++)
26+
{
27+
if (i > 0)
28+
sb.Append(", ");
29+
sb.Append(args[i].AccurateName); // recursion for nested generics
30+
}
31+
sb.Append('>');
32+
return sb.ToString();
33+
}
3234
}
33-
sb.Append('>');
34-
return sb.ToString();
3535
}
3636

3737
public static object CreateInstance(this Type type)

Code/FileSystem/Structures/Database.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Database
1111
{
1212
public readonly struct DatabaseValue(Type originalType, object value)
1313
{
14-
public string Type { get; } = originalType.GetAccurateName();
14+
public string Type { get; } = originalType.AccurateName;
1515
public object Value { get; } = value;
1616
}
1717

@@ -109,7 +109,7 @@ public TryGet<Value> Get(string key)
109109
return $"Value of key '{key}' cannot be read.";
110110
}
111111

112-
if (val.Type == typeof(PlayerValue).GetAccurateName())
112+
if (val.Type == typeof(PlayerValue).AccurateName)
113113
{
114114
if (val.Value is not string[] playerIds)
115115
{
@@ -119,7 +119,7 @@ public TryGet<Value> Get(string key)
119119
return Value.Parse(Player.List.Where(p => playerIds.Contains(p.UserId)), null);
120120
}
121121

122-
if (Value.Parse(val.Value, null) is { } value && value.GetType().GetAccurateName() == val.Type)
122+
if (Value.Parse(val.Value, null) is { } value && value.GetType().AccurateName == val.Type)
123123
{
124124
return value;
125125
}

Code/Plugin/Commands/HelpSystem/DocsProvider.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System.Reflection;
22
using System.Text;
33
using CommandSystem;
4-
using Newtonsoft.Json;
5-
using Newtonsoft.Json.Linq;
64
using SER.Code.ContextSystem.BaseContexts;
75
using SER.Code.ContextSystem.Interfaces;
86
using SER.Code.Exceptions;
@@ -296,7 +294,7 @@ private static string GetReferenceResolvingMethodsHelpPage()
296294
var sb = new StringBuilder();
297295
foreach (var method in referenceResolvingMethods)
298296
{
299-
sb.AppendLine($"{method.ReferenceType.GetAccurateName()} ref -> {method.Name} method");
297+
sb.AppendLine($"{method.ReferenceType.AccurateName} ref -> {method.Name} method");
300298
}
301299

302300
return
@@ -484,7 +482,7 @@ private static string GetMethodHelp(Method method)
484482
break;
485483
case IReferenceReturningMethod refMethod:
486484
sb.AppendLine();
487-
sb.AppendLine($"Returns a reference to {refMethod.ReturnType.GetAccurateName()} object.");
485+
sb.AppendLine($"Returns a reference to {refMethod.ReturnType.AccurateName} object.");
488486
break;
489487
case IReturningMethod ret:
490488
{

Code/TokenSystem/Tokens/BaseToken.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public TryGet<T> TryGetLiteralValue<T>() where T : LiteralValue
109109
return correctValue;
110110
}
111111

112-
return $"Expression '{parenthesesToken.RawRep}' parsed to a {result.GetType().GetAccurateName()} " +
112+
return $"Expression '{parenthesesToken.RawRep}' parsed to a {result.GetType().AccurateName} " +
113113
$"'{result}', which is not a '{typeof(T).Name}' value.";
114114
}
115115

Code/ValueSystem/ReferenceValue.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public override bool EqualCondition(Value other)
2222

2323
public override string ToString()
2424
{
25-
return $"<{Value.GetType().GetAccurateName()} reference | {Value.GetHashCode()}>";
25+
return $"<{Value.GetType().AccurateName} reference | {Value.GetHashCode()}>";
2626
}
2727
}
2828

@@ -31,5 +31,5 @@ public class ReferenceValue<T>(T? value) : ReferenceValue(value)
3131
public new T Value => (T) base.Value;
3232

3333
[UsedImplicitly]
34-
public new static string FriendlyName => $"reference to {typeof(T).GetAccurateName()} object";
34+
public new static string FriendlyName => $"reference to {typeof(T).AccurateName} object";
3535
}

0 commit comments

Comments
 (0)