harri 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e603652739daf52c8d474133005b4b30936b03669f0e286091ec838a5be0723
-  data.tar.gz: 94fee9ece5d13cbda1d231c15e156debb535de207c6fac18471804511553468a
+  metadata.gz: 97430acc5a2e12f35cf3ee43e6ec741a49b912a1f13bdfe41624815b698a82d1
+  data.tar.gz: 1a00e5d8695469dac07dc466924c4edf25942f76f0f580856f271b2e0750526c
 SHA512:
-  metadata.gz: 30839d406f27ea27197ab2e73fa7123860dfabdbb78611429d32252b9d676ba89c00eee82489ac40dee325d687b6e3352ce5a2653ed43e1235021cfc30bb46c8
-  data.tar.gz: e12b95186cb6bc63ae6bb6f6c5049bd7f3c10c374334e0edada4443f2ec4b497a8fb1f092934ed4381fd19a8591253721c64a2132076a1ef0e6a72f0506b2c7a
+  metadata.gz: ffdf0e148176ab1ec06a472a5b134ab52fd01b80e10b5ccc8b2ab1bc82d6d64c232c4e75097ca8e65cea321778ddddf636cd4d8b3d8f31569cfd72250e35c12f
+  data.tar.gz: 1b0b2d3b910d34f95d0fde81bf50efb6d3b4e391c99e2b5aac0181b2517e25ea5968a7b90f6ee9aaad53ff2cb79dc388adbce7d8627310297eb6e68f17ee812e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    harri (0.1.3)
+    harri (0.1.5)
 
 GEM
   remote: https://rubygems.org/
@@ -19,4 +19,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.3.22
+   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

@@ -36,15 +36,16 @@ module Harri
     # Intended to capture a full import declaration within a Haskell module.
     def self.import_declaration_regex(module_name)
       %r{
-        ^import                           # literal "import"
+        ^import                           # literal "import" at start of line
         \s+                               # one or more spaces
         (?:qualified\s*)?                 # zero or one literal "qualified" with optional space afterwards
-        #{Regexp.quote module_name}       # match "import `module_name`" at start of line
+        #{Regexp.quote module_name}       # match "`module_name`"
+        (?!\S)                            # assert that the next character is not a non-whitespace character (see https://stackoverflow.com/a/18005390)
         \s*                               # optional space
         (?: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 +54,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.3"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harri
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - rhizomic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-03 00:00:00.000000000 Z
+date: 2024-10-09 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.4.10
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Removes redundant Haskell imports.