Merge pull request #3227 from eggrobin/3226

Mirror the overloads of Localizer.Format in LRUCache.Get and L10n.CacheFormat
mockingbirdnest · Dec 5, 2021 · d0f59ca · d0f59ca
2 parents 7522c92 + 5a28609
commit d0f59ca
Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/ksp_plugin_adapter/localization_extensions.cs b/ksp_plugin_adapter/localization_extensions.cs
@@ -134,6 +134,15 @@ public static string CelestialStringOrNull(string template,
                                 FormatOrNull(template, names));
   }
 
+  public static string CacheFormat(string name) {
+    return lru_cache_.Get(name, () => Localizer.Format(name));
+  }
+
+  public static string CacheFormat(string name, params string[] args) {
+    return lru_cache_.Get(name, args,
+                          () => Localizer.Format(name, args));
+  }
+
   public static string CacheFormat(string name, params object[] args) {
     return lru_cache_.Get(name, args,
                           () => Localizer.Format(name, args));

diff --git a/ksp_plugin_adapter/lru_cache.cs b/ksp_plugin_adapter/lru_cache.cs
@@ -8,7 +8,11 @@ namespace principia {
 namespace ksp_plugin_adapter {
 
 class LRUCache {
-  public string Get(string name, object[] args, Func<string> compute_value) {
+  public string Get(string name, Func<string> compute_value) {
+    return Get(name, new string[]{}, compute_value);
+  }
+
+  public string Get(string name, string[] args, Func<string> compute_value) {
     string key = MakeKey(name, args);
     Entry entry;
     if (cache_.TryGetValue(key, out entry)) {
@@ -30,10 +34,13 @@ public string Get(string name, object[] args, Func<string> compute_value) {
     return entry.value;
   }
 
-  public string MakeKey(string name, object[] args) {
+  public string Get(string name, object[] args, Func<string> compute_value) {
+    return Get(name, (from arg in args select arg.ToString()).ToArray(), compute_value);
+  }
+
+  public string MakeKey(string name, string[] args) {
     string unit_separator = "\x1F";
-    return name + unit_separator +
-        string.Join(unit_separator, from arg in args select arg.ToString());
+    return name + unit_separator + string.Join(unit_separator, args);
   }
 
   private class Entry {