Merge bbe5701 into 7d70145

input/after/UnusedImportProvider.hs

@@ -1,5 +1,9 @@
 import Data.List (sort)
+import Data.Monoid (Sum(..))
 
 foo :: Ord a => [a] -> [a]
 foo xs =
   sort xs 
+
+bar :: Sum a -> a
+bar (Sum a) = a 

input/before/UnusedImportProvider.hs

@@ -1,6 +1,10 @@
 import Data.List (sort, tails)
 import Data.Maybe
+import Data.Monoid (All(..), Any(..), Sum(..))
 
 foo :: Ord a => [a] -> [a]
 foo xs =
   sort xs 
+
+bar :: Sum a -> a
+bar (Sum a) = a 

src/features/importProvider/importDeclaration.ts

@@ -70,7 +70,7 @@ export default class ImportDeclaration {
 
   public removeElement(elem: string) {
     const before = this.importElements;
-    const index = this.importNames.findIndex(oldElem => oldElem === elem);
+    const index = this.importNames.findIndex(oldElem => oldElem === elem || oldElem == `${elem}(..)`);
     this._importElements.splice(index, 1);
     if(index === 0 && this._importElements.length > 0) {
       this._importElements[0] = this._importElements[0].trimLeft();

src/features/removeUnusedImportProvider.ts

@@ -93,7 +93,7 @@ export default class RemoveUnusedImportProvider implements CodeActionProvider {
     return diagnostics
       .map(d => [
         d.range,
-        d.message.match(/The (qualified )?import of (?:[`‘](.+?)['’]\s+from module )?[`‘](.+?)['’] is redundant/m)
+        d.message.match(/The (qualified )?import of (?:[`‘]([\s\S]+?)['’]\s+from module )?[`‘](.+?)['’] is redundant/m)
       ] as const)
       .filter(([,m]) => m)
       .map(([range, match]) => [

src/test/providers.test.ts

@@ -57,7 +57,7 @@ suite('', () => {
   });  
 
   test('Remove unused imports', () => {
-    return runQuickfixTest('UnusedImportProvider.hs', 2);
+    return runQuickfixTest('UnusedImportProvider.hs', 3);
   });
 
   test('Add missing extension', () => {