Revert "Sync did_you_mean"

This reverts commit 946dadd3f479198e87873a863d15c7660a8e2b56,
which broke `TestGemRequire` and others.
This commit is contained in:
Nobuyoshi Nakada 2020-05-12 16:22:41 +09:00
parent 317fdd6df2
commit ee518cf077
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
6 changed files with 2 additions and 80 deletions

View File

@ -6,7 +6,6 @@ require_relative 'did_you_mean/spell_checkers/name_error_checkers'
require_relative 'did_you_mean/spell_checkers/method_name_checker'
require_relative 'did_you_mean/spell_checkers/key_error_checker'
require_relative 'did_you_mean/spell_checkers/null_checker'
require_relative 'did_you_mean/spell_checkers/require_path_checker'
require_relative 'did_you_mean/formatters/plain_formatter'
require_relative 'did_you_mean/tree_spell_checker'
@ -96,9 +95,8 @@ module DidYouMean
correct_error NameError, NameErrorCheckers
correct_error KeyError, KeyErrorChecker
correct_error NoMethodError, MethodNameChecker
correct_error LoadError, RequirePathChecker
# Returns the currently set formatter. By default, it is set to +DidYouMean::Formatter+.
# Returns the currenctly set formatter. By default, it is set to +DidYouMean::Formatter+.
def self.formatter
@@formatter
end

View File

@ -43,12 +43,7 @@ module DidYouMean
end
def corrections
@corrections ||= begin
dictionary = method_names
dictionary = RB_RESERVED_WORDS + dictionary if @private_call
SpellChecker.new(dictionary: dictionary).correct(method_name) - names_to_exclude
end
@corrections ||= SpellChecker.new(dictionary: RB_RESERVED_WORDS + method_names).correct(method_name) - names_to_exclude
end
def method_names

View File

@ -1,33 +0,0 @@
# frozen-string-literal: true
require_relative "../spell_checker"
require_relative "../tree_spell_checker"
module DidYouMean
class RequirePathChecker
attr_reader :path
INITIAL_LOAD_PATH = $LOAD_PATH.dup.freeze
ENV_SPECIFIC_EXT = ".#{RbConfig::CONFIG["DLEXT"]}"
private_constant :INITIAL_LOAD_PATH, :ENV_SPECIFIC_EXT
def self.requireables
@requireables ||= INITIAL_LOAD_PATH
.flat_map {|path| Dir.glob("**/???*{.rb,#{ENV_SPECIFIC_EXT}}", base: path) }
.map {|path| path.chomp!(".rb") || path.chomp!(ENV_SPECIFIC_EXT) }
end
def initialize(exception)
@path = exception.path
end
def corrections
threshold = path.size * 2
dictionary = self.class.requireables.reject {|str| str.size >= threshold }
spell_checker = path.include?("/") ? TreeSpellChecker : SpellChecker
spell_checker.new(dictionary: dictionary).correct(path)
end
end
end

View File

@ -137,11 +137,4 @@ class MethodNameCheckTest < Test::Unit::TestCase
assert_correction :yield, error.corrections
assert_match "Did you mean? yield", error.to_s
end
def test_does_not_suggest_yield
error = assert_raise(NoMethodError) { 1.yeild }
assert_correction [], error.corrections
assert_not_match(/Did you mean\? +yield/, error.to_s)
end if RUBY_ENGINE != "jruby"
end

View File

@ -1,30 +0,0 @@
require_relative '../helper'
class RequirePathCheckTest < Test::Unit::TestCase
include DidYouMean::TestHelper
def test_load_error_from_require_has_suggestions
error = assert_raise LoadError do
require 'open_struct'
end
assert_correction 'ostruct', error.corrections
assert_match "Did you mean? ostruct", error.to_s
end
def test_load_error_from_require_for_nested_files_has_suggestions
error = assert_raise LoadError do
require 'net/htt'
end
assert_correction 'net/http', error.corrections
assert_match "Did you mean? net/http", error.to_s
error = assert_raise LoadError do
require 'net-http'
end
assert_correction ['net/http', 'net/https'], error.corrections
assert_match "Did you mean? net/http", error.to_s
end
end

View File

@ -3,7 +3,6 @@ require_relative './helper'
class VerboseFormatterTest < Test::Unit::TestCase
def setup
require_relative File.join(DidYouMean::TestHelper.root, 'verbose')
DidYouMean.formatter = DidYouMean::VerboseFormatter.new
end