Removed trailing space from ToDo markers

rkapka · rkapka · commit 1fa3e015ba9b · 2018-01-09T23:52:48.000+01:00
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")
                 }
             };
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public CommandBase AddTodoCommand`
`44`	`44`	`{`
`45`	`45`	`var placeholder = TodoSettings.Count(m => m.Text.StartsWith("PLACEHOLDER")) + 1;`
`46`	`46`	`TodoSettings.Add(`
`47`		`- new ToDoMarker(string.Format("PLACEHOLDER{0} ",`
	`47`	`+ new ToDoMarker(string.Format("PLACEHOLDER{0}",`
`48`	`48`	`placeholder == 1 ? string.Empty : placeholder.ToString(CultureInfo.InvariantCulture))));`
`49`	`49`	`});`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ private Configuration GetDefaultConfig()`
`14`	`14`	`{`
`15`	`15`	`ToDoMarkers = new[]`
`16`	`16`	`{`
`17`		`- new ToDoMarker("NOTE "),`
`18`		`- new ToDoMarker("TODO "),`
`19`		`- new ToDoMarker("BUG ")`
	`17`	`+ new ToDoMarker("NOTE"),`
	`18`	`+ new ToDoMarker("TODO"),`
	`19`	`+ new ToDoMarker("BUG")`
`20`	`20`	`}`
`21`	`21`	`};`
`22`	`22`
`@@ -30,7 +30,7 @@ private Configuration GetNondefaultConfig()`
`30`	`30`	`{`
`31`	`31`	`ToDoMarkers = new[]`
`32`	`32`	`{`
`33`		`- new ToDoMarker("PLACEHOLDER ")`
	`33`	`+ new ToDoMarker("PLACEHOLDER")`
`34`	`34`	`}`
`35`	`35`	`};`
`36`	`36`
`@@ -82,7 +82,7 @@ public void AddTodoMarker()`
`82`	`82`
`83`	`83`	`viewModel.AddTodoCommand.Execute(null);`
`84`	`84`	`var todoMarkersList = defaultConfig.UserSettings.ToDoListSettings.ToDoMarkers.ToList();`
`85`		`- todoMarkersList.Add(new ToDoMarker("PLACEHOLDER "));`
	`85`	`+ todoMarkersList.Add(new ToDoMarker("PLACEHOLDER"));`
`86`	`86`
`87`	`87`	`Assert.IsTrue(todoMarkersList.SequenceEqual(viewModel.TodoSettings));`
`88`	`88`	`}`
`@@ -130,22 +130,22 @@ public void DuplicateToDoMarkersAreIgnored()`
`130`	`130`	`{`
`131`	`131`	`ToDoMarkers = new[]`
`132`	`132`	`{`
`133`		`- new ToDoMarker("NOTE "),`
`134`		`- new ToDoMarker("TODO "),`
`135`		`- new ToDoMarker("BUG "),`
`136`		`- new ToDoMarker("PLACEHOLDER "),`
`137`		`- new ToDoMarker("PLACEHOLDER ")`
	`133`	`+ new ToDoMarker("NOTE"),`
	`134`	`+ new ToDoMarker("TODO"),`
	`135`	`+ new ToDoMarker("BUG"),`
	`136`	`+ new ToDoMarker("PLACEHOLDER"),`
	`137`	`+ new ToDoMarker("PLACEHOLDER")`
`138`	`138`	`}`
`139`	`139`	`};`
`140`	`140`
`141`	`141`	`var expected = new ToDoListSettings`
`142`	`142`	`{`
`143`	`143`	`ToDoMarkers = new[]`
`144`	`144`	`{`
`145`		`- new ToDoMarker("NOTE "),`
`146`		`- new ToDoMarker("TODO "),`
`147`		`- new ToDoMarker("BUG "),`
`148`		`- new ToDoMarker("PLACEHOLDER ")`
	`145`	`+ new ToDoMarker("NOTE"),`
	`146`	`+ new ToDoMarker("TODO"),`
	`147`	`+ new ToDoMarker("BUG"),`
	`148`	`+ new ToDoMarker("PLACEHOLDER")`
`149`	`149`	`}`
`150`	`150`	`};`
`151`	`151`