syntax_tree 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3684dd6ee3c63a0d12bd9688dcd5c31a508e5b56cbed0d9939843014dcb035c
-  data.tar.gz: 7b229ace8aa66b761b7a2d2b9ad6560a819e953b67d787ac3c9dc2cc224a36fd
+  metadata.gz: 872e3355e589d7a18b916de52fc30d8ac7e52a9c746550082ed8fc503bd178b8
+  data.tar.gz: d27214567e9b0c9f9cf14b8874e839d7c90d7fec89d9a94c117e4e83028165a2
 SHA512:
-  metadata.gz: 74efe38ca5ab0e3bfcd6fd8ac8809d88e0d4fc87d84178a188601c7afc50c06c18c85f2669f504f1d84635fb39a367fcbf3cdbdae1eb45a5bf79fc97f2447e78
-  data.tar.gz: 7b186fc7133a6f2806d73de62c15de8ae39682f7f317a7368f9a3a5877dc1d2f5f69824b08a0f970c8983f92fce8f21c824db20f9f46eecbb6786deacb46560a
+  metadata.gz: 0d131267335b65e4ebd9c12c86275a64d556a9314a1d509b4a8c3629f553ed06e304abce59faab2b13a64bdd8a825101a3baf52e97e60cde8b5eeba2488621e7
+  data.tar.gz: 12f8ecf7e54688af0a2bac223320197113012c8b83a1db1135f51bf8192d8012462499f810c05bfb6d8d88f7c59551a467e4104cd12ec4094fd5722c3f940b64

data/CHANGELOG.md

@@ -6,7 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
-## [1.0.0]
+## [1.1.0] - 2021-12-08
+
+### Added
+
+- Better handling for formatting files with errors.
+- Colorize the output snippet using IRB.
+
+## [1.0.0] - 2021-12-08
 
 ### Added
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    syntax_tree (1.0.0)
+    syntax_tree (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/syntax_tree/cli.rb

@@ -126,6 +126,9 @@ class SyntaxTree
         delta = ((Time.now - start) * 1000).round
 
         puts "\r#{color} #{delta}ms"
+      rescue
+        puts "\r#{filepath}"
+        raise
       end
     end
 
@@ -177,25 +180,12 @@ class SyntaxTree
               action.run(filepath, source)
             rescue ParseError => error
               warn("Error: #{error.message}")
-              lines = source.lines
-
-              maximum = [error.lineno + 3, lines.length].min
-              digits = Math.log10(maximum).ceil
-
-              ([error.lineno - 3, 0].max...maximum).each do |line_index|
-                line_number = line_index + 1
 
-                if line_number == error.lineno
-                  part1 = Color.red(">")
-                  part2 = Color.gray("%#{digits}d |" % line_number)
-                  warn("#{part1} #{part2} #{lines[line_index]}")
-
-                  part3 = Color.gray("  %#{digits}s |" % " ")
-                  warn("#{part3} #{" " * error.column}#{Color.red("^")}")
-                else
-                  prefix = Color.gray("  %#{digits}d |" % line_number)
-                  warn("#{prefix} #{lines[line_index]}")
-                end
+              if error.lineno
+                highlight_error(error, source)
+              else
+                warn(error.message)
+                warn(error.backtrace)
               end
 
               errored = true
@@ -232,6 +222,36 @@ class SyntaxTree
 
         File.read(filepath, encoding: encoding)
       end
+
+      # Highlights a snippet from a source and parse error.
+      def highlight_error(error, source)
+        lines = source.lines
+
+        maximum = [error.lineno + 3, lines.length].min
+        digits = Math.log10(maximum).ceil
+
+        ([error.lineno - 3, 0].max...maximum).each do |line_index|
+          line_number = line_index + 1
+
+          if line_number == error.lineno
+            part1 = Color.red(">")
+            part2 = Color.gray("%#{digits}d |" % line_number)
+            warn("#{part1} #{part2} #{colorize_line(lines[line_index])}")
+
+            part3 = Color.gray("  %#{digits}s |" % " ")
+            warn("#{part3} #{" " * error.column}#{Color.red("^")}")
+          else
+            prefix = Color.gray("  %#{digits}d |" % line_number)
+            warn("#{prefix} #{colorize_line(lines[line_index])}")
+          end
+        end
+      end
+
+      # Take a line of Ruby source and colorize the output.
+      def colorize_line(line)
+        require "irb"
+        IRB::Color.colorize_code(line, complete: false, ignore_error: true)
+      end
     end
   end
 end

data/lib/syntax_tree/version.rb

@@ -3,5 +3,5 @@
 require "ripper"
 
 class SyntaxTree < Ripper
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kevin Newton