From 52f9ce1187e078047c1496eecaae993ece7ae691 Mon Sep 17 00:00:00 2001
From: ahmedGaber93 <a.gaber0093@gmail.com>
Date: Thu, 11 May 2023 22:09:44 +0200
Subject: [PATCH] fix auto link after email domain not parsed.

---
 __tests__/ExpensiMark-HTML-test.js | 10 ++++++++--
 lib/ExpensiMark.js                 |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
index 969d3a95..47bc1676 100644
--- a/__tests__/ExpensiMark-HTML-test.js
+++ b/__tests__/ExpensiMark-HTML-test.js
@@ -371,7 +371,10 @@ test('Test url replacements', () => {
         + 'https://example.com/~username/foo~bar.txt '
         + 'http://example.com/foo/*/bar/*/test.txt '
         + 'test-.com '
-        + '-test.com ';
+        + '-test.com '
+        + '@test.com '
+        + '@test.com test.com '
+        + '@test.com @test.com ';
 
     const urlTestReplacedString = 'Testing '
         + '<a href="https://foo.com" target="_blank" rel="noreferrer noopener">foo.com</a> '
@@ -409,7 +412,10 @@ test('Test url replacements', () => {
         + '<a href="https://example.com/~username/foo~bar.txt" target="_blank" rel="noreferrer noopener">https://example.com/~username/foo~bar.txt</a> '
         + '<a href="http://example.com/foo/*/bar/*/test.txt" target="_blank" rel="noreferrer noopener">http://example.com/foo/*/bar/*/test.txt</a> '
         + 'test-.com '
-        + '-<a href="https://test.com" target="_blank" rel="noreferrer noopener">test.com</a> ';
+        + '-<a href="https://test.com" target="_blank" rel="noreferrer noopener">test.com</a> '
+        + '@test.com '
+        + '@test.com <a href="https://test.com" target="_blank" rel="noreferrer noopener">test.com</a> '
+        + '@test.com @test.com ';
 
     expect(parser.replace(urlTestStartString)).toBe(urlTestReplacedString);
 });
diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
index 7d4c0ef3..edc2c12f 100644
--- a/lib/ExpensiMark.js
+++ b/lib/ExpensiMark.js
@@ -417,10 +417,10 @@ export default class ExpensiMark {
         let match = regex.exec(textToCheck);
         let replacedText = '';
         let startIndex = 0;
-        let abort = false;
 
         while (match !== null) {
             // we want to avoid matching email address domains
+            let abort = false;
             if ((match.index !== 0) && (textToCheck[match.index - 1] === '@')) {
                 abort = true;
             }