fix: spellcheck results now have proper spacing

ashblue · ashblue · commit 35075976104b · 2022-09-19T23:54:19.000-07:00
diff --git a/Assets/com.fluid.simple-spellcheck/Editor/Resources/SpellCheck/Logs.uxml b/Assets/com.fluid.simple-spellcheck/Editor/Resources/SpellCheck/Logs.uxml
@@ -6,6 +6,7 @@
                 name="no-results"
                 class="hide"
                 text="No spelling errors found"
+                enabledRichText="true"
             />
             <VisualElement name="log-container" />
         </VisualElement>
diff --git a/Assets/com.fluid.simple-spellcheck/Editor/Resources/SpellCheck/Results.uss b/Assets/com.fluid.simple-spellcheck/Editor/Resources/SpellCheck/Results.uss
@@ -3,8 +3,6 @@
 }
 
 .text-block {
-    flex-direction: row;
-    flex-wrap: wrap;
     margin-bottom: 10px;
 }
 
diff --git a/Assets/com.fluid.simple-spellcheck/Editor/Resources/SpellCheck/Results.uxml b/Assets/com.fluid.simple-spellcheck/Editor/Resources/SpellCheck/Results.uxml
@@ -2,6 +2,7 @@
     <VisualElement name="container">
         <VisualElement name="text" >
             <TextElement
+                enabledRichText="true"
                 class="text-block"
                 text="Trigger the spell check API `SpellCheck.Instance.Validate(text)` to see spelling errors."
             />
diff --git a/Assets/com.fluid.simple-spellcheck/Editor/Scripts/SpellCheck/SpellCheck.cs b/Assets/com.fluid.simple-spellcheck/Editor/Scripts/SpellCheck/SpellCheck.cs
@@ -68,10 +68,11 @@ public SpellCheckInternal (IEnglishDictionary dic) {
             _dic = dic;
         }
 
-        public IWordSpelling[] Validate (string text) {
-            return GetWords(text)
-                .Select(i => new WordSpelling(i, _dic.HasWord(i)))
-                .ToArray<IWordSpelling>();
+        public string Validate (string text) {
+            var words = GetWords(text)
+                .Select(i => _dic.HasWord(i) ? i : $"<color=red>{i}</color>");
+
+            return string.Join(" ", words);
         }
 
         public bool IsInvalid (string text) {
diff --git a/Assets/com.fluid.simple-spellcheck/Editor/Scripts/Windows/SpellCheckResults.cs b/Assets/com.fluid.simple-spellcheck/Editor/Scripts/Windows/SpellCheckResults.cs
@@ -14,12 +14,12 @@ public static SpellCheckResults GetWindow () {
             return window;
         }
 
-        public static void ShowWindow (IWordSpelling[] results) {
+        public static void ShowWindow (string text) {
             var window = GetWindow();
             window.titleContent = new GUIContent("Spell Check");
 
             window.ClearText();
-            window.ShowText(results);
+            window.ShowText(text);
         }
 
         private void OnEnable () {
@@ -57,24 +57,11 @@ private void OpenSettings () {
             Selection.activeObject = SpellCheckSettings.Instance;
         }
 
-        private void ShowText (IWordSpelling[] results) {
+        private void ShowText (string text) {
             var root = rootVisualElement.Query("text").First();
 
-            var textBlock = new VisualElement();
-            textBlock.AddToClassList("text-block");
-            root.Add(textBlock);
-
-            foreach (var word in results) {
-                var text = new TextElement {text = $"{word.Text} "};
-
-                if (!word.IsValid) {
-                    text.AddToClassList("bad-spelling");
-                }
-
-                textBlock.Add(text);
-            }
-
-            root.Add(textBlock);
+            var textElement = new TextElement { text = text, enableRichText = true };
+            root.Add(textElement);
         }
 
         public void ClearText () {
@@ -85,7 +72,7 @@ public void ClearText () {
             }
         }
 
-        public void ShowText (string title, IWordSpelling[] text) {
+        public void ShowText (string title, string text) {
             var root = rootVisualElement.Query("text").First();
 
             var elTitle = new TextElement { text = title };
diff --git a/Assets/com.fluid.simple-spellcheck/Tests/Editor/SpellCheckTest.cs b/Assets/com.fluid.simple-spellcheck/Tests/Editor/SpellCheckTest.cs
@@ -13,18 +13,11 @@ public void Setup () {
                 _spellCheck = new SpellCheckInternal(_dic);
             }
 
-            [Test]
-            public void It_should_return_the_word_in_an_array () {
-                var result = _spellCheck.Validate("Lorem");
-
-                Assert.AreEqual("Lorem", result[0].Text);
-            }
-
             [Test]
             public void It_should_return_an_error_for_a_mispelled_word () {
                 var result = _spellCheck.Validate("Lorem");
 
-                Assert.AreEqual(false, result[0].IsValid);
+                Assert.AreEqual("<color=red>Lorem</color>", result);
             }
 
             [Test]
@@ -33,7 +26,7 @@ public void It_should_return_success_for_a_properly_spelled_word () {
 
                 var result = _spellCheck.Validate("Lorem");
 
-                Assert.AreEqual(true, result[0].IsValid);
+                Assert.AreEqual("Lorem", result);
             }
         }
 
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -10,12 +10,13 @@
   ],
   "dependencies": {
     "clever-crow.nsubstitute": "2.0.3",
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.ide.rider": "1.1.4",
-    "com.unity.ide.vscode": "1.1.4",
-    "com.unity.test-framework": "1.1.11",
-    "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.2.10",
+    "com.unity.collab-proxy": "1.17.2",
+    "com.unity.ide.rider": "3.0.15",
+    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.test-framework": "1.1.33",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.7.1",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -8,10 +8,12 @@
       "url": "https://registry.npmjs.org"
     },
     "com.unity.collab-proxy": {
-      "version": "1.2.16",
+      "version": "1.17.2",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.services.core": "1.0.1"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
@@ -22,34 +24,61 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "1.1.4",
+      "version": "3.0.15",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ext.nunit": "1.0.6"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.test-framework": "1.1.1"
+        "com.unity.test-framework": "1.1.9"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.1.4",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.0.2",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.services.core": {
+      "version": "1.4.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.nuget.newtonsoft-json": "3.0.2",
+        "com.unity.modules.androidjni": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.test-framework": {
-      "version": "1.1.11",
+      "version": "1.1.33",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.0",
+        "com.unity.ext.nunit": "1.0.6",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "2.0.1",
+      "version": "3.0.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -58,10 +87,15 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.2.10",
+      "version": "1.7.1",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!387306366 &1
+MemorySettings:
+  m_ObjectHideFlags: 0
+  m_EditorMemorySettings:
+    m_MainAllocatorBlockSize: -1
+    m_ThreadAllocatorBlockSize: -1
+    m_MainGfxBlockSize: -1
+    m_ThreadGfxBlockSize: -1
+    m_CacheBlockSize: -1
+    m_TypetreeBlockSize: -1
+    m_ProfilerBlockSize: -1
+    m_ProfilerEditorBlockSize: -1
+    m_BucketAllocatorGranularity: -1
+    m_BucketAllocatorBucketsCount: -1
+    m_BucketAllocatorBlockSize: -1
+    m_BucketAllocatorBlockCount: -1
+    m_ProfilerBucketAllocatorGranularity: -1
+    m_ProfilerBucketAllocatorBucketsCount: -1
+    m_ProfilerBucketAllocatorBlockSize: -1
+    m_ProfilerBucketAllocatorBlockCount: -1
+    m_TempAllocatorSizeMain: -1
+    m_JobTempAllocatorBlockSize: -1
+    m_BackgroundJobTempAllocatorBlockSize: -1
+    m_JobTempAllocatorReducedBlockSize: -1
+    m_TempAllocatorSizeGIBakingWorker: -1
+    m_TempAllocatorSizeNavMeshWorker: -1
+    m_TempAllocatorSizeAudioWorker: -1
+    m_TempAllocatorSizeCloudWorker: -1
+    m_TempAllocatorSizeGfx: -1
+    m_TempAllocatorSizeJobWorker: -1
+    m_TempAllocatorSizeBackgroundWorker: -1
+    m_TempAllocatorSizePreloadManager: -1
+  m_PlatformMemorySettings: {}
diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
@@ -0,0 +1,43 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EnablePreReleasePackages: 0
+  m_EnablePackageDependencies: 0
+  m_AdvancedSettingsExpanded: 1
+  m_ScopedRegistriesSettingsExpanded: 1
+  m_SeeAllPackageVersions: 0
+  m_DismissPreviewPackagesInUse: 0
+  oneTimeWarningShown: 0
+  m_Registries:
+  - m_Id: main
+    m_Name: 
+    m_Url: https://packages.unity.com
+    m_Scopes: []
+    m_IsDefault: 1
+    m_Capabilities: 7
+  - m_Id: scoped:NPM
+    m_Name: NPM
+    m_Url: https://registry.npmjs.org
+    m_Scopes:
+    - clever-crow
+    m_IsDefault: 0
+    m_Capabilities: 0
+  m_UserSelectedRegistryName: 
+  m_UserAddingNewScopedRegistry: 0
+  m_RegistryInfoDraft:
+    m_Modified: 0
+    m_ErrorMessage: 
+    m_UserModificationsInstanceId: -854
+    m_OriginalInstanceId: -856
+  m_LoadAssets: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.3.6f1
-m_EditorVersionWithRevision: 2019.3.6f1 (5c3fb0a11183)
+m_EditorVersion: 2022.1.16f1
+m_EditorVersionWithRevision: 2022.1.16f1 (7321c9670bc2)
diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset
@@ -0,0 +1,8 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_CollabEditorSettings:
+    inProgressEnabled: 1

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`.text-block {`
`6`		`- flex-direction: row;`
`7`		`- flex-wrap: wrap;`
`8`	`6`	`margin-bottom: 10px;`
`9`	`7`	`}`
`10`	`8`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,11 @@ public SpellCheckInternal (IEnglishDictionary dic) {`
`68`	`68`	`_dic = dic;`
`69`	`69`	`}`
`70`	`70`
`71`		`- public IWordSpelling[] Validate (string text) {`
`72`		`- return GetWords(text)`
`73`		`- .Select(i => new WordSpelling(i, _dic.HasWord(i)))`
`74`		`- .ToArray<IWordSpelling>();`
	`71`	`+ public string Validate (string text) {`
	`72`	`+ var words = GetWords(text)`
	`73`	`+ .Select(i => _dic.HasWord(i) ? i : $"<color=red>{i}</color>");`
	`74`	`+`
	`75`	`+ return string.Join(" ", words);`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`public bool IsInvalid (string text) {`
Original file line number	Diff line number	Diff line change
`@@ -13,18 +13,11 @@ public void Setup () {`
`13`	`13`	`_spellCheck = new SpellCheckInternal(_dic);`
`14`	`14`	`}`
`15`	`15`
`16`		`- [Test]`
`17`		`- public void It_should_return_the_word_in_an_array () {`
`18`		`- var result = _spellCheck.Validate("Lorem");`
`19`		`-`
`20`		`- Assert.AreEqual("Lorem", result[0].Text);`
`21`		`- }`
`22`		`-`
`23`	`16`	`[Test]`
`24`	`17`	`public void It_should_return_an_error_for_a_mispelled_word () {`
`25`	`18`	`var result = _spellCheck.Validate("Lorem");`
`26`	`19`
`27`		`- Assert.AreEqual(false, result[0].IsValid);`
	`20`	`+ Assert.AreEqual("<color=red>Lorem</color>", result);`
`28`	`21`	`}`
`29`	`22`
`30`	`23`	`[Test]`
`@@ -33,7 +26,7 @@ public void It_should_return_success_for_a_properly_spelled_word () {`
`33`	`26`
`34`	`27`	`var result = _spellCheck.Validate("Lorem");`
`35`	`28`
`36`		`- Assert.AreEqual(true, result[0].IsValid);`
	`29`	`+ Assert.AreEqual("Lorem", result);`
`37`	`30`	`}`
`38`	`31`	`}`
`39`	`32`