Skip to content

Commit

Permalink
Improve format command. (#670)
Browse files Browse the repository at this point in the history
  • Loading branch information
gdotdesign authored Sep 21, 2023
1 parent cda6761 commit db82722
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 21 deletions.
45 changes: 24 additions & 21 deletions src/commands/format.cr
Original file line number Diff line number Diff line change
Expand Up @@ -47,34 +47,41 @@ module Mint

private def format_files
current =
MintJson.parse_current

format_directories =
current.source_directories | current.test_directories

format_directories_patterns =
format_directories.map do |dir|
SourceFiles.glob_pattern(dir)
MintJson.parse_current?

files =
if pattern_argument = arguments.pattern.presence
Dir.glob(pattern_argument)
elsif current
format_directories =
current.source_directories | current.test_directories

format_directories_patterns =
format_directories.map do |dir|
SourceFiles.glob_pattern(dir)
end
Dir.glob(format_directories_patterns)
end

if pattern_argument = arguments.pattern.presence
files = Dir.glob(pattern_argument)
else
files = Dir.glob(format_directories_patterns)
end

if files.empty?
if files.try(&.empty?)
terminal.puts "Nothing to format!"
true
else
all_formatted = true

files.each do |file|
files.not_nil!.each do |file|
artifact =
Parser.parse(file)

config =
if current
MintJson.parse_current.formatter_config
else
Formatter::Config.new
end

formatted =
Formatter.new(MintJson.parse_current.formatter_config).format(artifact)
Formatter.new(config).format(artifact)

unless formatted == File.read(file)
if flags.check
Expand All @@ -92,10 +99,6 @@ module Mint
end
rescue error : Error
raise error
rescue
terminal.puts %(I was looking for a pattern that contains ".mint" files,)
terminal.puts %(such as "source/**/*.mint". Got "#{arguments.pattern}" instead.)
false
end
end
end
Expand Down
6 changes: 6 additions & 0 deletions src/mint_json.cr
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ module Mint
from_file(Path[Dir.current, "mint.json"].to_s)
end

def self.parse_current? : MintJson?
parse_current
rescue
nil
end

# Calculating nodes for the snippet in errors.
# --------------------------------------------------------------------------

Expand Down

0 comments on commit db82722

Please sign in to comment.