Commit 811663ac authored by Sean McGivern's avatar Sean McGivern
Browse files

Merge branch 'fix-emoji-popup' into 'master'

Hide emoji popup after multiple spaces or blank lines, closes #40620,#33678

Closes #40620 and #33678

See merge request gitlab-org/gitlab-ce!17680
......@@ -132,9 +132,8 @@ class GfmAutoComplete {
callbacks: {
matcher(flag, subtext) {
const relevantText = subtext.trim().split(/\s/).pop();
const regexp = new RegExp(`(?:[^${glRegexp.unicodeLetters}0-9:]|\n|^):([^:]*)$`, 'gi');
const match = regexp.exec(relevantText);
const match = regexp.exec(subtext);
return match && match.length ? match[1] : null;
title: Hide emoji popup after multiple spaces
author: Jan Beckmann
type: fixed
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment