PR feedback

Author: kycutler

src/common/emoji.ts

@@ -13,13 +13,14 @@ const emojiRegex = /:([-+_a-z0-9]+):/g;
 let emojiMap: Record<string, string> | undefined;
 let emojiMapPromise: Promise<void> | undefined;
 
-export async function ensureEmojis(context: ExtensionContext) {
+export async function ensureEmojis(context: ExtensionContext): Promise<Record<string, string>> {
 	if (emojiMap === undefined) {
 		if (emojiMapPromise === undefined) {
 			emojiMapPromise = loadEmojiMap(context);
 		}
 		await emojiMapPromise;
 	}
+	return emojiMap!;
 }
 
 async function loadEmojiMap(context: ExtensionContext) {
@@ -36,10 +37,3 @@ export function emojify(message: string) {
 		return emojiMap?.[code] || s;
 	});
 }
-
-export function getEmojis(): Record<string, string> {
-	if (emojiMap === undefined) {
-		return {};
-	}
-	return emojiMap;
-}

src/view/emojiCompletionProvider.ts

@@ -4,20 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { ensureEmojis, getEmojis } from '../common/emoji';
+import { ensureEmojis } from '../common/emoji';
 import { Schemes } from '../common/uri';
 
 export class EmojiCompletionProvider implements vscode.CompletionItemProvider {
-	private static readonly ID: string = 'EmojiCompletionProvider';
 	private _emojiCompletions: vscode.CompletionItem[] = [];
 
-	constructor(private context: vscode.ExtensionContext) {
+	constructor(private _context: vscode.ExtensionContext) {
 		void this.buildEmojiCompletions();
 	}
 
 	private async buildEmojiCompletions(): Promise<void> {
-		await ensureEmojis(this.context);
-		const emojis = getEmojis();
+		const emojis = await ensureEmojis(this._context);
 
 		for (const [name, emoji] of Object.entries(emojis)) {
 			const completionItem = new vscode.CompletionItem({ label: emoji, description: `:${name}:` }, vscode.CompletionItemKind.Text);
@@ -51,10 +49,23 @@ export class EmojiCompletionProvider implements vscode.CompletionItemProvider {
 		}
 
 		// Only provide completions if we're in an emoji context (don't clutter Ctrl+Space results)
-		if (!wordRange) {
+		if (!wordRange || !wordAtPos) {
 			return [];
 		}
 
+		// Ensure the : comes after a space or start of line
+		const colonPosition = wordRange.start;
+		if (colonPosition.character > 0) {
+			const charBeforeColon = document.getText(new vscode.Range(
+				colonPosition.translate(0, -1),
+				colonPosition
+			));
+			// If the character before : is not whitespace, don't show completions
+			if (!/\s/.test(charBeforeColon)) {
+				return [];
+			}
+		}
+
 		// Update the range on cached items directly
 		for (const item of this._emojiCompletions) {
 			item.range = wordRange;