Refactor

maroontress · Aug 6, 2024 · f06efc4 · f06efc4
1 parent e6126fe
commit f06efc4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 50 deletions.
diff --git a/StyleChecker/StyleChecker.Test/Spacing/NoSingleSpaceAfterTripleSlash/Okay.cs b/StyleChecker/StyleChecker.Test/Spacing/NoSingleSpaceAfterTripleSlash/Okay.cs
@@ -74,52 +74,27 @@ private void NoXmlTab()
         {
         }
 
-        /// <summary>
-        /// head <see cref="Okay"/> foot
-        /// </summary>
-        private void ContainsSeeElementInsideSummary()
+        private void NoDocumentationComment()
         {
-        }
+            ///  
 
-        /// <summary>
-        /// <see cref="Okay"/> foot
-        /// </summary>
-        private void StartWithSeeElementInsideSummary()
-        {
-        }
+            /// hello
 
-        /// head <see cref="Okay"/> foot
-        private void ContainsSeeElement()
-        {
-        }
+            ///  hello
 
-        /// <see cref="Okay"/> foot
-        private void StartWithSeeElement()
-        {
-        }
+            /// hello <see cref="world"/>
 
-        ///	<summary>
-        ///	head <see cref="Okay"/> foot
-        ///	</summary>
-        private void Tab_ContainsSeeElementInsideSummary()
-        {
-        }
+            ///  hello <see cref="world"/>
 
-        ///	<summary>
-        ///	<see cref="Okay"/> foot
-        ///	</summary>
-        private void Tab_StartWithSeeElementInsideSummary()
-        {
-        }
+            ///	 
 
-        ///	head <see cref="Okay"/> foot
-        private void Tab_ContainsSeeElement()
-        {
-        }
+            ///	hello
 
-        ///	<see cref="Okay"/> foot
-        private void Tab_StartWithSeeElement()
-        {
+            ///	 hello
+
+            ///	hello <see cref="world"/>
+
+            ///	 hello <see cref="world"/>
         }
     }
 }
diff --git a/StyleChecker/StyleChecker/Spacing/NoSingleSpaceAfterTripleSlash/Analyzer.cs b/StyleChecker/StyleChecker/Spacing/NoSingleSpaceAfterTripleSlash/Analyzer.cs
@@ -100,7 +100,8 @@ static bool DoesTokenHaveGoodSpace(SyntaxToken t)
                     || !IsSldcTrivia(top)
                     || GetNextElement(top, child) is null
                     || IsNextTokenNewLine(child, t)
-                    || text.Length is 1);
+                    || text.Length is 1
+                    || !text.Skip(1).All(WhitespaceCharSet.Contains));
         }
 
         static bool DoesTokenStartWithWhiteSpace(SyntaxToken t)
@@ -126,14 +127,6 @@ static bool DoesTokenHaveSingleLeadingTrivia(SyntaxTrivia t)
                 && a.Last() == t;
         }
 
-        static bool DoesTokenHaveTextStartingWithSingleSpace(SyntaxTrivia t)
-        {
-            var text = t.Token.Text;
-            return text.Length > 1
-                && WhitespaceCharSet.Contains(text[0])
-                && !WhitespaceCharSet.Contains(text[1]);
-        }
-
         static Func<SyntaxTrivia, Location> LocationSupplier(SyntaxTree tree)
             => t => Location.Create(tree, t.Token.Span);
 
@@ -146,8 +139,7 @@ static Func<SyntaxTrivia, Location> LocationSupplier(SyntaxTree tree)
             .SelectMany(t => t.DescendantTrivia())
             .Where(t => IsDceTrivia(t)
                 && !DoesTokenHaveSingleLeadingTrivia(t)
-                && !IsNextSiblingTriviaSingleSpace(t)
-                && !DoesTokenHaveTextStartingWithSingleSpace(t))
+                && !IsNextSiblingTriviaSingleSpace(t))
             .Select(t => Diagnostic.Create(Rule, toLocation(t)))
             .ToList();
 
@@ -163,7 +155,7 @@ static Func<SyntaxTrivia, Location> LocationSupplier(SyntaxTree tree)
     + ...
     + XmlText
     | + ...
-    | + XmlTextLiteralToken (equals " ")
+    | + XmlTextLiteralToken (starts with " "... and contains non-" ")
     |   + Lead: ...
     |   + Lead: DocumentationCommentExteriorTrivia
     + ...