ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update findSuggestionMatch.ts

Browse Source
This commit is contained in:
Jon Noronha
2022-03-24 12:25:38 -07:00
committed by bdbch
parent 297461f4a0
commit b7c3b113dd
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/suggestion/src/findSuggestionMatch.ts
View File

@@ -31,12 +31,9 @@ export function findSuggestionMatch(config: Trigger): SuggestionMatch {
? new RegExp(`${prefix}${escapedChar}.*?(?=\\s${escapedChar}|$)`, 'gm') ? new RegExp(`${prefix}${escapedChar}.*?(?=\\s${escapedChar}|$)`, 'gm')
: new RegExp(`${prefix}(?:^)?${escapedChar}[^\\s${escapedChar}]*`, 'gm') : new RegExp(`${prefix}(?:^)?${escapedChar}[^\\s${escapedChar}]*`, 'gm')
const isTopLevelNode = $position.depth <= 0 const text = $position.nodeBefore?.isText && $position.nodeBefore.text
const textFrom = isTopLevelNode if (!text) return null
? 0 const textFrom = $position.pos - text.length
: $position.before()
const textTo = $position.pos
const text = $position.doc.textBetween(textFrom, textTo, '\0', '\0')
const match = Array.from(text.matchAll(regexp)).pop() const match = Array.from(text.matchAll(regexp)).pop()
if (!match || match.input === undefined || match.index === undefined) { if (!match || match.input === undefined || match.index === undefined) {
@@ -53,7 +50,7 @@ export function findSuggestionMatch(config: Trigger): SuggestionMatch {
} }
// The absolute position of the match in the document // The absolute position of the match in the document
const from = match.index + $position.start() const from = textFrom + match.index
let to = from + match[0].length let to = from + match[0].length
// Edge case handling; if spaces are allowed and we're directly in between // Edge case handling; if spaces are allowed and we're directly in between