5 files changed, 135 insertions, 111 deletions

diff --git a/lib/pronto/eslint_npm.rb b/lib/pronto/eslint_npm.rb
deleted file mode 100644
index 6a9c00c..0000000
--- a/lib/pronto/eslint_npm.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-require 'pronto'
-require 'shellwords'
-
-module Pronto
-  class ESLintNpm < Runner
-    CONFIG_FILE = '.pronto_eslint_npm.yml'.freeze
-    CONFIG_KEYS = %w[eslint_executable files_to_lint cmd_line_opts].freeze
-
-    attr_writer :eslint_executable, :cmd_line_opts
-
-    def eslint_executable
-      @eslint_executable || 'eslint'
-    end
-
-    def files_to_lint
-      @files_to_lint || /(\.js|\.es6)$/
-    end
-
-    def cmd_line_opts
-      @cmd_line_opts || ''
-    end
-
-    def files_to_lint=(regexp)
-      @files_to_lint = regexp.is_a?(Regexp) && regexp || Regexp.new(regexp)
-    end
-
-    def config_options
-      @config_options ||=
-        begin
-          config_file = File.join(repo_path, CONFIG_FILE)
-          File.exist?(config_file) && YAML.load_file(config_file) || {}
-        end
-    end
-
-    def read_config
-      config_options.each do |key, val|
-        next unless CONFIG_KEYS.include?(key.to_s)
-        send("#{key}=", val)
-      end
-    end
-
-    def run
-      return [] if !@patches || @patches.count.zero?
-
-      read_config
-
-      @patches
-        .select { |patch| patch.additions > 0 }
-        .select { |patch| js_file?(patch.new_file_full_path) }
-        .map { |patch| inspect(patch) }
-        .flatten.compact
-    end
-
-    private
-
-    def repo_path
-      @repo_path ||= @patches.first.repo.path
-    end
-
-    def inspect(patch)
-      offences = run_eslint(patch)
-      clean_up_eslint_output(offences)
-        .map do |offence|
-          patch
-            .added_lines
-            .select { |line| line.new_lineno == offence['line'] }
-            .map { |line| new_message(offence, line) }
-        end
-    end
-
-    def new_message(offence, line)
-      path  = line.patch.delta.new_file[:path]
-      level = :warning
-
-      Message.new(path, line, level, offence['message'], nil, self.class)
-    end
-
-    def js_file?(path)
-      files_to_lint =~ path.to_s
-    end
-
-    def run_eslint(patch)
-      Dir.chdir(repo_path) do
-        JSON.parse `#{eslint_command_line(patch.new_file_full_path.to_s)}`
-      end
-    end
-
-    def eslint_command_line(path)
-      "#{eslint_executable} #{cmd_line_opts} #{Shellwords.escape(path)} -f json"
-    end
-
-    def clean_up_eslint_output(output)
-      # 1. Filter out offences without a warning or error
-      # 2. Get the messages for that file
-      # 3. Ignore errors without a line number for now
-      output
-        .select { |offence| offence['errorCount'] + offence['warningCount'] > 0 }
-        .map { |offence| offence['messages'] }
-        .flatten.select { |offence| offence['line'] }
-    end
-  end
-end
diff --git a/lib/pronto/eslint_npm/version.rb b/lib/pronto/eslint_npm/version.rb
deleted file mode 100644
index e3683f4..0000000
--- a/lib/pronto/eslint_npm/version.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Pronto
-  module ESLintNpmVersion
-    VERSION = '0.10.0'.freeze
-  end
-end
diff --git a/lib/pronto/hlint.rb b/lib/pronto/hlint.rb
new file mode 100644
index 0000000..daf1029
--- /dev/null
+++ b/lib/pronto/hlint.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'pronto/hlint/runner'
+
+module Pronto
+  module Hlint
+  end
+end
diff --git a/lib/pronto/hlint/runner.rb b/lib/pronto/hlint/runner.rb
new file mode 100644
index 0000000..e334860
--- /dev/null
+++ b/lib/pronto/hlint/runner.rb
@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require 'pronto'
+require 'shellwords'
+
+module Pronto
+  module Hlint
+    class Runner < Pronto::Runner
+      CONFIG_FILE = '.pronto_hlint.yml'.freeze
+      CONFIG_KEYS = %w[hlint_executable files_to_lint cmd_line_opts].freeze
+
+      attr_writer :hlint_executable, :cmd_line_opts
+
+      def hlint_executable
+        @hlint_executable || 'hlint'
+      end
+
+      def files_to_lint
+        @files_to_lint || /(\.hs)$/
+      end
+
+      def cmd_line_opts
+        @cmd_line_opts || ''
+      end
+
+      def files_to_lint=(regexp)
+        @files_to_lint = regexp.is_a?(Regexp) && regexp || Regexp.new(regexp)
+      end
+
+      def config_options
+        @config_options ||=
+          begin
+            config_file = File.join(repo_path, CONFIG_FILE)
+            File.exist?(config_file) && YAML.load_file(config_file) || {}
+          end
+      end
+
+      def read_config
+        config_options.each do |key, val|
+          next unless CONFIG_KEYS.include?(key.to_s)
+          send("#{key}=", val)
+        end
+      end
+
+      def run
+        return [] if !@patches || @patches.count.zero?
+
+        read_config
+
+        @patches
+          .select { |patch| patch.additions > 0 }
+          .select { |patch| hs_file?(patch.new_file_full_path) }
+          .map { |patch| inspect(patch) }
+          .flatten.compact
+      end
+
+      private
+
+      def repo_path
+        @repo_path ||= @patches.first.repo.path
+      end
+
+      def inspect(patch)
+        offences = run_hlint(patch)
+        offences
+          .map do |offence|
+          patch
+            .added_lines
+            .select { |line| (offence['startLine']..offence['endLine']).include?(line.new_lineno) }
+            .map { |line| new_message(offence, line) }
+        end
+      end
+
+      def new_message(offence, line)
+        path  = line.patch.delta.new_file[:path]
+        level = hlint_severity_to_pronto_level(offence['severity']) || :warning
+
+        text = <<~EOF
+        #{offence['severity']} offence detected by Hlint. Hint is: `#{offence['hint']}`.
+
+        Consider changing the code from
+        ```
+        #{offence['from']}
+        ```
+        to
+        ```
+        #{offence['to']}
+        ```
+      EOF
+
+        Message.new(path, line, level, text, nil, self.class)
+      end
+
+      def hlint_severity_to_pronto_level(severity)
+        case severity
+        when "Error"
+          :error
+        when "Warning"
+          :warning
+        when "Suggestion"
+          :info
+        end
+      end
+
+      def hs_file?(path)
+        files_to_lint =~ path.to_s
+      end
+
+      def run_hlint(patch)
+        Dir.chdir(repo_path) do
+          JSON.parse `#{hlint_command_line(patch.new_file_full_path.to_s)}`
+        end
+      end
+
+      def hlint_command_line(path)
+        "#{hlint_executable} #{cmd_line_opts} #{Shellwords.escape(path)} --json"
+      end
+    end
+  end
+end
diff --git a/lib/pronto/hlint/version.rb b/lib/pronto/hlint/version.rb
new file mode 100644
index 0000000..0b9bd5a
--- /dev/null
+++ b/lib/pronto/hlint/version.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Pronto
+  module Hlint
+    VERSION = '0.1.0'.freeze
+  end
+end