Merge pull request #500 from crystal-ameba/issue-496

Adjust cursor position by the indent size only if valid

spec/ameba/config_spec.cr

@@ -25,7 +25,6 @@ module Ameba
       it "loads default globs when config has no value" do
         yml = YAML.parse <<-CONFIG
           # Empty config with comment
-
           CONFIG
         config = Config.new(yml)
         config.globs.should eq Config::DEFAULT_GLOBS

spec/ameba/formatter/util_spec.cr

@@ -76,6 +76,15 @@ module Ameba::Formatter
         subject.affected_code(code, location).should be_nil
       end
 
+      it "works with file-wide location (1, 1) + indented code" do
+        code = <<-CRYSTAL
+                  a = 1
+          CRYSTAL
+        location = Crystal::Location.new("filename", 1, 1)
+        subject.deansify(subject.affected_code(code, location))
+          .should eq "> a = 1\n  ^\n"
+      end
+
       it "returns correct line if it is found" do
         code = <<-CRYSTAL
           a = 1

src/ameba/formatter/util.cr

@@ -59,20 +59,22 @@ module Ameba::Formatter
         affected_line = trim(affected_line, max_length, ellipsis)
       end
 
+      position = prompt.size + column
+      position -= 1
+
       show_context = context_lines > 0
 
       if show_context
         pre_context, post_context =
           context(lines, lineno, context_lines)
-
-        position = prompt.size + column
-        position -= 1
       else
         affected_line_size, affected_line =
           affected_line.size, affected_line.lstrip
 
-        position = column - (affected_line_size - affected_line.size) + prompt.size
-        position -= 1
+        indent_size_diff = affected_line_size - affected_line.size
+        if column > indent_size_diff
+          position -= indent_size_diff
+        end
       end
 
       String.build do |str|