Cleanup

pushpay · Jul 24, 2016 · e5a4992 · e5a4992
1 parent dfdef4b
commit e5a4992
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Opserver.Core/ExtensionMethods.cs b/Opserver.Core/ExtensionMethods.cs
@@ -70,7 +70,7 @@ public static string TrimEnd(this string s, string toTrim) =>
         /// </summary>
         public static string ReadableTypeDescription(this Type t) =>
             t.IsGenericType
-                ? $"{t.Name.Split('`')[0]}<{string.Join(",", t.GetGenericArguments().Select(a => a.Name))}>"
+                ? $"{t.Name.Split(StringSplits.Tilde)[0]}<{string.Join(",", t.GetGenericArguments().Select(a => a.Name))}>"
                 : t.Name;
 
         /// <summary>
@@ -127,14 +127,10 @@ public static string Pluralize(this string noun, int number, string pluralForm =
         /// force string to be maxlen or smaller
         /// </summary>
         public static string Truncate(this string s, int maxLength) =>
-            s.IsNullOrEmpty()
-                ? s
-                : (s.Length > maxLength ? s.Remove(maxLength) : s);
+            s.IsNullOrEmpty() ? s : (s.Length > maxLength ? s.Remove(maxLength) : s);
 
         public static string TruncateWithEllipsis(this string s, int maxLength) =>
-            s.IsNullOrEmpty() || s.Length <= maxLength
-                ? s
-                : Truncate(s, Math.Max(maxLength, 3) - 3) + "...";
+            s.IsNullOrEmpty() || s.Length <= maxLength ? s : Truncate(s, Math.Max(maxLength, 3) - 3) + "…";
 
         public static string CleanCRLF(this string s) =>
             string.IsNullOrWhiteSpace(s)
@@ -157,7 +153,7 @@ public static string NormalizeHostOrFQDN(this string s, bool defaultToHttps = fa
 
         public static IEnumerable<T> WithIssues<T>(this IEnumerable<T> items) where T : IMonitorStatus =>
             items.Where(i => i.MonitorStatus != MonitorStatus.Good);
-        
+
         public static string GetReasonSummary(this IEnumerable<IMonitorStatus> items) =>
             string.Join(", ", items.WithIssues().Select(i => i.MonitorStatusReason));
 

diff --git a/Opserver.Core/StringSplits.cs b/Opserver.Core/StringSplits.cs
@@ -25,6 +25,7 @@ public static readonly char[]
             ForwardSlash = {'/'},
             BackSlash = {'\\'},
             DoubleQuote = {'"'},
+            Tilde = {'`'},
             Period_Plus = {'.', '+'},
             NewLine_CarriageReturn = {'\n', '\r'},
             Comma_SemiColon = {',', ';'},

diff --git a/Opserver.sln.DotSettings b/Opserver.sln.DotSettings
@@ -72,5 +72,6 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>