Formatter: give correct error on invalid source files. Fixes #3178

crystal-lang · Sep 27, 2016 · a20f45a · Sija · Sep 28, 2016 · a20f45a
1 parent afdd366
commit a20f45a
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/src/compiler/crystal/command/format.cr b/src/compiler/crystal/command/format.cr
@@ -8,6 +8,7 @@ class Crystal::Command
     enum Code
       FORMAT
       SYNTAX
+      INVALID_BYTE_SEQUENCE
       BUG
     end
   end
@@ -64,6 +65,8 @@ class Crystal::Command
             error "formatting '#{result.filename}' produced changes", exit_code: nil
           when .syntax?
             error "'#{result.filename}' has syntax errors", exit_code: nil
+          when .invalid_byte_sequence?
+            error "'#{result.filename}' is not a valid Crystal source file", exit_code: nil
           when .bug?
             error "there's a bug formatting '#{result.filename}', please report it including the contents of the file: https://github.com/crystal-lang/crystal/issues", exit_code: nil
           end
@@ -82,6 +85,11 @@ class Crystal::Command
 
       print result
       STDOUT.flush
+    rescue ex : InvalidByteSequenceError
+      print "Error: ".colorize.toggle(@color).red.bold
+      print "source is not a valid Crystal source file: ".colorize.toggle(@color).bold
+      puts "#{ex.message}"
+      exit 1
     rescue ex : Crystal::SyntaxException
       if @format == "json"
         puts ex.to_json
@@ -105,6 +113,11 @@ class Crystal::Command
       exit(result == source ? 0 : 1) if check_files
 
       File.write(filename, result)
+    rescue ex : InvalidByteSequenceError
+      print "Error: ".colorize.toggle(@color).red.bold
+      print "file '#{Crystal.relative_filename(filename)}' is not a valid Crystal source file: ".colorize.toggle(@color).bold
+      puts "#{ex.message}"
+      exit 1
     rescue ex : Crystal::SyntaxException
       if @format == "json"
         puts ex.to_json
@@ -151,6 +164,14 @@ class Crystal::Command
         File.write(filename, result)
         STDOUT << "Format".colorize(:green).toggle(@color) << " " << filename << "\n"
       end
+    rescue ex : InvalidByteSequenceError
+      if check_files
+        check_files << FormatResult.new(filename, FormatResult::Code::INVALID_BYTE_SEQUENCE)
+      else
+        print "Error: ".colorize.toggle(@color).red.bold
+        print "file '#{Crystal.relative_filename(filename)}' is not a valid Crystal source file: ".colorize.toggle(@color).bold
+        puts "#{ex.message}"
+      end
     rescue ex : Crystal::SyntaxException
       if check_files
         check_files << FormatResult.new(filename, FormatResult::Code::SYNTAX)