From eda221a21ed4c67c901b3135ae06bd3e33cfb0ee Mon Sep 17 00:00:00 2001
From: Eduard Sergeev <eduard.sergeev@gmail.com>
Date: Thu, 20 Jun 2024 21:14:44 +1200
Subject: [PATCH] fixup! Improve `ImportDeclaration`

---
 input/before/UnusedImportProvider.hs             | 2 +-
 src/features/importProvider/importDeclaration.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/input/before/UnusedImportProvider.hs b/input/before/UnusedImportProvider.hs
index de1b47e..de4b3d2 100644
--- a/input/before/UnusedImportProvider.hs
+++ b/input/before/UnusedImportProvider.hs
@@ -1,6 +1,6 @@
 import Data.List (sort, tails)
 import Data.Maybe
-import Data.Monoid (All(..), Any(getAny), Product(getProduct), Sum(..))
+import Data.Monoid (All(..), Any(getAny), Product(getProduct), Sum(..), Any(..), First(..))
 
 foo :: Ord a => [a] -> [a]
 foo xs =
diff --git a/src/features/importProvider/importDeclaration.ts b/src/features/importProvider/importDeclaration.ts
index 0313a2f..df6264d 100644
--- a/src/features/importProvider/importDeclaration.ts
+++ b/src/features/importProvider/importDeclaration.ts
@@ -78,10 +78,9 @@ export default class ImportDeclaration {
   }
 
   public removeElement(elem: string) {
-    const regex = new RegExp(`^${elem}(\(.+\))?$`);
     const before = this.importElements;
 
-    const index = this._importElements.findIndex(elem => regex.test(elem));
+    const index = this._importElements.findIndex(oldElem => oldElem === elem || oldElem == `${elem}(..)`);
     if (index !== -1) {
       if (this._importElements.length > 1) {
         if (index === this._importElements.length - 1) {