remove syntax_tree-json dependency

dorianmariecom · Sep 15, 2024 · ad21674 · ad21674
1 parent f0c0582
commit ad21674
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -17,7 +17,6 @@ PATH
       syntax_tree
       syntax_tree-css
       syntax_tree-haml
-      syntax_tree-json
       syntax_tree-xml
       terminal-table
       w_syntax_tree-erb
@@ -153,9 +152,6 @@ GEM
       haml (>= 5.2)
       prettier_print (>= 1.2.1)
       syntax_tree (>= 6.0.0)
-    syntax_tree-json (0.3.0)
-      prettier_print
-      syntax_tree (>= 2.0.1)
     syntax_tree-xml (0.1.0)
       prettier_print
       syntax_tree (>= 2.0.1)

diff --git a/dorian.gemspec b/dorian.gemspec
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
   s.add_dependency "syntax_tree"
   s.add_dependency "syntax_tree-haml"
   s.add_dependency "syntax_tree-xml"
-  s.add_dependency "syntax_tree-json"
   s.add_dependency "syntax_tree-css"
   s.add_dependency "terminal-table"
   s.add_dependency "w_syntax_tree-erb"

diff --git a/lib/dorian/bin.rb b/lib/dorian/bin.rb
@@ -1544,6 +1544,7 @@ def filetype(path)
       return :xml if ext == ".plist"
       return :xml if ext == ".storyboard"
       return :groovy if ext == ".gradle"
+      return :groovy if ext == ".properties"
       return unless File.exist?(path)
       first_line = File.open(path, &:gets).to_s
       first_line = first_line.encode("UTF-8", invalid: :replace).strip
@@ -1567,12 +1568,12 @@ def format(path, context:)
         after = SyntaxTree::Haml.format(before)
       when :erb
         after = SyntaxTree::ERB.format(before)
-      when :json
-        after = SyntaxTree::JSON.format(before)
       when :xml
         after = SyntaxTree::XML.format(before)
       when :css
         after = SyntaxTree::CSS.format(before)
+      when :json
+        after = JSON.pretty_generate(JSON.parse(before))
       when :jsonl
         after = before.lines.map { |line| JSON.parse(line).to_json }.join("\n")
       when :csv