Small optimizations from code review

c-sharp/Projects/ParatextProjectDataProvider.cs

@@ -65,15 +65,14 @@ LocalParatextProjects paratextProjects
 
     protected override Task StartDataProvider()
     {
-        var shouldIncludePT9ProjectsOnWindows = false;
+        bool? shouldIncludePT9ProjectsOnWindows = false;
         if (OperatingSystem.IsWindows())
         {
-            var shouldIncludePT9ProjectsElement = SettingsService.GetSettingValue<bool>(PapiClient, Settings.INCLUDE_MY_PARATEXT_9_PROJECTS);
-            if (!shouldIncludePT9ProjectsElement.HasValue)
+            shouldIncludePT9ProjectsOnWindows = SettingsService.GetSettingValue<bool>(PapiClient, Settings.INCLUDE_MY_PARATEXT_9_PROJECTS);
+            if (!shouldIncludePT9ProjectsOnWindows.HasValue)
                 throw new Exception($"Setting {Settings.INCLUDE_MY_PARATEXT_9_PROJECTS} was null!");
-            shouldIncludePT9ProjectsOnWindows = shouldIncludePT9ProjectsElement.Value;
         }
-        _paratextProjects.Initialize(shouldIncludePT9ProjectsOnWindows);
+        _paratextProjects.Initialize(shouldIncludePT9ProjectsOnWindows.Value);
         return Task.CompletedTask;
     }
 

c-sharp/Projects/ParatextProjectDataProviderFactory.cs

@@ -24,15 +24,14 @@ LocalParatextProjects paratextProjects
 
     protected override Task StartFactory()
     {
-        var shouldIncludePT9ProjectsOnWindows = false;
+        bool? shouldIncludePT9ProjectsOnWindows = false;
         if (OperatingSystem.IsWindows())
         {
-            var shouldIncludePT9ProjectsElement = SettingsService.GetSettingValue<bool>(PapiClient, Settings.INCLUDE_MY_PARATEXT_9_PROJECTS);
-            if (!shouldIncludePT9ProjectsElement.HasValue)
+            shouldIncludePT9ProjectsOnWindows = SettingsService.GetSettingValue<bool>(PapiClient, Settings.INCLUDE_MY_PARATEXT_9_PROJECTS);
+            if (!shouldIncludePT9ProjectsOnWindows.HasValue)
                 throw new Exception($"Setting {Settings.INCLUDE_MY_PARATEXT_9_PROJECTS} was null!");
-            shouldIncludePT9ProjectsOnWindows = shouldIncludePT9ProjectsElement.Value;
         }
-        _paratextProjects.Initialize(shouldIncludePT9ProjectsOnWindows);
+        _paratextProjects.Initialize(shouldIncludePT9ProjectsOnWindows.Value);
         return Task.CompletedTask;
     }
 

lib/platform-bible-utils/src/string-util.ts

@@ -135,37 +135,33 @@ export function formatReplacementString(str: string, replacers: { [key: string]:
   while (i < stringLength(updatedStr)) {
     switch (charAt(updatedStr, i)) {
       case '{':
-        if (charAt(updatedStr, i) === '{') {
-          if (charAt(updatedStr, i - 1) !== '\\') {
-            // This character is an un-escaped open curly brace. Try to match and replace
-            const closeCurlyBraceIndex = indexOfClosestClosingCurlyBrace(updatedStr, i, false);
-            if (closeCurlyBraceIndex >= 0) {
-              // We have matching open and close indices. Try to replace the contents
-              const replacerKey = substring(updatedStr, i + 1, closeCurlyBraceIndex);
-              // Replace with the replacer string or just remove the curly braces
-              const replacerString =
-                replacerKey in replacers ? replacers[replacerKey] : replacerKey;
-
-              updatedStr = `${substring(updatedStr, 0, i)}${replacerString}${substring(updatedStr, closeCurlyBraceIndex + 1)}`;
-              // Put our index at the closing brace adjusted for the new string length minus two
-              // because we are removing the curly braces
-              // Ex: "stuff {and} things"
-              // Replacer for and: n'
-              // closeCurlyBraceIndex is 10
-              // "stuff n' things"
-              // i = 10 + 2 - 3 - 2 = 7
-              i =
-                closeCurlyBraceIndex + stringLength(replacerString) - stringLength(replacerKey) - 2;
-            } else {
-              // This is an unexpected un-escaped open curly brace with no matching closing curly
-              // brace. Just ignore, I guess
-            }
+        if (charAt(updatedStr, i - 1) !== '\\') {
+          // This character is an un-escaped open curly brace. Try to match and replace
+          const closeCurlyBraceIndex = indexOfClosestClosingCurlyBrace(updatedStr, i, false);
+          if (closeCurlyBraceIndex >= 0) {
+            // We have matching open and close indices. Try to replace the contents
+            const replacerKey = substring(updatedStr, i + 1, closeCurlyBraceIndex);
+            // Replace with the replacer string or just remove the curly braces
+            const replacerString = replacerKey in replacers ? replacers[replacerKey] : replacerKey;
+
+            updatedStr = `${substring(updatedStr, 0, i)}${replacerString}${substring(updatedStr, closeCurlyBraceIndex + 1)}`;
+            // Put our index at the closing brace adjusted for the new string length minus two
+            // because we are removing the curly braces
+            // Ex: "stuff {and} things"
+            // Replacer for and: n'
+            // closeCurlyBraceIndex is 10
+            // "stuff n' things"
+            // i = 10 + 2 - 3 - 2 = 7
+            i = closeCurlyBraceIndex + stringLength(replacerString) - stringLength(replacerKey) - 2;
           } else {
-            // This character is an escaped open curly brace. Remove the escape
-            updatedStr = `${substring(updatedStr, 0, i - 1)}${substring(updatedStr, i)}`;
-            // Adjust our index because we removed the escape
-            i -= 1;
+            // This is an unexpected un-escaped open curly brace with no matching closing curly
+            // brace. Just ignore, I guess
           }
+        } else {
+          // This character is an escaped open curly brace. Remove the escape
+          updatedStr = `${substring(updatedStr, 0, i - 1)}${substring(updatedStr, i)}`;
+          // Adjust our index because we removed the escape
+          i -= 1;
         }
         break;
       case '}':