syntax_tree 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28783cde4387bbc7d38d9de500564804cd885733abe59e017be73ce04981a854
-  data.tar.gz: 6a54750102b8978df75e7f8a7d611e596067bb69863f91d5a8daa9aec8509c31
+  metadata.gz: a048616da9a9591130add971fae818025454369630a12bd4bb6386b3734de556
+  data.tar.gz: 16ea5138a4097551063ef9eeb6be7413c1f69e41c49f2b7e8a20e3dd4ab7f0a1
 SHA512:
-  metadata.gz: c2f61f01bfa53604686798c96a53d8c98abd30145038db3b7f73f92c5c6b282447f3fe355382f6b3325b3ee98ce60ddcc5c102234b78e9c8d1fe9cbf006cb38d
-  data.tar.gz: e5a63e7fdc4f7e70e354a5861e42b8c0dffbbd2ffde38754c0a1fca8a6033be2deecd52ea3ec5fb7a2aa05e0d07ab93d3b4d69762ca3c911f36a6e898ef2ffaf
+  metadata.gz: 680d5745acbcdcfeb9cbb92fb99927b142e9c5f4f7df65f909dc812baca22d14ede3beae973f3db05d6a81953af9f8c53113fe5ccdf86ae2592932079d82cc59
+  data.tar.gz: f6ac53a377cfd0150d6480611b9cc63714d3e893ef453d2b0881f4e54a8ba5e1450b5f88a38e9e7c7ed3e8eb18f45e6006fff2c5c714fd40db01cb99a615bc15

data/CHANGELOG.md

@@ -6,6 +6,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [3.2.0] - 2022-07-19
+
+### Added
+
+- [#116](https://github.com/ruby-syntax-tree/syntax_tree/pull/116) - Pass the `--print-width` option in the CLI to the language server.
+
+## [3.1.0] - 2022-07-19
+
+### Added
+
+- [#115](https://github.com/ruby-syntax-tree/syntax_tree/pull/115) - Support the `--print-width` option in the CLI for the actions that support it.
+
+## [3.0.1] - 2022-07-15
+
+### Changed
+
+- [#112](https://github.com/ruby-syntax-tree/syntax_tree/pull/112) - Fix parallel CLI execution by not short-circuiting with the `||` operator.
+
 ## [3.0.0] - 2022-07-04
 
 ### Changed
@@ -288,7 +306,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v2.9.0...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.2.0...HEAD
+[3.2.0]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.1.0...v3.2.0
+[3.1.0]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.0.1...v3.1.0
+[3.0.1]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.0.0...v3.0.1
+[3.0.0]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v2.9.0...v3.0.0
 [2.9.0]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v2.8.0...v2.9.0
 [2.8.0]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v2.7.1...v2.8.0
 [2.7.1]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v2.7.0...v2.7.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    syntax_tree (3.0.0)
+    syntax_tree (3.2.0)
       prettier_print
 
 GEM
@@ -19,7 +19,7 @@ GEM
     rake (13.0.6)
     regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.31.1)
+    rubocop (1.31.2)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)

data/README.md

@@ -118,6 +118,12 @@ If there are files with unformatted code, you will receive:
 The listed files did not match the expected format.
 ```
 
+To change the print width that you are checking against, specify the `--print-width` option, as in:
+
+```sh
+stree check --print-width=100 path/to/file.rb
+```
+
 ### format
 
 This command will output the formatted version of each of the listed files. Importantly, it will not write that content back to the source files. It is meant to display the formatted version only.
@@ -132,6 +138,12 @@ For a file that contains `1 + 1`, you will receive:
 1 + 1
 ```
 
+To change the print width that you are formatting with, specify the `--print-width` option, as in:
+
+```sh
+stree format --print-width=100 path/to/file.rb
+```
+
 ### json
 
 This command will output a JSON representation of the syntax tree that is functionally equivalent to the input. This is mostly used in contexts where you need to access the tree from JavaScript or serialize it over a network.
@@ -213,6 +225,12 @@ This will list every file that is being formatted. It will output light gray if
 path/to/file.rb 0ms
 ```
 
+To change the print width that you are writing with, specify the `--print-width` option, as in:
+
+```sh
+stree write --print-width=100 path/to/file.rb
+```
+
 ## Library
 
 Syntax Tree can be used as a library to access the syntax tree underlying Ruby source code.

data/lib/syntax_tree/cli.rb

@@ -91,9 +91,17 @@ module SyntaxTree
       class UnformattedError < StandardError
       end
 
+      attr_reader :print_width
+
+      def initialize(print_width:)
+        @print_width = print_width
+      end
+
       def run(item)
         source = item.source
-        raise UnformattedError if source != item.handler.format(source)
+        if source != item.handler.format(source, print_width)
+          raise UnformattedError
+        end
       rescue StandardError
         warn("[#{Color.yellow("warn")}] #{item.filepath}")
         raise
@@ -114,13 +122,21 @@ module SyntaxTree
       class NonIdempotentFormatError < StandardError
       end
 
+      attr_reader :print_width
+
+      def initialize(print_width:)
+        @print_width = print_width
+      end
+
       def run(item)
         handler = item.handler
 
         warning = "[#{Color.yellow("warn")}] #{item.filepath}"
-        formatted = handler.format(item.source)
+        formatted = handler.format(item.source, print_width)
 
-        raise NonIdempotentFormatError if formatted != handler.format(formatted)
+        if formatted != handler.format(formatted, print_width)
+          raise NonIdempotentFormatError
+        end
       rescue StandardError
         warn(warning)
         raise
@@ -148,8 +164,14 @@ module SyntaxTree
 
     # An action of the CLI that formats the input source and prints it out.
     class Format < Action
+      attr_reader :print_width
+
+      def initialize(print_width:)
+        @print_width = print_width
+      end
+
       def run(item)
-        puts item.handler.format(item.source)
+        puts item.handler.format(item.source, print_width)
       end
     end
 
@@ -173,12 +195,18 @@ module SyntaxTree
     # An action of the CLI that formats the input source and writes the
     # formatted output back to the file.
     class Write < Action
+      attr_reader :print_width
+
+      def initialize(print_width:)
+        @print_width = print_width
+      end
+
       def run(item)
         filepath = item.filepath
         start = Time.now
 
         source = item.source
-        formatted = item.handler.format(source)
+        formatted = item.handler.format(source, print_width)
         File.write(filepath, formatted) if filepath != :stdin
 
         color = source == formatted ? Color.gray(filepath) : filepath
@@ -194,43 +222,44 @@ module SyntaxTree
     # The help message displayed if the input arguments are not correctly
     # ordered or formatted.
     HELP = <<~HELP
-      #{Color.bold("stree ast [OPTIONS] [FILE]")}
+      #{Color.bold("stree ast [--plugins=...] [--print-width=NUMBER] FILE")}
         Print out the AST corresponding to the given files
 
-      #{Color.bold("stree check [OPTIONS] [FILE]")}
+      #{Color.bold("stree check [--plugins=...] [--print-width=NUMBER] FILE")}
         Check that the given files are formatted as syntax tree would format them
 
-      #{Color.bold("stree debug [OPTIONS] [FILE]")}
+      #{Color.bold("stree debug [--plugins=...] [--print-width=NUMBER] FILE")}
         Check that the given files can be formatted idempotently
 
-      #{Color.bold("stree doc [OPTIONS] [FILE]")}
+      #{Color.bold("stree doc [--plugins=...] FILE")}
         Print out the doc tree that would be used to format the given files
 
-      #{Color.bold("stree format [OPTIONS] [FILE]")}
+      #{Color.bold("stree format [--plugins=...] [--print-width=NUMBER] FILE")}
         Print out the formatted version of the given files
 
-      #{Color.bold("stree json [OPTIONS] [FILE]")}
+      #{Color.bold("stree json [--plugins=...] FILE")}
         Print out the JSON representation of the given files
 
-      #{Color.bold("stree match [OPTIONS] [FILE]")}
+      #{Color.bold("stree match [--plugins=...] FILE")}
         Print out a pattern-matching Ruby expression that would match the given files
 
       #{Color.bold("stree help")}
         Display this help message
 
-      #{Color.bold("stree lsp [OPTIONS]")}
+      #{Color.bold("stree lsp [--plugins=...] [--print-width=NUMBER]")}
         Run syntax tree in language server mode
 
       #{Color.bold("stree version")}
         Output the current version of syntax tree
 
-      #{Color.bold("stree write [OPTIONS] [FILE]")}
+      #{Color.bold("stree write [--plugins=...] [--print-width=NUMBER] FILE")}
         Read, format, and write back the source of the given files
 
-      [OPTIONS]
-
       --plugins=...
         A comma-separated list of plugins to load.
+
+      --print-width=NUMBER
+        The maximum line width to use when formatting.
     HELP
 
     class << self
@@ -238,19 +267,31 @@ module SyntaxTree
       # passed to the invocation.
       def run(argv)
         name, *arguments = argv
-
-        # If there are any plugins specified on the command line, then load them
-        # by requiring them here. We do this by transforming something like
-        #
-        #     stree format --plugins=haml template.haml
-        #
-        # into
-        #
-        #     require "syntax_tree/haml"
-        #
-        if arguments.first&.start_with?("--plugins=")
-          plugins = arguments.shift[/^--plugins=(.*)$/, 1]
-          plugins.split(",").each { |plugin| require "syntax_tree/#{plugin}" }
+        print_width = DEFAULT_PRINT_WIDTH
+
+        while arguments.first&.start_with?("--")
+          case (argument = arguments.shift)
+          when /^--plugins=(.+)$/
+            # If there are any plugins specified on the command line, then load
+            # them by requiring them here. We do this by transforming something
+            # like
+            #
+            #     stree format --plugins=haml template.haml
+            #
+            # into
+            #
+            #     require "syntax_tree/haml"
+            #
+            $1.split(",").each { |plugin| require "syntax_tree/#{plugin}" }
+          when /^--print-width=(\d+)$/
+            # If there is a print width specified on the command line, then
+            # parse that out here and use it when formatting.
+            print_width = Integer($1)
+          else
+            warn("Unknown CLI option: #{argument}")
+            warn(HELP)
+            return 1
+          end
         end
 
         case name
@@ -259,7 +300,7 @@ module SyntaxTree
           return 0
         when "lsp"
           require "syntax_tree/language_server"
-          LanguageServer.new.run
+          LanguageServer.new(print_width: print_width).run
           return 0
         when "version"
           puts SyntaxTree::VERSION
@@ -271,9 +312,9 @@ module SyntaxTree
           when "a", "ast"
             AST.new
           when "c", "check"
-            Check.new
+            Check.new(print_width: print_width)
           when "debug"
-            Debug.new
+            Debug.new(print_width: print_width)
           when "doc"
             Doc.new
           when "j", "json"
@@ -281,9 +322,9 @@ module SyntaxTree
           when "m", "match"
             Match.new
           when "f", "format"
-            Format.new
+            Format.new(print_width: print_width)
           when "w", "write"
-            Write.new
+            Write.new(print_width: print_width)
           else
             warn(HELP)
             return 1
@@ -315,23 +356,7 @@ module SyntaxTree
 
         # At the end, we're going to return whether or not this worker ever
         # encountered an error.
-        errored =
-          with_workers(queue) do |item|
-            action.run(item)
-            false
-          rescue Parser::ParseError => error
-            warn("Error: #{error.message}")
-            highlight_error(error, item.source)
-            true
-          rescue Check::UnformattedError, Debug::NonIdempotentFormatError
-            true
-          rescue StandardError => error
-            warn(error.message)
-            warn(error.backtrace)
-            true
-          end
-
-        if errored
+        if process_queue(queue, action)
           action.failure
           1
         else
@@ -342,13 +367,11 @@ module SyntaxTree
 
       private
 
-      def with_workers(queue)
-        # If the queue is just 1 item, then we're not going to bother going
-        # through the whole ceremony of parallelizing the work.
-        return yield queue.shift if queue.size == 1
-
+      # Processes each item in the queue with the given action. Returns whether
+      # or not any errors were encountered.
+      def process_queue(queue, action)
         workers =
-          Etc.nprocessors.times.map do
+          [Etc.nprocessors, queue.size].min.times.map do
             Thread.new do
               # Propagate errors in the worker threads up to the parent thread.
               Thread.current.abort_on_exception = true
@@ -360,7 +383,25 @@ module SyntaxTree
 
               # While there is still work left to do, shift off the queue and
               # process the item.
-              (errored ||= yield queue.shift) until queue.empty?
+              until queue.empty?
+                item = queue.shift
+                errored |=
+                  begin
+                    action.run(item)
+                    false
+                  rescue Parser::ParseError => error
+                    warn("Error: #{error.message}")
+                    highlight_error(error, item.source)
+                    true
+                  rescue Check::UnformattedError,
+                         Debug::NonIdempotentFormatError
+                    true
+                  rescue StandardError => error
+                    warn(error.message)
+                    warn(error.backtrace)
+                    true
+                  end
+              end
 
               # At the end, we're going to return whether or not this worker
               # ever encountered an error.
@@ -368,7 +409,7 @@ module SyntaxTree
             end
           end
 
-        workers.inject(false) { |accum, thread| accum || thread.value }
+        workers.map(&:value).inject(:|)
       end
 
       # Highlights a snippet from a source and parse error.

data/lib/syntax_tree/language_server.rb

@@ -13,11 +13,16 @@ module SyntaxTree
   #     stree lsp
   #
   class LanguageServer
-    attr_reader :input, :output
+    attr_reader :input, :output, :print_width
 
-    def initialize(input: $stdin, output: $stdout)
+    def initialize(
+      input: $stdin,
+      output: $stdout,
+      print_width: DEFAULT_PRINT_WIDTH
+    )
       @input = input.binmode
       @output = output.binmode
+      @print_width = print_width
     end
 
     # rubocop:disable Layout/LineLength
@@ -93,7 +98,7 @@ module SyntaxTree
             character: 0
           }
         },
-        newText: SyntaxTree.format(source)
+        newText: SyntaxTree.format(source, print_width)
       }
     end
 

data/lib/syntax_tree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SyntaxTree
-  VERSION = "3.0.0"
+  VERSION = "3.2.0"
 end

data/lib/syntax_tree.rb

@@ -29,6 +29,11 @@ module SyntaxTree
   HANDLERS = {}
   HANDLERS.default = SyntaxTree
 
+  # This is the default print width when formatting. It can be overridden in the
+  # CLI by passing the --print-width option or here in the API by passing the
+  # optional second argument to ::format.
+  DEFAULT_PRINT_WIDTH = 80
+
   # This is a hook provided so that plugins can register themselves as the
   # handler for a particular file type.
   def self.register_handler(extension, handler)
@@ -43,7 +48,7 @@ module SyntaxTree
   end
 
   # Parses the given source and returns the formatted source.
-  def self.format(source, maxwidth = 80)
+  def self.format(source, maxwidth = DEFAULT_PRINT_WIDTH)
     formatter = Formatter.new(source, [], maxwidth)
     parse(source).format(formatter)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettier_print