Enhance SingleLineComment

Doesn't copy the code of SingleLineComment any more

Author: fubar-coder

FluentMigrator.BatchParser/RangeSearchers/PoundSignSingleLineComment.cs

@@ -14,54 +14,19 @@
 // limitations under the License.
 #endregion
 
-using System.Text.RegularExpressions;
-
 namespace FluentMigrator.BatchParser.RangeSearchers
 {
     /// <summary>
     /// A single line comment starting with a pound sign (<c># comment</c>)
     /// </summary>
-    public sealed class PoundSignSingleLineComment : IRangeSearcher
+    public sealed class PoundSignSingleLineComment : SingleLineComment
     {
-        private readonly Regex _startCodeRegex;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="PoundSignSingleLineComment"/> class.
         /// </summary>
         public PoundSignSingleLineComment()
+            : base("#", true)
         {
-            var startCode = "#";
-            _startCodeRegex = new Regex(Regex.Escape(startCode), RegexOptions.CultureInvariant | RegexOptions.Compiled);
-            StartCodeLength = startCode.Length;
-        }
-
-        /// <inheritdoc />
-        public int StartCodeLength { get; }
-
-        /// <inheritdoc />
-        public int EndCodeLength => 0;
-
-        /// <inheritdoc />
-        public bool IsComment => true;
-
-        /// <inheritdoc />
-        public int FindStartCode(ILineReader reader)
-        {
-            if (reader.Index != 0)
-                return -1;
-            var match = _startCodeRegex.Match(reader.Line, reader.Index);
-            if (!match.Success)
-                return -1;
-            var skippedText = reader.ReadString(match.Index - reader.Index);
-            if (!string.IsNullOrWhiteSpace(skippedText))
-                return -1;
-            return match.Index;
-        }
-
-        /// <inheritdoc />
-        public EndCodeSearchResult FindEndCode(ILineReader reader)
-        {
-            return reader.Line.Length;
         }
     }
 }

FluentMigrator.BatchParser/RangeSearchers/SingleLineComment.cs

@@ -24,14 +24,26 @@ namespace FluentMigrator.BatchParser.RangeSearchers
     /// </summary>
     public class SingleLineComment : IRangeSearcher
     {
+        private readonly bool _onlyAtBeginningOfLine;
         private readonly Regex _startCodeRegex;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SingleLineComment"/> class.
         /// </summary>
         /// <param name="startCode">The start code for the single line comment</param>
         public SingleLineComment(string startCode)
+            : this(startCode, false)
         {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SingleLineComment"/> class.
+        /// </summary>
+        /// <param name="startCode">The start code for the single line comment</param>
+        /// <param name="onlyAtBeginningOfLine">Find the start code only at the beginning of the line</param>
+        public SingleLineComment(string startCode, bool onlyAtBeginningOfLine)
+        {
+            _onlyAtBeginningOfLine = onlyAtBeginningOfLine;
             _startCodeRegex = new Regex(Regex.Escape(startCode), RegexOptions.CultureInvariant | RegexOptions.Compiled);
             StartCodeLength = startCode.Length;
         }
@@ -51,6 +63,14 @@ public int FindStartCode(ILineReader reader)
             var match = _startCodeRegex.Match(reader.Line, reader.Index);
             if (!match.Success)
                 return -1;
+
+            if (_onlyAtBeginningOfLine)
+            {
+                var skippedText = reader.Line.Substring(0, match.Index);
+                if (!string.IsNullOrWhiteSpace(skippedText))
+                    return -1;
+            }
+
             return match.Index;
         }