Removed trailing space from ToDo markers

retailcoder · Jan 9, 2018 · 1fa3e01 · 1fa3e01
1 parent e2d8f37
commit 1fa3e01
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/RetailCoder.VBE/Properties/Settings.Designer.cs b/RetailCoder.VBE/Properties/Settings.Designer.cs
diff --git a/RetailCoder.VBE/Properties/Settings.settings b/RetailCoder.VBE/Properties/Settings.settings
@@ -147,15 +147,15 @@
     </Setting>
     <Setting Name="ToDoMarker_ToDo" Type="Rubberduck.Settings.ToDoMarker" Scope="Application">
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="TODO " /&gt;</Value>
+&lt;ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="TODO" /&gt;</Value>
     </Setting>
     <Setting Name="ToDoMarker_Note" Type="Rubberduck.Settings.ToDoMarker" Scope="Application">
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="NOTE " /&gt;</Value>
+&lt;ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="NOTE" /&gt;</Value>
     </Setting>
     <Setting Name="ToDoMarker_Bug" Type="Rubberduck.Settings.ToDoMarker" Scope="Application">
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="BUG " /&gt;</Value>
+&lt;ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="BUG" /&gt;</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/RetailCoder.VBE/UI/Settings/TodoSettingsViewModel.cs b/RetailCoder.VBE/UI/Settings/TodoSettingsViewModel.cs
@@ -44,7 +44,7 @@ public CommandBase AddTodoCommand
                 {
                     var placeholder = TodoSettings.Count(m => m.Text.StartsWith("PLACEHOLDER")) + 1;
                     TodoSettings.Add(
-                        new ToDoMarker(string.Format("PLACEHOLDER{0} ",
+                        new ToDoMarker(string.Format("PLACEHOLDER{0}",
                             placeholder == 1 ? string.Empty : placeholder.ToString(CultureInfo.InvariantCulture))));
                 });
             }

diff --git a/RetailCoder.VBE/app.config b/RetailCoder.VBE/app.config
@@ -189,19 +189,19 @@
       <setting name="ToDoMarker_ToDo" serializeAs="Xml">
         <value>
           <ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="TODO " />
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="TODO" />
         </value>
       </setting>
       <setting name="ToDoMarker_Note" serializeAs="Xml">
         <value>
           <ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="NOTE " />
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="NOTE" />
         </value>
       </setting>
       <setting name="ToDoMarker_Bug" serializeAs="Xml">
         <value>
           <ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="BUG " />
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="BUG" />
         </value>
       </setting>
     </Rubberduck.Properties.Settings>

diff --git a/RubberduckTests/Settings/TodoSettingsTests.cs b/RubberduckTests/Settings/TodoSettingsTests.cs
@@ -14,9 +14,9 @@ private Configuration GetDefaultConfig()
             {
                 ToDoMarkers = new[]
                 {
-                    new ToDoMarker("NOTE "),
-                    new ToDoMarker("TODO "),
-                    new ToDoMarker("BUG ")
+                    new ToDoMarker("NOTE"),
+                    new ToDoMarker("TODO"),
+                    new ToDoMarker("BUG")
                 }
             };
 
@@ -30,7 +30,7 @@ private Configuration GetNondefaultConfig()
             {
                 ToDoMarkers = new[]
                 {
-                    new ToDoMarker("PLACEHOLDER ")
+                    new ToDoMarker("PLACEHOLDER")
                 }
             };
 
@@ -82,7 +82,7 @@ public void AddTodoMarker()
 
             viewModel.AddTodoCommand.Execute(null);
             var todoMarkersList = defaultConfig.UserSettings.ToDoListSettings.ToDoMarkers.ToList();
-            todoMarkersList.Add(new ToDoMarker("PLACEHOLDER "));
+            todoMarkersList.Add(new ToDoMarker("PLACEHOLDER"));
 
             Assert.IsTrue(todoMarkersList.SequenceEqual(viewModel.TodoSettings));
         }
@@ -130,22 +130,22 @@ public void DuplicateToDoMarkersAreIgnored()
             {
                 ToDoMarkers = new[]
                 {
-                    new ToDoMarker("NOTE "),
-                    new ToDoMarker("TODO "),
-                    new ToDoMarker("BUG "),
-                    new ToDoMarker("PLACEHOLDER "),
-                    new ToDoMarker("PLACEHOLDER ")
+                    new ToDoMarker("NOTE"),
+                    new ToDoMarker("TODO"),
+                    new ToDoMarker("BUG"),
+                    new ToDoMarker("PLACEHOLDER"),
+                    new ToDoMarker("PLACEHOLDER")
                 }
             };
 
             var expected = new ToDoListSettings
             {
                 ToDoMarkers = new[]
                 {
-                    new ToDoMarker("NOTE "),
-                    new ToDoMarker("TODO "),
-                    new ToDoMarker("BUG "),
-                    new ToDoMarker("PLACEHOLDER ")
+                    new ToDoMarker("NOTE"),
+                    new ToDoMarker("TODO"),
+                    new ToDoMarker("BUG"),
+                    new ToDoMarker("PLACEHOLDER")
                 }
             };