syntax_tree-rbs 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff99e85b92644bcfc8cf94291ec8e056c30cb72723bf98e571a0ffef264fcd8
-  data.tar.gz: 75ee446a19c76662c34bf17e323d0e26101cbb3cb173eb6546088e96e11fa867
+  metadata.gz: 7e0550ed09644f60c85734f0633143c5fa621356c9fada7f073446070037ca2e
+  data.tar.gz: fbad990727e58695a58c37cbf31eea3a0f5ed418b4666d38416a8b4fe2aecdaf
 SHA512:
-  metadata.gz: 3121deff5c7b0b25889b95cecbe79ca611d140d00d6ebc52d6232696f944d882431c6d41f4b669bd4ec68f2452d1a48c18c4292d97c60d155491894886c73b11
-  data.tar.gz: 3a05df94b6b1be4115e39ce358b3dbba4846fd39cc592fbf5b73825e17fb7054bc0e8e9b0c8db585c85a46c75789deb16626c07cb9bcd51679b8e9b1b98cf5df
+  metadata.gz: 1c95de371dba5bbffb0b8d78251f77c6143de8db74c17576ae674125b46173db0b35d65ab97eb6ebd8cf44e91311e33a138c78ff84ab5b17c13d0cb914217af9
+  data.tar.gz: d4bf5bc46aa49848425f119937e45e9e15f131e0dc623b8f6bc4c3f93863cb21a5ce824fbca5aa6fbcf9f34129dd1093eb1ee16806cc27003b3b3b21382d3021

data/.github/workflows/main.yml

@@ -4,16 +4,27 @@ on:
 - pull_request_target
 jobs:
   ci:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '2.7.5'
+        - '3.0'
+        - '3.1'
+        gemfile:
+        - rbs1
+        - rbs2
     name: CI
     runs-on: ubuntu-latest
     env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
       CI: true
     steps:
     - uses: actions/checkout@master
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-        ruby-version: '3.1'
+        ruby-version: ${{ matrix.ruby }}
     - name: Test
       run: bundle exec rake test
   automerge:

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 
 test.rbs
+gemfiles/*.lock

data/CHANGELOG.md

@@ -6,11 +6,34 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.4.0] - 2022-05-13
+
+### Added
+
+- Add an optional `maxwidth` second argument to `SyntaxTree::RBS.format`.
+
+## [0.3.0] - 2022-05-13
+
+### Changed
+
+- Use the `prettier_print` gem for formatting instead of `prettyprint`.
+
+## [0.2.0] - 2022-04-22
+
+### Added
+
+- Support for RBS 1.0 in addition to RBS 2.0.
+- Adding support back for Ruby 2.7.
+- Support for inline visibility modifiers in RBS 2.0.
+
 ## [0.1.0] - 2022-04-05
 
 ### Added
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.1.0...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.4.0...HEAD
+[0.4.0]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/93efc7...v0.1.0

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    syntax_tree-rbs (0.1.0)
+    syntax_tree-rbs (0.4.0)
+      prettier_print
       rbs
       syntax_tree (>= 2.0.1)
 
@@ -10,17 +11,20 @@ GEM
   specs:
     docile (1.4.0)
     minitest (5.15.0)
+    prettier_print (0.1.0)
     rake (13.0.6)
-    rbs (2.3.2)
+    rbs (2.4.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    syntax_tree (2.0.1)
+    syntax_tree (2.5.0)
+      prettier_print
 
 PLATFORMS
+  x86_64-darwin-19
   x86_64-darwin-21
   x86_64-linux
 

data/gemfiles/rbs1.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rbs", "~> 1"

data/gemfiles/rbs2.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rbs", "~> 2"

data/lib/syntax_tree/rbs/members.rb

@@ -16,6 +16,7 @@ module SyntaxTree
 
       def format(q)
         q.group do
+          q.text("#{node.visibility} ") if node.visibility
           q.text("attr_#{type} ")
           q.text("self.") if node.kind == :singleton
           q.text(node.name)
@@ -43,6 +44,12 @@ module SyntaxTree
         q.text("name=")
         q.pp(node.name)
 
+        if node.visibility
+          q.breakable
+          q.text("visibility=")
+          q.pp(node.visibility)
+        end
+
         unless node.ivar_name.nil?
           q.breakable
           q.text("ivar_name=")
@@ -281,6 +288,7 @@ module RBS
           SyntaxTree::RBS::Annotations.maybe_format(q, annotations)
 
           q.group do
+            q.text("#{visibility} ") if visibility
             q.text("def ")
 
             if kind == :singleton
@@ -332,6 +340,12 @@ module RBS
             q.text("name=")
             q.pp(name)
 
+            if visibility
+              q.breakable
+              q.text("visibility=")
+              q.pp(visibility)
+            end
+
             if overload?
               q.breakable
               q.text("overload")

data/lib/syntax_tree/rbs/shims.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+if defined?(RBS::AST::Declarations::ModuleTypeParams)
+  require "delegate"
+
+  # Previously there were specialized types that didn't include some additional
+  # information for type params. So here we wrap them up in order to maintain the
+  # same API.
+  module ShimTypeParams
+    class ShimTypeParam < SimpleDelegator
+      def unchecked?
+        false
+      end
+
+      def upper_bound
+        nil
+      end
+    end
+
+    # Overriding the type params method to return an array of wrapped objects.
+    def type_params
+      super.params.map { |param| ShimTypeParam.new(param) }
+    end
+  end
+
+  module RBS::AST::Declarations
+    Alias.prepend(ShimTypeParams)
+    Class.prepend(ShimTypeParams)
+    Interface.prepend(ShimTypeParams)
+    Module.prepend(ShimTypeParams)
+  end
+end
+
+# Previously this attribute didn't exist on some nodes. So if they don't have
+# it, we're just going to apply it and have it return nil.
+module ShimVisibility
+  def visibility
+  end
+end
+
+module RBS::AST::Members
+  [AttrAccessor, AttrReader, AttrWriter, MethodDefinition].each do |klass|
+    klass.include(ShimVisibility) unless klass.method_defined?(:visibility)
+  end
+end

data/lib/syntax_tree/rbs/types.rb

@@ -139,7 +139,7 @@ module RBS
 
     class Literal
       def format(q)
-        unless literal in String
+        unless literal.is_a?(String)
           q.text(literal.inspect)
           return
         end

data/lib/syntax_tree/rbs/utils.rb

@@ -132,7 +132,7 @@ module SyntaxTree
 
       def format(q)
         node.name.format(q)
-        return if node.type_params.length == 0
+        return if node.type_params.empty?
 
         q.text("[")
         q.seplist(node.type_params, -> { q.text(", ") }) do |param|
@@ -308,7 +308,8 @@ module SyntaxTree
           if node.respond_to?(:type_params) && node.type_params.any?
             q.text("[")
             q.seplist(node.type_params, -> { q.text(", ") }) do |param|
-              q.text(param.name)
+              # We need to do a type check here to support RBS 1.0
+              q.text(param.is_a?(Symbol) ? param.to_s : param.name)
             end
             q.text("] ")
           end

data/lib/syntax_tree/rbs/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module RBS
-    VERSION = "0.1.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/syntax_tree/rbs.rb

@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 
+require "prettier_print"
 require "rbs"
 require "syntax_tree"
 
 require_relative "rbs/declarations"
 require_relative "rbs/members"
+require_relative "rbs/shims"
 require_relative "rbs/types"
 require_relative "rbs/utils"
 require_relative "rbs/version"
 
 module SyntaxTree
   module RBS
-    # A slight extension to the default PP formatter that keeps track of the
-    # source (so that it can be referenced by annotations if they need it) and
-    # keeps track of the level of intersections and unions so that parentheses
-    # can be forced if necessary.
-    class Formatter < PP
+    # A slight extension to the default PrettierPrint formatter that keeps track
+    # of the source (so that it can be referenced by annotations if they need
+    # it) and keeps track of the level of intersections and unions so that
+    # parentheses can be forced if necessary.
+    class Formatter < PrettierPrint
       attr_reader :source
 
       def initialize(source, ...)
@@ -67,8 +69,8 @@ module SyntaxTree
     end
 
     class << self
-      def format(source)
-        formatter = Formatter.new(source, [])
+      def format(source, maxwidth = 80)
+        formatter = Formatter.new(source, [], maxwidth)
         parse(source).format(formatter)
 
         formatter.flush

data/syntax_tree-rbs.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
+  spec.add_dependency "prettier_print"
   spec.add_dependency "rbs"
   spec.add_dependency "syntax_tree", ">= 2.0.1"
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree-rbs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: prettier_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -114,9 +128,12 @@ files:
 - bin/format
 - bin/parse
 - bin/setup
+- gemfiles/rbs1.gemfile
+- gemfiles/rbs2.gemfile
 - lib/syntax_tree/rbs.rb
 - lib/syntax_tree/rbs/declarations.rb
 - lib/syntax_tree/rbs/members.rb
+- lib/syntax_tree/rbs/shims.rb
 - lib/syntax_tree/rbs/types.rb
 - lib/syntax_tree/rbs/utils.rb
 - lib/syntax_tree/rbs/version.rb