From 0f3886e053987157b23c7653bd9cbb5a6a395852 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 30 Jun 2022 21:41:58 +0200
Subject: [PATCH] improve autocompletion

---
 src/components/ha-code-editor.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ha-code-editor.ts b/src/components/ha-code-editor.ts
index 152e7a9a6f..a8f9938332 100644
--- a/src/components/ha-code-editor.ts
+++ b/src/components/ha-code-editor.ts
@@ -209,7 +209,7 @@ export class HaCodeEditor extends ReactiveElement {
   private _entityCompletions(
     context: CompletionContext
   ): CompletionResult | null | Promise<CompletionResult | null> {
-    const entityWord = context.matchBefore(/[a-z_]{3,}\./);
+    const entityWord = context.matchBefore(/[a-z_]{3,}\.\w*/);
 
     if (
       !entityWord ||
@@ -227,7 +227,7 @@ export class HaCodeEditor extends ReactiveElement {
     return {
       from: Number(entityWord.from),
       options: states,
-      span: /^\w*.\w*$/,
+      span: /^[a-z_]{3,}\.\w*$/,
     };
   }
 
@@ -257,7 +257,7 @@ export class HaCodeEditor extends ReactiveElement {
   private async _mdiCompletions(
     context: CompletionContext
   ): Promise<CompletionResult | null> {
-    const match = context.matchBefore(/mdi:/);
+    const match = context.matchBefore(/mdi:\S*/);
 
     if (!match || (match.from === match.to && !context.explicit)) {
       return null;
@@ -268,7 +268,7 @@ export class HaCodeEditor extends ReactiveElement {
     return {
       from: Number(match.from),
       options: iconItems,
-      span: /^\w*.\w*$/,
+      span: /^mdi:\S*$/,
     };
   }