syntax_suggest 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae3c4707aa81be21c4b2545128955745f90df5a2a9e978592b5fe58863a6d5a4
-  data.tar.gz: 596b91a251e7c587c54830a8fc6c64db15066fc202bf30fe086a5255d6f2d06b
+  metadata.gz: de1d75012724df4b1222ba39772c0fbfb6205cfd8713dd4f19ff53e473d7e4f3
+  data.tar.gz: 1a705bbd28e351a682343089c14a2277953d917725f970eaa7884912a093be45
 SHA512:
-  metadata.gz: ce891b408cfd1fe2450d61daea1928562cd01ee5c9335d92684489562d9f243df0b2ac4294f5d735badb5cc664da7226a7cd01eae679b52b9203184852505caf
-  data.tar.gz: 1cc64117d7d662e0ab01dde6dd4a8b4efffe544d4b6cf4332f1cc6e6fff6a17199d3dd02f992c8dbb896ab0e105c5ea1ebd4642c47d54dab9f41741c99e6a8b7
+  metadata.gz: d883c10ef026cfe8c26c930d0857ef02f7655421cdd83f69bd971e231f674124fcca4957032f0a9311c87d2fd798ffb7b9921aee6e9859b112213cfda0c48cd5
+  data.tar.gz: e3d0a25404aa3ea0a802400ee42b3d8337f9180420772409e920683dd631e59c8c2f98bcf85a107dcb3ba888246a3962aeb7ca7ec036b3d0b08e17496406f145

data/.github/dependabot.yml

@@ -4,3 +4,5 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+    labels:
+      - 'skip changelog'

data/.github/workflows/check_changelog.yml

@@ -13,7 +13,7 @@ jobs:
       !contains(github.event.pull_request.body, '[skip ci]') &&
       !contains(github.event.pull_request.labels.*.name, 'skip changelog')
     steps:
-      - uses: actions/checkout@v4.2.1
+      - uses: actions/checkout@v6
       - name: Check that CHANGELOG is touched
         run: |
           git fetch origin ${{ github.base_ref }} --depth 1 && \

data/.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4.2.1
+        uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -32,14 +32,23 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        prism_version:
+          - 1.2.0 # Shipped with Ruby 3.4 as default parser https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-0-released/
+          - 1.8.0
+          - head
+    env:
+      PRISM_VERSION: ${{ matrix.prism_version }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4.2.1
+        uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+      - name: Use latest prism version (head only)
+        if: matrix.prism_version == 'head'
+        run: bundle update prism
       - name: test
         run: bin/rake test
         continue-on-error: ${{ matrix.ruby == 'head' }}
@@ -53,7 +62,7 @@ jobs:
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4.2.1
+        uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/sync-ruby.yml

@@ -0,0 +1,33 @@
+name: Sync ruby
+on:
+  push:
+    branches: [main]
+jobs:
+  sync:
+    name: Sync ruby
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'ruby' }}
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Create GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: 2060836
+          private-key: ${{ secrets.RUBY_SYNC_DEFAULT_GEMS_PRIVATE_KEY }}
+          owner: ruby
+          repositories: ruby
+
+      - name: Sync to ruby/ruby
+        uses: convictional/trigger-workflow-and-wait@v1.6.5
+        with:
+          owner: ruby
+          repo: ruby
+          workflow_file_name: sync_default_gems.yml
+          github_token: ${{ steps.app-token.outputs.token }}
+          ref: master
+          client_payload: |
+            {"gem":"${{ github.event.repository.name }}","before":"${{ github.event.before }}","after":"${{ github.event.after }}"}
+          propagate_failure: true
+          wait_interval: 10

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## HEAD (unreleased)
 
+## 2.0.3
+
+- Fix: Correctly identify trailing slashes when using Prism > 1.8.0. (https://github.com/ruby/syntax_suggest/pull/243)
+- Internal: Add tests to multiple versions of prism
+
+## 2.0.2
+
+- Fix: Separate multiple parser errors by newline. (https://github.com/ruby/syntax_suggest/pull/232)
+
 ## 2.0.1
 
 - Fix CLI failure when shipped with default gems. (https://github.com/ruby/syntax_suggest/pull/226 and https://github.com/ruby/syntax_suggest/pull/227)

data/Gemfile

@@ -5,11 +5,19 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in dead_end.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "stackprof"
 gem "standard"
 gem "ruby-prof"
 
 gem "benchmark-ips"
-gem "prism"
+
+case ENV["PRISM_VERSION"]&.strip&.downcase
+when "head"
+  gem "prism", github: "ruby/prism"
+when nil, ""
+  gem "prism"
+else
+  gem "prism", ENV["PRISM_VERSION"]
+end

data/lib/syntax_suggest/api.rb

@@ -146,11 +146,7 @@ module SyntaxSuggest
   def self.valid_without?(without_lines:, code_lines:)
     lines = code_lines - Array(without_lines).flatten
 
-    if lines.empty?
-      true
-    else
-      valid?(lines)
-    end
+    lines.empty? || valid?(lines)
   end
 
   # SyntaxSuggest.invalid? [Private]
@@ -227,6 +223,7 @@ require_relative "lex_all"
 require_relative "code_line"
 require_relative "code_block"
 require_relative "block_expand"
+require_relative "mini_stringio"
 require_relative "priority_queue"
 require_relative "unvisited_lines"
 require_relative "around_block_scan"

data/lib/syntax_suggest/capture_code_context.rb

@@ -15,7 +15,7 @@ module SyntaxSuggest
   #
   # 1. Sanitize/format input source
   # 2. Search for invalid blocks
-  # 3. Format invalid blocks into something meaninful
+  # 3. Format invalid blocks into something meaningful
   #
   # This class handles the third part.
   #

data/lib/syntax_suggest/clean_document.rb

@@ -10,7 +10,7 @@ module SyntaxSuggest
   #
   # 1. Sanitize/format input source
   # 2. Search for invalid blocks
-  # 3. Format invalid blocks into something meaninful
+  # 3. Format invalid blocks into something meaningful
   #
   # This class handles the first part.
   #

data/lib/syntax_suggest/code_frontier.rb

@@ -8,7 +8,7 @@ module SyntaxSuggest
   #
   # 1. Sanitize/format input source
   # 2. Search for invalid blocks
-  # 3. Format invalid blocks into something meaninful
+  # 3. Format invalid blocks into something meaningful
   #
   # The Code frontier is a critical part of the second step
   #

data/lib/syntax_suggest/code_line.rb

@@ -180,18 +180,17 @@ module SyntaxSuggest
     #     EOM
     #     expect(lines.first.trailing_slash?).to eq(true)
     #
-    if SyntaxSuggest.use_prism_parser?
-      def trailing_slash?
-        last = @lex.last
-        last&.type == :on_tstring_end
-      end
-    else
-      def trailing_slash?
-        last = @lex.last
-        return false unless last
-        return false unless last.type == :on_sp
+    def trailing_slash?
+      last = @lex.last
 
+      # Older versions of prism diverged slightly from Ripper in compatibility mode
+      case last&.type
+      when :on_sp
         last.token == TRAILING_SLASH
+      when :on_tstring_end
+        true
+      else
+        false
       end
     end
 

data/lib/syntax_suggest/core_ext.rb

@@ -3,24 +3,6 @@
 # Ruby 3.2+ has a cleaner way to hook into Ruby that doesn't use `require`
 if SyntaxError.method_defined?(:detailed_message)
   module SyntaxSuggest
-    # Mini String IO [Private]
-    #
-    # Acts like a StringIO with reduced API, but without having to require that
-    # class.
-    class MiniStringIO
-      def initialize(isatty: $stderr.isatty)
-        @string = +""
-        @isatty = isatty
-      end
-
-      attr_reader :isatty
-      def puts(value = $/, **)
-        @string << value
-      end
-
-      attr_reader :string
-    end
-
     # SyntaxSuggest.module_for_detailed_message [Private]
     #
     # Used to monkeypatch SyntaxError via Module.prepend

data/lib/syntax_suggest/mini_stringio.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module SyntaxSuggest
+  # Mini String IO [Private]
+  #
+  # Acts like a StringIO with reduced API, but without having to require that
+  # class.
+  #
+  # The original codebase emitted directly to $stderr, but now SyntaxError#detailed_message
+  # needs a string output. To accomplish that we kept the original print infrastructure in place and
+  # added this class to accumulate the print output into a string.
+  class MiniStringIO
+    EMPTY_ARG = Object.new
+
+    def initialize(isatty: $stderr.isatty)
+      @string = +""
+      @isatty = isatty
+    end
+
+    attr_reader :isatty
+    def puts(value = EMPTY_ARG, **)
+      if !value.equal?(EMPTY_ARG)
+        @string << value
+      end
+      @string << $/
+    end
+
+    attr_reader :string
+  end
+end

data/lib/syntax_suggest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SyntaxSuggest
-  VERSION = "2.0.1"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: syntax_suggest
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - schneems
 bindir: exe
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: When you get an "unexpected end" in your syntax this gem helps you find
   it
@@ -21,6 +21,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/check_changelog.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/sync-ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".standard.yml"
@@ -56,6 +57,7 @@ files:
 - lib/syntax_suggest/left_right_lex_count.rb
 - lib/syntax_suggest/lex_all.rb
 - lib/syntax_suggest/lex_value.rb
+- lib/syntax_suggest/mini_stringio.rb
 - lib/syntax_suggest/parse_blocks_from_indent_line.rb
 - lib/syntax_suggest/pathname_from_message.rb
 - lib/syntax_suggest/priority_engulf_queue.rb
@@ -85,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Find syntax errors in your source in a snap
 test_files: []