Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
- "3.4"
- "3.3"
- "3.2"
- "3.1"
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem "rubocop-shopify", "~> 2.14", require: false
gem "rubocop-rake", "~> 0.6.0", require: false
gem "rubocop-sorbet", "~> 0.7", require: false

gem "sorbet-static-and-runtime", platforms: :ruby
gem "sorbet-static", platforms: :ruby
gem "tapioca", "~> 0.11", require: false, platforms: :ruby

gem "debug"
Expand Down
87 changes: 47 additions & 40 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@ PATH
remote: .
specs:
ruby-lsp-rspec (0.1.25)
ruby-lsp (~> 0.24.0)
ruby-lsp (~> 0.25.0)

GEM
remote: https://rubygems.org/
specs:
ast (2.4.3)
benchmark (0.4.0)
benchmark (0.4.1)
date (3.4.1)
debug (1.10.0)
debug (1.11.0)
irb (~> 1.10)
reline (>= 0.3.8)
diff-lcs (1.6.1)
diff-lcs (1.6.2)
erb (5.0.2)
erubi (1.13.1)
io-console (0.8.0)
io-console (0.8.1)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.11.3)
json (2.13.0)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
Expand All @@ -33,88 +34,94 @@ GEM
prettyprint
prettyprint (0.2.0)
prism (1.4.0)
psych (5.2.3)
psych (5.2.6)
date
stringio
racc (1.8.1)
rainbow (3.1.1)
rake (13.2.1)
rbi (0.3.2)
rake (13.3.0)
rbi (0.3.6)
prism (~> 1.0)
rbs (>= 3.4.4)
sorbet-runtime (>= 0.5.9204)
rbs (3.9.3)
rbs (4.0.0.dev.4)
logger
rdoc (6.13.1)
prism (>= 1.3.0)
rdoc (6.14.2)
erb
psych (>= 4.0.0)
regexp_parser (2.10.0)
reline (0.6.1)
io-console (~> 0.5)
rspec (3.13.0)
require-hooks (0.2.2)
rexml (3.4.1)
rspec (3.13.1)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.3)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.2)
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.2)
rubocop (1.75.3)
rspec-support (3.13.4)
rubocop (1.78.0)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.44.0, < 2.0)
rubocop-ast (>= 1.45.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.44.1)
rubocop-ast (1.46.0)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-shopify (2.17.0)
rubocop-shopify (2.17.1)
rubocop (~> 1.62)
rubocop-sorbet (0.10.0)
rubocop (>= 1)
ruby-lsp (0.24.0)
rubocop-sorbet (0.10.5)
lint_roller
rubocop (>= 1.75.2)
ruby-lsp (0.25.0)
language_server-protocol (~> 3.17.0)
prism (>= 1.2, < 2.0)
rbs (>= 3, < 5)
sorbet-runtime (>= 0.5.10782)
ruby-progressbar (1.13.0)
sorbet (0.5.12087)
sorbet-static (= 0.5.12087)
sorbet-runtime (0.5.12087)
sorbet-static (0.5.12087-universal-darwin)
sorbet-static (0.5.12087-x86_64-linux)
sorbet-static-and-runtime (0.5.12087)
sorbet (= 0.5.12087)
sorbet-runtime (= 0.5.12087)
spoom (1.6.1)
sorbet (0.5.12353)
sorbet-static (= 0.5.12353)
sorbet-runtime (0.5.12353)
sorbet-static (0.5.12353-universal-darwin)
sorbet-static (0.5.12353-x86_64-linux)
sorbet-static-and-runtime (0.5.12353)
sorbet (= 0.5.12353)
sorbet-runtime (= 0.5.12353)
spoom (1.7.5)
erubi (>= 1.10.0)
prism (>= 0.28.0)
rbi (>= 0.2.3)
rbi (>= 0.3.3)
rbs (>= 4.0.0.dev.4)
rexml (>= 3.2.6)
sorbet-static-and-runtime (>= 0.5.10187)
thor (>= 0.19.2)
stringio (3.1.7)
tapioca (0.16.11)
tapioca (0.17.7)
benchmark
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (~> 0.2)
rbi (>= 0.3.1)
require-hooks (>= 0.2.2)
sorbet-static-and-runtime (>= 0.5.11087)
spoom (>= 1.2.0)
spoom (>= 1.7.0)
thor (>= 1.2.0)
yard-sorbet
thor (1.3.2)
thor (1.4.0)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
Expand All @@ -137,7 +144,7 @@ DEPENDENCIES
rubocop-shopify (~> 2.14)
rubocop-sorbet (~> 0.7)
ruby-lsp-rspec!
sorbet-static-and-runtime
sorbet-static
tapioca (~> 0.11)

BUNDLED WITH
Expand Down
9 changes: 5 additions & 4 deletions lib/ruby_lsp/ruby_lsp_rspec/test_discovery.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,22 @@ def on_call_node_leave(node)

private

#: (Prism::CallNode) -> String?
#: (Prism::CallNode) -> String
def extract_description(node)
# Try to extract the description from a string literal argument
# Try to extract the description from the argument
first_arg = node.arguments&.arguments&.first
return "example at #{relative_location(node)}" if first_arg.nil?

case first_arg
when Prism::StringNode
first_arg.content
when Prism::SymbolNode
first_arg.value
first_arg.value.to_s
when Prism::ConstantReadNode
first_arg.name.to_s
when Prism::ConstantPathNode
first_arg.full_name
else
"example at #{relative_location(node)}"
end
end

Expand Down
2 changes: 1 addition & 1 deletion ruby-lsp-rspec.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "ruby-lsp", "~> 0.24.0"
spec.add_dependency "ruby-lsp", "~> 0.25.0"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.26.1 is out - is it necessary to lock it?

end
3 changes: 1 addition & 2 deletions sorbet/config
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
.
--ignore=tmp/
--ignore=vendor/
--enable-experimental-rbs-signatures
--enable-experimental-rbs-assertions
--enable-experimental-rbs-comments
11 changes: 6 additions & 5 deletions sorbet/rbi/gems/[email protected]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading