Merge pull request #854 from tkellogg/dollar-newline

Made `$` match end of line
VsVim · Apr 4, 2012 · 72651fe · 72651fe
2 parents 09647c2 + 8842f3a
commit 72651fe
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/VimCore/VimRegex.fs b/VimCore/VimRegex.fs
@@ -231,6 +231,13 @@ module VimRegexFactory =
                     RegexOptions.None
                 else 
                     RegexOptions.Compiled
+
+            let regexOptions = 
+                if data.IncludesNewLine then
+                    regexOptions
+                else
+                    regexOptions ||| RegexOptions.Multiline
+
             if data.MatchCase then
                 regexOptions
             else
@@ -260,7 +267,10 @@ module VimRegexFactory =
         | '}' -> if data.IsRangeOpen then data.EndRange() else data.AppendChar '}'
         | '|' -> data.AppendChar '|'
         | '^' -> if data.IsStartOfPattern || data.IsStartOfGrouping then data.AppendChar '^' else data.AppendEscapedChar '^'
-        | '$' -> if data.IsEndOfPattern then data.AppendChar '$' else data.AppendEscapedChar '$'
+        | '$' -> 
+            if data.IsEndOfPattern then 
+                data.AppendString @"\r?$" 
+            else data.AppendEscapedChar '$'
         | '<' -> data.AppendString @"\b"
         | '>' -> data.AppendString @"\b"
         | '[' -> data.BeginGrouping()

diff --git a/VimCoreTest/VimRegexTest.cs b/VimCoreTest/VimRegexTest.cs
@@ -1108,5 +1108,13 @@ public void NewLine_Replace()
             VerifyReplace(@"\n", "hello\r\nworld", " ", "hello world");
             VerifyReplace(@"\n", "hello\rworld", " ", "hello world");
         }
+
+        [Test]
+        public void Newline_DollarSignMatchesEndOfLine()
+        {
+            VerifyMatches(@"foo$", "foo\r\nbar");
+            VerifyMatches(@"foo$", "foo\nbar");
+            VerifyMatches(@"foo$", "foo");
+        }
     }
 }