harri 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a2af9d55b5ccf09c7be859a562bc47e554cbb7b5bd7563b16c2549318edb84
-  data.tar.gz: 0d30ec8cb5435ae41653c9be040d97df1238ba1ac4b87c68169deccb6fa53d13
+  metadata.gz: f97d86dc002eed2bd9e3d9664541fe54b16643a87b4080556c22a19db863036d
+  data.tar.gz: cfb2ed9c3443be16ebf105dbf91e9c2b0c9001390f7f4d30db73393827336011
 SHA512:
-  metadata.gz: f92790d7879290fdfccac41660864784366f2d616401a74852727bba1eab66b41730d4dd6b7705c61060233f377ddad7a91de0c97084160442fd8c6733baa91d
-  data.tar.gz: c3e684620fd0baf358dbfec6c321e05ef41befc95b4a02665a2cff69c82f37ce905573973ff698c63e97cf8e79394da603a09fdaf61089ad1493b33ffe5581db
+  metadata.gz: a5f1aadedf04486fe4cd68ef5f26a8c91f929427af371439b42ff1fc66561854ee48d6cd135121dbbe4cb9a2401b2ead05d2b048b7524e55419ed2a1ac206fb2
+  data.tar.gz: 931469f5823707b7fd41e2da609f407e5328a2dc69d9fbc9a318c0c3b5b71f2dc271aa39263c080ef95076400db81930d0ff4e6ed9e69b3874f01501c4c906ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    harri (0.1.2)
+    harri (0.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -10,6 +10,7 @@ GEM
     rake (13.0.6)
 
 PLATFORMS
+  universal-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -18,4 +19,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.3.26
+   2.4.18

data/lib/harri/processor.rb

@@ -15,12 +15,16 @@ module Harri
         # There are no imports, so the whole module is redundant.
         text.sub(/^#{Regexp.quote(match[0])}/, "")
       else
+        module_imports = match[1]
+        return text if !module_imports
+
         # Filter out specific imports within the module.
-        filtered_imports = import_info[:imports].reduce(match[0]) do |result, import|
+        filtered_imports = import_info[:imports].reduce(module_imports) do |result, import|
           reference_regex = Harri::Regexes.named_reference_regex import
           result.sub reference_regex, ""
         end
-        text.sub match[0], filtered_imports
+        replaced_imports = match[0].sub module_imports, filtered_imports
+        text.sub match[0], replaced_imports
       end
     end
   end

data/lib/harri/regexes.rb

@@ -2,13 +2,13 @@ module Harri
   module Regexes
     # Intended to capture the first line of an error within GHC's output.
     START_ERROR_REGEX = %r{
-      (.*\.hs)  # filename
-      :         # literal colon
-      \d+       # line number
-      :         # literal colon
-      \d+       # column number
-      :         # literal colon
-      \s        # space
+      (.*\.hs)                 # filename
+      :                        # literal colon
+      \d+                      # line number
+      :                        # literal colon
+      (\d+)(?:-(\d+))?         # column number
+      :                        # literal colon
+      \s                       # space
       error:.*  # literal "error:" with possible marker
     }x
 
@@ -18,7 +18,7 @@ module Harri
       :                                              # literal colon
       \d+                                            # line number
       :                                              # literal colon
-      \d+                                            # column number
+      (\d+)(?:-(\d+))?                               # column number
       :                                              # literal colon
       \s                                             # space
       error:                                         # literal "error:"
@@ -28,7 +28,7 @@ module Harri
     }x
 
     # Intended to capture the scenario when an entire module is redundant.
-    ENTIRE_MODULE_REDUNDANT_REGEX = /The(?: qualified)? import of ‘(.+)’ is redundant except.*/
+    ENTIRE_MODULE_REDUNDANT_REGEX =/The(?: qualified)? import of ‘([^’]+)’ is redundant(?!.*from module)/
 
     # Intended to capture the scenario when specific imports within a module are redundant.
     REDUNDANT_IMPORTS_WITHIN_MODULE_REGEX = /The import of ‘(.+)’ from module ‘(.+)’ is redundant.*/
@@ -44,7 +44,7 @@ module Harri
         (?:qualified\s*)?                 # zero or one literal "qualified" with optional space afterwards
         (?:as\s+[A-Z]+[a-zA-Z0-9.]*\s*)?  # zero or one literal "as `module_name`" with optional space afterwards
         (?:hiding\s*)?                    # zero or one literal "hiding" with optional space afterwards
-        (?:(\((?>[^)(]+|\g<1>)*\)))?      # zero or one list of imports (see https://stackoverflow.com/a/35271017)
+        ((\((?>[^)(]+|\g<1>)*\)))?        # zero or one list of imports (see https://stackoverflow.com/a/35271017)
         \n?                               # zero or one linebreak
       }x
     end
@@ -53,6 +53,7 @@ module Harri
     def self.named_reference_regex(reference)
       %r{
         \b#{Regexp.quote reference}\b  # match "`reference`" exactly as a single word
+        (?:\s*\(\.\.\))?               # zero or one instances of optional space followed by a literal "(..)"
         (?:\s*,?)?                     # zero or one instances of optional space followed by zero or one comma
         \s*                            # optional space
       }x

data/lib/harri/version.rb

@@ -2,6 +2,6 @@
 
 module Harri
   module Version
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harri
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - rhizomic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies: []
 description: 'Harri: HAskell Remove Redundant Imports. A way to get GHC to stop harrying
   you about them.'
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Removes redundant Haskell imports.