1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update SyntaxSuggest to use angle brackets >

Browse Source 
```
$ ruby tool/sync_default_gems.rb syntax_suggest
Sync ruby/syntax_suggest
```

https://github.com/ruby/syntax_suggest/pull/161
This commit is contained in:
schneems 2022-11-29 14:09:20 -06:00 committed by Hiroshi SHIBATA
parent 33a9a7fd8d
commit d6e91784ab
Notes: git 2022-11-30 03:59:15 +00:00 
Merged: https://github.com/ruby/ruby/pull/6831
10 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/syntax_suggest/capture_code_context.rb
View File

@ -140,7 +140,7 @@ module SyntaxSuggest
# However due to https://github.com/ruby/syntax_suggest/issues/32 # However due to https://github.com/ruby/syntax_suggest/issues/32
# the problem line will be identified as: # the problem line will be identified as:
# #
# ❯ class Dog # 1 # > class Dog # 1
# #
# Because lines 2, 3, and 4 are technically valid code and are expanded # Because lines 2, 3, and 4 are technically valid code and are expanded
# first, deemed valid, and hidden. We need to un-hide the matching end # first, deemed valid, and hidden. We need to un-hide the matching end
@ -200,7 +200,7 @@ module SyntaxSuggest
# #
# the problem line will be identified as: # the problem line will be identified as:
# #
# ❯ end # 4 # > end # 4
# #
# This happens because lines 1, 2, and 3 are technically valid code and are expanded # This happens because lines 1, 2, and 3 are technically valid code and are expanded
# first, deemed valid, and hidden. We need to un-hide the matching keyword on # first, deemed valid, and hidden. We need to un-hide the matching keyword on

4
lib/syntax_suggest/cli.rb
View File

@ -92,8 +92,8 @@ module SyntaxSuggest
# ... # ...
❯ 10 defdog > 10 defdog
❯ 15 end > 15 end
ENV options: ENV options:

6
lib/syntax_suggest/display_code_with_line_numbers.rb
View File

@ -14,8 +14,8 @@ module SyntaxSuggest
# # => # # =>
# 1 # 1
# 2 def cat # 2 def cat
# ❯ 3 Dir.chdir # > 3 Dir.chdir
# ❯ 4 end # > 4 end
# 5 end # 5 end
# 6 # 6
class DisplayCodeWithLineNumbers class DisplayCodeWithLineNumbers
@ -50,7 +50,7 @@ module SyntaxSuggest
private def format(contents:, number:, empty:, highlight: false) private def format(contents:, number:, empty:, highlight: false)
string = +"" string = +""
string << if highlight string << if highlight
"❯ " "> "
else else
" " " "
end end

2
lib/syntax_suggest/version.rb
View File

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

4
spec/syntax_suggest/integration/ruby_command_line_spec.rb
View File

@ -72,7 +72,7 @@ module SyntaxSuggest
out = `ruby -I#{lib_dir} -rsyntax_suggest #{require_rb} 2>&1` out = `ruby -I#{lib_dir} -rsyntax_suggest #{require_rb} 2>&1`
expect($?.success?).to be_falsey expect($?.success?).to be_falsey
expect(out).to include('❯ 5 it "flerg"').once expect(out).to include('> 5 it "flerg"').once
end end
end end
@ -101,7 +101,7 @@ module SyntaxSuggest
out = `ruby -I#{lib_dir} -rsyntax_suggest #{script} 2>&1` out = `ruby -I#{lib_dir} -rsyntax_suggest #{script} 2>&1`
expect($?.success?).to be_falsey expect($?.success?).to be_falsey
expect(out).to include('❯ 5 it "flerg"').once expect(out).to include('> 5 it "flerg"').once
end end
end end

54
spec/syntax_suggest/integration/syntax_suggest_spec.rb
View File

@ -29,9 +29,9 @@ module SyntaxSuggest
6 class SyntaxTree < Ripper 6 class SyntaxTree < Ripper
170 def self.parse(source) 170 def self.parse(source)
174 end 174 end
❯ 754 def on_args_add(arguments, argument) > 754 def on_args_add(arguments, argument)
❯ 776 class ArgsAddBlock > 776 class ArgsAddBlock
❯ 810 end > 810 end
9233 end 9233 end
EOM EOM
end end
@ -54,10 +54,10 @@ module SyntaxSuggest
expect(io.string).to_not include("def ruby_install_binstub_path") expect(io.string).to_not include("def ruby_install_binstub_path")
expect(io.string).to include(<<~'EOM') expect(io.string).to include(<<~'EOM')
❯ 1067 def add_yarn_binary > 1067 def add_yarn_binary
❯ 1068 return [] if yarn_preinstalled? > 1068 return [] if yarn_preinstalled?
❯ 1069 | > 1069 |
❯ 1075 end > 1075 end
EOM EOM
end end
@ -73,9 +73,9 @@ module SyntaxSuggest
expect(io.string).to include(<<~'EOM') expect(io.string).to include(<<~'EOM')
1 Rails.application.routes.draw do 1 Rails.application.routes.draw do
❯ 113 namespace :admin do > 113 namespace :admin do
❯ 116 match "/foobar(*path)", via: :all, to: redirect { |_params, req| > 116 match "/foobar(*path)", via: :all, to: redirect { |_params, req|
❯ 120 } > 120 }
121 end 121 end
EOM EOM
end end
@ -94,8 +94,8 @@ module SyntaxSuggest
1 describe "webmock tests" do 1 describe "webmock tests" do
22 it "body" do 22 it "body" do
27 query = Cutlass::FunctionQuery.new( 27 query = Cutlass::FunctionQuery.new(
❯ 28 port: port > 28 port: port
❯ 29 body: body > 29 body: body
30 ).call 30 ).call
34 end 34 end
35 end 35 end
@ -118,9 +118,9 @@ module SyntaxSuggest
7 REQUIRED_BY = {} 7 REQUIRED_BY = {}
9 attr_reader :name 9 attr_reader :name
10 attr_writer :cost 10 attr_writer :cost
❯ 13 def initialize(name) > 13 def initialize(name)
❯ 18 def self.reset! > 18 def self.reset!
❯ 25 end > 25 end
73 end 73 end
74 end 74 end
EOM EOM
@ -140,9 +140,9 @@ module SyntaxSuggest
expect(out).to include(<<~EOM) expect(out).to include(<<~EOM)
16 class Rexe 16 class Rexe
❯ 77 class Lookups > 77 class Lookups
❯ 78 def input_modes > 78 def input_modes
❯ 148 end > 148 end
551 end 551 end
EOM EOM
end end
@ -161,9 +161,9 @@ module SyntaxSuggest
expect(out).to include(<<~EOM) expect(out).to include(<<~EOM)
16 class Rexe 16 class Rexe
18 VERSION = '1.5.1' 18 VERSION = '1.5.1'
❯ 77 class Lookups > 77 class Lookups
❯ 140 def format_requires > 140 def format_requires
❯ 148 end > 148 end
551 end 551 end
EOM EOM
end end
@ -182,9 +182,9 @@ module SyntaxSuggest
) )
out = io.string out = io.string
expect(out).to include(<<~EOM) expect(out).to include(<<~EOM)
❯ 1 def call # 0 > 1 def call # 0
❯ 3 end # one # 2 > 3 end # one # 2
❯ 4 end # two # 3 > 4 end # two # 3
EOM EOM
end end
@ -202,9 +202,9 @@ module SyntaxSuggest
) )
out = io.string out = io.string
expect(out).to include(<<~EOM) expect(out).to include(<<~EOM)
❯ 1 class Dog > 1 class Dog
❯ 2 def bark > 2 def bark
❯ 4 end > 4 end
EOM EOM
end end
end end

16
spec/syntax_suggest/unit/clean_document_spec.rb
View File

@ -66,9 +66,9 @@ module SyntaxSuggest
highlight_lines: lines[0] highlight_lines: lines[0]
).call ).call
).to eq(<<~'EOM') ).to eq(<<~'EOM')
❯ 1 User > 1 User
❯ 2 .where(name: 'schneems') > 2 .where(name: 'schneems')
❯ 3 .first > 3 .first
EOM EOM
end end
@ -169,8 +169,8 @@ module SyntaxSuggest
).call ).call
).to eq(<<~'EOM') ).to eq(<<~'EOM')
1 context "timezones workaround" do 1 context "timezones workaround" do
❯ 2 it "should receive a time in UTC format and return the time with the"\ > 2 it "should receive a time in UTC format and return the time with the"\
❯ 3 "office's UTC offset substracted from it" do > 3 "office's UTC offset substracted from it" do
4 travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do 4 travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do
5 office = build(:office) 5 office = build(:office)
6 end 6 end
@ -227,9 +227,9 @@ module SyntaxSuggest
highlight_lines: lines[0] highlight_lines: lines[0]
).call ).call
).to eq(<<~'EOM') ).to eq(<<~'EOM')
❯ 1 it "should " \ > 1 it "should " \
❯ 2 "keep " \ > 2 "keep " \
❯ 3 "going " do > 3 "going " do
4 end 4 end
EOM EOM
end end

2
spec/syntax_suggest/unit/cli_spec.rb
View File

@ -58,7 +58,7 @@ module SyntaxSuggest
expect(exit_obj.called?).to be_truthy expect(exit_obj.called?).to be_truthy
expect(exit_obj.value).to eq(1) expect(exit_obj.value).to eq(1)
expect(out.strip).to include("❯ 36 def filename") expect(out.strip).to include("> 36 def filename")
end end
it "parses valid code with flags" do it "parses valid code with flags" do

12
spec/syntax_suggest/unit/code_search_spec.rb
View File

@ -185,8 +185,8 @@ module SyntaxSuggest
expect(search.record_dir.join("1-add-1-(3__4).txt").read).to include(<<~EOM) expect(search.record_dir.join("1-add-1-(3__4).txt").read).to include(<<~EOM)
1 class OH 1 class OH
2 def hello 2 def hello
❯ 3 def hai > 3 def hai
❯ 4 end > 4 end
5 end 5 end
EOM EOM
end end
@ -245,7 +245,7 @@ module SyntaxSuggest
).call ).call
expect(document).to include(<<~'EOM') expect(document).to include(<<~'EOM')
❯ 36 def filename > 36 def filename
EOM EOM
end end
@ -295,9 +295,9 @@ module SyntaxSuggest
1 require 'rails_helper' 1 require 'rails_helper'
2 2
3 RSpec.describe AclassNameHere, type: :worker do 3 RSpec.describe AclassNameHere, type: :worker do
❯ 4 describe "thing" do > 4 describe "thing" do
❯ 16 end # line 16 accidental end, but valid block > 16 end # line 16 accidental end, but valid block
❯ 30 end # mismatched due to 16 > 30 end # mismatched due to 16
31 end 31 end
EOM EOM
end end

12
spec/syntax_suggest/unit/display_invalid_blocks_spec.rb
View File

@ -52,7 +52,7 @@ module SyntaxSuggest
) )
display.call display.call
expect(io.string).to include([ expect(io.string).to include([
"❯ 2 ", "> 2 ",
DisplayCodeWithLineNumbers::TERMINAL_HIGHLIGHT, DisplayCodeWithLineNumbers::TERMINAL_HIGHLIGHT,
" def hello" " def hello"
].join) ].join)
@ -69,7 +69,7 @@ module SyntaxSuggest
code_lines: code_lines code_lines: code_lines
) )
display.call display.call
expect(io.string).to include("❯ 2 def hello") expect(io.string).to include("> 2 def hello")
end end
it "outputs to io when using `call`" do it "outputs to io when using `call`" do
@ -92,7 +92,7 @@ module SyntaxSuggest
code_lines: code_lines code_lines: code_lines
) )
display.call display.call
expect(io.string).to include("❯ 2 def hello") expect(io.string).to include("> 2 def hello")
end end
it " wraps code with github style codeblocks" do it " wraps code with github style codeblocks" do
@ -116,7 +116,7 @@ module SyntaxSuggest
).call ).call
expect(io.string).to include(<<~EOM) expect(io.string).to include(<<~EOM)
1 class OH 1 class OH
❯ 2 def hello > 2 def hello
4 def hai 4 def hai
5 end 5 end
6 end 6 end
@ -143,7 +143,7 @@ module SyntaxSuggest
expect(io.string).to include([ expect(io.string).to include([
" 1 class OH", " 1 class OH",
"❯ 2 def hello", "> 2 def hello",
" 4 end", " 4 end",
" 5 end", " 5 end",
"" ""
@ -161,7 +161,7 @@ module SyntaxSuggest
expect(io.string).to include( expect(io.string).to include(
[ [
" 1 class OH", " 1 class OH",
["❯ 2 ", DisplayCodeWithLineNumbers::TERMINAL_HIGHLIGHT, " def hello"].join, ["> 2 ", DisplayCodeWithLineNumbers::TERMINAL_HIGHLIGHT, " def hello"].join,
" 4 end", " 4 end",
" 5 end", " 5 end",
"" ""