From 11d365f524e668d78060c24cd2aef03f02236ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 20 Jan 2021 16:52:56 +0100
Subject: [PATCH] refactoring

---
 .../suggestion/src/findSuggestionMatch.ts     | 74 +++++++++----------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/packages/suggestion/src/findSuggestionMatch.ts b/packages/suggestion/src/findSuggestionMatch.ts
index e548a700..88b843c5 100644
--- a/packages/suggestion/src/findSuggestionMatch.ts
+++ b/packages/suggestion/src/findSuggestionMatch.ts
@@ -35,49 +35,45 @@ export function findSuggestionMatch(config: Trigger): SuggestionMatch {
     ? new RegExp(`${prefix}${escapedChar}.*?(?=\\s${escapedChar}|$)`, 'gm')
     : new RegExp(`${prefix}(?:^)?${escapedChar}[^\\s${escapedChar}]*`, 'gm')
 
-  // Lookup the boundaries of the current node
   const textFrom = $position.before()
-
-  // Only look up to the cursor, old behavior: textTo = $position.end()
   const textTo = $position.pos
-
   const text = $position.doc.textBetween(textFrom, textTo, '\0', '\0')
+  const match = regexp.exec(text)
 
-  let match = regexp.exec(text)
-  let position = null
-
-  while (match !== null) {
-    // JavaScript doesn't have lookbehinds; this hacks a check that first character is " "
-    // or the line beginning
-    const matchPrefix = match.input.slice(Math.max(0, match.index - 1), match.index)
-
-    if (/^[\s\0]?$/.test(matchPrefix)) {
-      // The absolute position of the match in the document
-      const from = match.index + $position.start()
-      let to = from + match[0].length
-
-      // Edge case handling; if spaces are allowed and we're directly in between
-      // two triggers
-      if (allowSpaces && suffix.test(text.slice(to - 1, to + 1))) {
-        match[0] += ' '
-        to += 1
-      }
-
-      // If the $position is located within the matched substring, return that range
-      if (from < $position.pos && to >= $position.pos) {
-        position = {
-          range: {
-            from,
-            to,
-          },
-          query: match[0].slice(char.length),
-          text: match[0],
-        }
-      }
-    }
-
-    match = regexp.exec(text)
+  if (!match) {
+    return null
   }
 
-  return position
+  // JavaScript doesn't have lookbehinds; this hacks a check that first character is " "
+  // or the line beginning
+  const matchPrefix = match.input.slice(Math.max(0, match.index - 1), match.index)
+
+  if (!/^[\s\0]?$/.test(matchPrefix)) {
+    return null
+  }
+
+  // The absolute position of the match in the document
+  const from = match.index + $position.start()
+  let to = from + match[0].length
+
+  // Edge case handling; if spaces are allowed and we're directly in between
+  // two triggers
+  if (allowSpaces && suffix.test(text.slice(to - 1, to + 1))) {
+    match[0] += ' '
+    to += 1
+  }
+
+  // If the $position is located within the matched substring, return that range
+  if (from < $position.pos && to >= $position.pos) {
+    return {
+      range: {
+        from,
+        to,
+      },
+      query: match[0].slice(char.length),
+      text: match[0],
+    }
+  }
+
+  return null
 }