refactor: Dalamud.Game.Chat => Dalamud.Game.Text, move Sanitizer

Dalamud.Test/Dalamud.Test.csproj

@@ -59,7 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="LocalizationTests.cs" />
-        <Compile Include="Plugin\Sanitizer\SanitizerTests.cs" />
+    <Compile Include="Game\Text\Sanitizer\SanitizerTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -74,6 +74,7 @@
   <ItemGroup>
     <Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -92,5 +93,4 @@
     <Target Name="AfterBuild">
     </Target>
     -->
-
 </Project>

Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs

@@ -1,13 +1,13 @@
-// ReSharper disable StringLiteralTypo
+// ReSharper disable StringLiteralTypo
 
 using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace Dalamud.Test.Plugin.Sanitizer {
+namespace Dalamud.Test.Game.Text.Sanitizer {
 
     public class SanitizerTests {
-        private global::Dalamud.Plugin.Sanitizer.Sanitizer sanitizer;
+        private global::Dalamud.Game.Text.Sanitizer.Sanitizer sanitizer;
 
         [Theory]
         [InlineData( ClientLanguage.English, "Pixie Cotton Hood of Healing", "Pixie Cotton Hood of Healing" )]
@@ -20,11 +20,11 @@ namespace Dalamud.Test.Plugin.Sanitizer {
             ClientLanguage clientLanguage, string unsanitizedString, string sanitizedString)
         {
             var sanitizedStrings = new List<string> {unsanitizedString};
-            sanitizer = new global::Dalamud.Plugin.Sanitizer.Sanitizer(clientLanguage);
+            sanitizer = new global::Dalamud.Game.Text.Sanitizer.Sanitizer(clientLanguage);
             Assert.Equal(sanitizedString, sanitizer.Sanitize(unsanitizedString));
             Assert.Equal(sanitizedString, sanitizer.Sanitize(sanitizedStrings).First());
             
-            sanitizer = new global::Dalamud.Plugin.Sanitizer.Sanitizer(ClientLanguage.English);
+            sanitizer = new global::Dalamud.Game.Text.Sanitizer.Sanitizer(ClientLanguage.English);
             Assert.Equal(sanitizedString, sanitizer.Sanitize(unsanitizedString, clientLanguage));
             Assert.Equal(sanitizedString, sanitizer.Sanitize(sanitizedStrings, clientLanguage).First());
         }

Dalamud/Configuration/DalamudConfiguration.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-using Dalamud.Game.Chat;
+using Dalamud.Game.Text;
 using Newtonsoft.Json;
 using Serilog;
 

Dalamud/Dalamud.cs

@@ -6,7 +6,7 @@ using System.Threading;
 using Dalamud.Configuration;
 using Dalamud.Data;
 using Dalamud.Game;
-using Dalamud.Game.Chat.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.Command;
 using Dalamud.Game.Internal;

Dalamud/Game/ChatHandlers.cs

@@ -7,9 +7,9 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using CheapLoc;
-using Dalamud.Game.Chat;
-using Dalamud.Game.Chat.SeStringHandling;
-using Dalamud.Game.Chat.SeStringHandling.Payloads;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Game.Internal.Libc;
 using Dalamud.Interface;
 using Dalamud.Plugin;

Dalamud/Game/Command/CommandManager.cs

@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text.RegularExpressions;
-using Dalamud.Game.Chat;
-using Dalamud.Game.Chat.SeStringHandling;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Internal.Libc;
 using Serilog;
 

Dalamud/Game/Internal/Gui/ChatGui.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using Dalamud.Game.Chat;
-using Dalamud.Game.Chat.SeStringHandling;
-using Dalamud.Game.Chat.SeStringHandling.Payloads;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Game.Internal.Libc;
 using Dalamud.Hooking;
 using Serilog;

Dalamud/Game/Internal/Gui/GameGui.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Dalamud.Game.Chat.SeStringHandling.Payloads;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Hooking;
 using ImGuiNET;
 using Serilog;

Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Dalamud.Data;
-using Dalamud.Game.Chat.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling;
 using Lumina.Excel.GeneratedSheets;
 
 namespace Dalamud.Game.Internal.Gui.Structs {

Dalamud/Game/Text/Sanitizer/ISanitizer.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Dalamud.Plugin.Sanitizer
+namespace Dalamud.Game.Text.Sanitizer
 {
     /// <summary>
     /// Sanitize strings to remove soft hyphens and other special characters.

Dalamud/Game/Text/Sanitizer/Sanitizer.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Dalamud.Plugin.Sanitizer
+namespace Dalamud.Game.Text.Sanitizer
 {
     /// <summary>
     /// Sanitize strings to remove soft hyphens and other special characters.

Dalamud/Game/Text/SeIconChar.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 #pragma warning disable 1591
 
-namespace Dalamud.Game.Chat
+namespace Dalamud.Game.Text
 {
     /// <summary>
     /// Special unicode characters with game-related symbols that work both in-game and in any dalamud window.

Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs

@@ -1,6 +1,6 @@
 #pragma warning disable 1591
 
-namespace Dalamud.Game.Chat.SeStringHandling {
+namespace Dalamud.Game.Text.SeStringHandling {
     public enum BitmapFontIcon : uint {
         None,
         ControllerDPadUp,

Dalamud/Game/Text/SeStringHandling/ITextProvider.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Dalamud.Game.Chat.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling
 {
     public interface ITextProvider
     {

Dalamud/Game/Text/SeStringHandling/Payload.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Dalamud.Data;
-using Dalamud.Game.Chat.SeStringHandling.Payloads;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Serilog;
 
 // TODOs:
@@ -14,7 +14,7 @@ using Serilog;
 //   - [SeString] some way to add surrounding formatting information as flags/data to text (or other?) payloads?
 //     eg, if a text payload is surrounded by italics payloads, strip them out and mark the text payload as italicized
 
-namespace Dalamud.Game.Chat.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling
 {
     /// <summary>
     /// This class represents a parsed SeString payload.

Dalamud/Game/Text/SeStringHandling/PayloadType.cs

@@ -1,5 +1,5 @@
 
-namespace Dalamud.Game.Chat.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling
 {
     /// <summary>
     /// All parsed types of SeString payloads.

Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs

@@ -8,7 +8,7 @@ using Dalamud.Data;
 using Dalamud.Data.TransientSheet;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload containing an auto-translation/completion chat message.

Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads {
+namespace Dalamud.Game.Text.SeStringHandling.Payloads {
 
     /// <summary>
     /// 

Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload containing information about enabling or disabling italics formatting on following text.

Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.IO;
 using System;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads {
+namespace Dalamud.Game.Text.SeStringHandling.Payloads {
 
     /// <summary>
     /// SeString payload representing a bitmap icon from fontIcon

Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs

@@ -7,7 +7,7 @@ using Dalamud.Data;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload representing an interactable item link.

Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs

@@ -5,7 +5,7 @@ using System.IO;
 using Dalamud.Data;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload representing an interactable map position link.

Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs

@@ -6,7 +6,7 @@ using System.Text;
 using Dalamud.Data;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload representing a player link.

Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs

@@ -5,7 +5,7 @@ using Dalamud.Data;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads {
+namespace Dalamud.Game.Text.SeStringHandling.Payloads {
     /// <summary>
     /// An SeString Payload representing an interactable quest link.
     /// </summary>

Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload representing unhandled raw payload data.

Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs

@@ -1,6 +1,6 @@
-using System.IO;
+using System.IO;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads {
+namespace Dalamud.Game.Text.SeStringHandling.Payloads {
     /// <summary>
     /// A wrapped '–'
     /// </summary>

Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs

@@ -5,7 +5,7 @@ using System.IO;
 using Dalamud.Data;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload representing an interactable status link.

Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload representing a plain text string.

Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs

@@ -5,7 +5,7 @@ using System.IO;
 using Dalamud.Data;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload representing a UI foreground color applied to following text payloads.

Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs

@@ -5,7 +5,7 @@ using System.IO;
 using Dalamud.Data;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads
 {
     /// <summary>
     /// An SeString Payload representing a UI glow color applied to following text payloads.

Dalamud/Game/Text/SeStringHandling/SeString.cs

@@ -4,10 +4,10 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using Dalamud.Data;
-using Dalamud.Game.Chat.SeStringHandling.Payloads;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Chat.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling
 {
     /// <summary>
     /// This class represents a parsed SeString.

Dalamud/Game/Text/SeStringHandling/SeStringManager.cs

@@ -6,10 +6,10 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 using Dalamud.Data;
-using Dalamud.Game.Chat.SeStringHandling.Payloads;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Lumina.Excel.GeneratedSheets;
 
-namespace Dalamud.Game.Chat.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling
 {
     public class SeStringManager
     {

Dalamud/Game/Text/XivChatEntry.cs

@@ -1,6 +1,7 @@
 using System;
 
-namespace Dalamud.Game.Chat {
+namespace Dalamud.Game.Text
+{
     public sealed class XivChatEntry {
         public XivChatType Type { get; set; } = XivChatType.Debug;
 

Dalamud/Game/Text/XivChatType.cs

@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 #pragma warning disable 1591
 
-namespace Dalamud.Game.Chat
+namespace Dalamud.Game.Text
 {
     /// <summary>
     ///     The FFXIV chat types as seen in the LogKind ex table.

Dalamud/Interface/DalamudDataWindow.cs

@@ -4,7 +4,7 @@ using System.Dynamic;
 using System.Linq;
 using System.Numerics;
 
-using Dalamud.Game.Chat;
+using Dalamud.Game.Text;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.ClientState.Actors.Types;
 using Dalamud.Game.ClientState.Actors.Types.NonPlayer;

Dalamud/Interface/DalamudSettingsWindow.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms.VisualStyles;
 using CheapLoc;
 using Dalamud.Configuration;
-using Dalamud.Game.Chat;
+using Dalamud.Game.Text;
 using ImGuiNET;
 
 namespace Dalamud.Interface

Dalamud/Plugin/DalamudPluginInterface.cs

@@ -7,13 +7,13 @@ using System.Reflection;
 using Dalamud.Configuration;
 using Dalamud.Data;
 using Dalamud.Game;
-using Dalamud.Game.Chat.SeStringHandling;
-using Dalamud.Game.Chat.SeStringHandling.Payloads;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.Command;
 using Dalamud.Game.Internal;
+using Dalamud.Game.Text.Sanitizer;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface;
-using Dalamud.Plugin.Sanitizer;
 
 namespace Dalamud.Plugin
 {
@@ -49,7 +49,7 @@ namespace Dalamud.Plugin
             this.pluginName = pluginName;
             this.configs = configs;
 
-            this.Sanitizer = new Sanitizer.Sanitizer(this.Data.Language);
+            this.Sanitizer = new Sanitizer(this.Data.Language);
             this.UiLanguage = this.dalamud.Configuration.LanguageOverride;
             dalamud.LocalizationManager.OnLocalizationChanged += this.OnLocalizationChanged;
         }

Dalamud/Plugin/PluginRepository.cs

@@ -10,7 +10,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using CheapLoc;
-using Dalamud.Game.Chat;
+using Dalamud.Game.Text;
 using Newtonsoft.Json;
 using Serilog;