From 0681bb1e00132f35126041140458ed1e7ab24d19 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Thu, 2 Jun 2022 21:50:22 +0200
Subject: [PATCH] Fix invalid XAML markup cases

Rider EAP is highlighting these now
---
 .../Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml   | 2 +-
 Content.Client/Atmos/UI/GasFilterWindow.xaml              | 4 ++--
 Content.Client/Atmos/UI/GasMixerWindow.xaml               | 8 ++++----
 Content.Client/Atmos/UI/GasPressurePumpWindow.xaml        | 4 ++--
 Content.Client/Atmos/UI/GasThermomachineWindow.xaml       | 4 ++--
 Content.Client/Atmos/UI/GasVolumePumpWindow.xaml          | 4 ++--
 Content.Client/Lobby/UI/LobbyGui.xaml                     | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
index 8822e5d60e..266856d691 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
@@ -7,7 +7,7 @@
     MinSize="50 50">
     <GridContainer Columns="3">
         <Button Name="SpawnEntitiesButton" Text="{Loc 'sandbox-window-spawn-entities-button'}" />
-        <Button Name="SpawnTilesButton" Text="{Loc 'sandbox-window-spawn-tiles-button'} " />
+        <Button Name="SpawnTilesButton" Text="{Loc 'sandbox-window-spawn-tiles-button'}" />
         <Button Name="SpawnDecalsButton" Text="{Loc 'sandbox-window-spawn-decals-button'}" />
         <Button Name="LoadGamePrototypeButton" Text="{Loc 'load-game-prototype'}"/>
         <cc:CommandButton Command="deleteewc Singularity" Name="DeleteSingulos" Text="{Loc 'delete-singularities'}"/>
diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml b/Content.Client/Atmos/UI/GasFilterWindow.xaml
index 1fb2baa4ef..b161c7025e 100644
--- a/Content.Client/Atmos/UI/GasFilterWindow.xaml
+++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml
@@ -4,12 +4,12 @@
             MinSize="480 400" Title="Filter">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-filter-ui-filter-status} "/>
+            <Label Text="{Loc comp-gas-filter-ui-filter-status}"/>
             <Button Name="ToggleStatusButton"/>
         </BoxContainer>
 
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-filter-ui-filter-transfer-rate} "/>
+            <Label Text="{Loc comp-gas-filter-ui-filter-transfer-rate}"/>
             <LineEdit Name="FilterTransferRateInput" MinSize="40 0" />
             <Button Name="SetFilterRate" Text="{Loc comp-gas-filter-ui-filter-set-rate}" Disabled="True"/>
         </BoxContainer>
diff --git a/Content.Client/Atmos/UI/GasMixerWindow.xaml b/Content.Client/Atmos/UI/GasMixerWindow.xaml
index e43a44193a..405907be4b 100644
--- a/Content.Client/Atmos/UI/GasMixerWindow.xaml
+++ b/Content.Client/Atmos/UI/GasMixerWindow.xaml
@@ -4,12 +4,12 @@
             MinSize="200 200" Title="Gas Mixer">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-mixer-ui-mixer-status} "/>
+            <Label Text="{Loc comp-gas-mixer-ui-mixer-status}"/>
             <Control MinSize="5 0" />
             <Button Name="ToggleStatusButton"/>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-mixer-ui-mixer-output-pressure} "/>
+            <Label Text="{Loc comp-gas-mixer-ui-mixer-output-pressure}"/>
             <Control MinSize="5 0" />
             <LineEdit Name="MixerPressureOutputInput" MinSize="60 0" />
             <Control MinSize="5 0" />
@@ -21,12 +21,12 @@
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Control MinSize="0 5" />
-            <Label Text="{Loc comp-gas-mixer-ui-mixer-node-primary} "/>
+            <Label Text="{Loc comp-gas-mixer-ui-mixer-node-primary}"/>
             <Control MinSize="5 0" />
             <LineEdit Name="MixerNodeOneInput" MinSize="60 0" />
             <Label Text=" %"/>
             <Control MinSize="5 0" />
-            <Label Text="{Loc comp-gas-mixer-ui-mixer-node-side} "/>
+            <Label Text="{Loc comp-gas-mixer-ui-mixer-node-side}"/>
             <Control MinSize="5 0" />
             <LineEdit Name="MixerNodeTwoInput" MinSize="60 0" />
             <Label Text=" %"/>
diff --git a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
index d0a09cc824..039c39596a 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
+++ b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
@@ -4,13 +4,13 @@
             MinSize="200 120" Title="Pressure Pump">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-status} "/>
+            <Label Text="{Loc comp-gas-pump-ui-pump-status}"/>
             <Control MinSize="5 0" />
             <Button Name="ToggleStatusButton"/>
         </BoxContainer>
 
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-output-pressure} "/>
+            <Label Text="{Loc comp-gas-pump-ui-pump-output-pressure}"/>
             <Control MinSize="5 0" />
             <LineEdit Name="PumpPressureOutputInput" MinSize="60 0" />
             <Control MinSize="5 0" />
diff --git a/Content.Client/Atmos/UI/GasThermomachineWindow.xaml b/Content.Client/Atmos/UI/GasThermomachineWindow.xaml
index 65bd918888..de3f8f8036 100644
--- a/Content.Client/Atmos/UI/GasThermomachineWindow.xaml
+++ b/Content.Client/Atmos/UI/GasThermomachineWindow.xaml
@@ -3,12 +3,12 @@
                MinSize="300 120" Title="{Loc comp-gas-thermomachine-ui-title-freezer}">
     <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-thermomachine-ui-toggle} "/>
+            <Label Text="{Loc comp-gas-thermomachine-ui-toggle}"/>
             <Control MinSize="5 0" />
             <Button Access="Public" Name="ToggleStatusButton"/>
         </BoxContainer>
         <BoxContainer Name="SpinboxHBox" Orientation="Horizontal">
-            <Label Text="{Loc comp-gas-thermomachine-ui-temperature} "/>
+            <Label Text="{Loc comp-gas-thermomachine-ui-temperature}"/>
         </BoxContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml b/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
index 3b17792d98..9630430791 100644
--- a/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
+++ b/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
@@ -4,13 +4,13 @@
             MinSize="200 120" Title="Volume Pump">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-status} "/>
+            <Label Text="{Loc comp-gas-pump-ui-pump-status}"/>
             <Control MinSize="5 0" />
             <Button Name="ToggleStatusButton"/>
         </BoxContainer>
 
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-transfer-rate} "/>
+            <Label Text="{Loc comp-gas-pump-ui-pump-transfer-rate}"/>
             <Control MinSize="5 0" />
             <LineEdit Name="PumpTransferRateInput" MinSize="60 0" />
             <Control MinSize="5 0" />
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 1a1ff0c31d..b1dcfb6f23 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -48,7 +48,7 @@
                 <BoxContainer Orientation="Vertical" HorizontalExpand="True">
                     <!-- Top row -->
                     <BoxContainer Orientation="Horizontal" MinSize="0 40" Name="HeaderContainer" Access="Public" SeparationOverride="4">
-                        <Label Margin="8 0 0 0" StyleClasses="LabelHeadingBigger" VAlign="Center" Text="{Loc 'ui-lobby-title'} " />
+                        <Label Margin="8 0 0 0" StyleClasses="LabelHeadingBigger" VAlign="Center" Text="{Loc 'ui-lobby-title'}" />
                         <Label Name="ServerName" Access="Public" StyleClasses="LabelHeadingBigger" VAlign="Center" />
                     </BoxContainer>
                     <!-- Gold line -->