Skip to content

Commit

Permalink
Merge syntax-suggest-2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hsbt committed Oct 18, 2024
1 parent 494fcc5 commit ccedf18
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions lib/syntax_suggest/around_block_scan.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def scan_while
end

# Scanning is intentionally conservative because
# we have no way of rolling back an agressive block (at this time)
# we have no way of rolling back an aggressive block (at this time)
#
# If a block was stopped for some trivial reason, (like an empty line)
# but the next line would have caused it to be balanced then we
Expand Down Expand Up @@ -224,7 +224,7 @@ def lines
@scanner.lines
end

# Managable rspec errors
# Manageable rspec errors
def inspect
"#<#{self.class}:0x0000123843lol >"
end
Expand Down
2 changes: 1 addition & 1 deletion lib/syntax_suggest/block_expand.rb
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def expand_neighbors(block)
end
end

# Managable rspec errors
# Manageable rspec errors
def inspect
"#<SyntaxSuggest::CodeBlock:0x0000123843lol >"
end
Expand Down
2 changes: 1 addition & 1 deletion lib/syntax_suggest/capture_code_context.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module SyntaxSuggest
# they can't add extra data that's not present.
#
# In the case of known ambiguious cases, this class adds context
# back to the ambiguitiy so the programmer has full information.
# back to the ambiguity so the programmer has full information.
#
# Beyond handling these ambiguities, it also captures surrounding
# code context information:
Expand Down
2 changes: 1 addition & 1 deletion lib/syntax_suggest/clean_document.rb
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def join_groups(groups)
groups.each do |lines|
line = lines.first

# Handle the case of multiple groups in a a row
# Handle the case of multiple groups in a row
# if one is already replaced, move on
next if @document[line.index].empty?

Expand Down
2 changes: 1 addition & 1 deletion lib/syntax_suggest/lex_value.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def initialize(line, type, token, state, last_lex = nil)
@is_end = false
@is_kw = false
return if type != :on_kw
#

return if last_lex && last_lex.fname? # https://github.com/ruby/ruby/commit/776759e300e4659bb7468e2b97c8c2d4359a2953

case token
Expand Down
2 changes: 1 addition & 1 deletion lib/syntax_suggest/parse_blocks_from_indent_line.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module SyntaxSuggest
# grabbing one that contains only an "end". In this example:
#
# def dog
# begonn # mispelled `begin`
# begonn # misspelled `begin`
# puts "bark"
# end
# end
Expand Down
2 changes: 1 addition & 1 deletion lib/syntax_suggest/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module SyntaxSuggest
VERSION = "2.0.0"
VERSION = "2.0.1"
end
2 changes: 1 addition & 1 deletion libexec/syntax_suggest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby

require_relative "../lib/syntax_suggest/api"
require "syntax_suggest/api"

SyntaxSuggest::Cli.new(
argv: ARGV
Expand Down
4 changes: 2 additions & 2 deletions spec/syntax_suggest/unit/block_expand_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def foo
EOM
end

it "expand until next boundry (indentation)" do
it "expand until next boundary (indentation)" do
source_string = <<~EOM
describe "what" do
Foo.call
Expand Down Expand Up @@ -188,7 +188,7 @@ def foo
EOM
end

it "expand until next boundry (empty lines)" do
it "expand until next boundary (empty lines)" do
source_string = <<~EOM
describe "what" do
end
Expand Down
6 changes: 3 additions & 3 deletions spec/syntax_suggest/unit/clean_document_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ module SyntaxSuggest
source = <<~'EOM'
context "timezones workaround" do
it "should receive a time in UTC format and return the time with the"\
"office's UTC offset substracted from it" do
"office's UTC offset subtracted from it" do
travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do
office = build(:office)
end
Expand All @@ -155,7 +155,7 @@ module SyntaxSuggest
).to eq(<<~'EOM'.indent(2))
1 context "timezones workaround" do
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 subtracted from it" do
4 travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do
5 office = build(:office)
6 end
Expand All @@ -171,7 +171,7 @@ module SyntaxSuggest
).to eq(<<~'EOM')
1 context "timezones workaround" do
> 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 subtracted from it" do
4 travel_to DateTime.new(2020, 10, 1, 10, 0, 0) do
5 office = build(:office)
6 end
Expand Down

0 comments on commit ccedf18

Please sign in to comment.