Skip to content

Commit

Permalink
Merge pull request #184 from Shopify/disable-undefined-config
Browse files Browse the repository at this point in the history
  • Loading branch information
sambostock committed Oct 13, 2023
2 parents c2bb447 + 9bc8a69 commit a39b684
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ Naming/FileName:

Layout/LineLength:
IgnoreCopDirectives: true

InternalAffairs/UndefinedConfig:
Enabled: false # Bug in implementation fails to find our configs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def investigate(processed_source)
private

def allowed_paths
paths = cop_config["AllowedPaths"] # rubocop:todo InternalAffairs/UndefinedConfig
paths = cop_config["AllowedPaths"]
return unless paths.is_a?(Array)

paths.compact
Expand Down
10 changes: 5 additions & 5 deletions lib/rubocop/cop/sorbet/sigils/valid_sigil.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def suggested_strictness_level
return suggested_strictness unless minimum_strictness

# special case: if you're using Sorbet/IgnoreSigil without config, we should recommend `ignore`
return "ignore" if minimum_strictness == "ignore" && cop_config["SuggestedStrictness"].nil? # rubocop:todo InternalAffairs/UndefinedConfig
return "ignore" if minimum_strictness == "ignore" && cop_config["SuggestedStrictness"].nil?

# if a minimum strictness is set (eg. you're using Sorbet/FalseSigil)
# we want to compare the minimum strictness and suggested strictness. this is because
Expand Down Expand Up @@ -161,24 +161,24 @@ def check_strictness_level(sigil, strictness)

# Default is `false`
def require_sigil_on_all_files?
!!cop_config["RequireSigilOnAllFiles"] # rubocop:todo InternalAffairs/UndefinedConfig
!!cop_config["RequireSigilOnAllFiles"]
end

# Default is `'false'`
def suggested_strictness
config = cop_config["SuggestedStrictness"].to_s # rubocop:todo InternalAffairs/UndefinedConfig
config = cop_config["SuggestedStrictness"].to_s
STRICTNESS_LEVELS.include?(config) ? config : "false"
end

# Default is `nil`
def minimum_strictness
config = cop_config["MinimumStrictness"].to_s # rubocop:todo InternalAffairs/UndefinedConfig
config = cop_config["MinimumStrictness"].to_s
config if STRICTNESS_LEVELS.include?(config)
end

# Default is `nil`
def exact_strictness
config = cop_config["ExactStrictness"].to_s # rubocop:todo InternalAffairs/UndefinedConfig
config = cop_config["ExactStrictness"].to_s
config if STRICTNESS_LEVELS.include?(config)
end
end
Expand Down

0 comments on commit a39b684

Please sign in to comment.