Fix example code in README

0.5.1
Make formatter a bit more convenient
2025-06-07 20:20:26 -03:00 · 2024-08-19 12:58:02 -03:00 · 2024-08-19 12:43:51 -03:00 · 2024-08-19 11:26:34 -03:00 · 2024-08-19 11:20:08 -03:00 · 2024-08-19 11:18:54 -03:00
7 changed files with 62 additions and 62 deletions
--- a/README.md
+++ b/README.md
@ -63,7 +63,9 @@ require "tartrazine"

 lexer = Tartrazine.lexer("crystal")
 theme = Tartrazine.theme("catppuccin-macchiato")
-puts Tartrazine::Html.new.format(File.read(ARGV[0]), lexer, theme)
+formatter = Tartrazine::Html.new
+formatter.theme = theme
+puts formatter.format(File.read(ARGV[0]), lexer)
 ```

 ## Contributing
@ -76,4 +78,4 @@ puts Tartrazine::Html.new.format(File.read(ARGV[0]), lexer, theme)

 ## Contributors

- [Roberto Alsina](https://github.com/ralsina) - creator and maintainer
+- [Roberto Alsina](https://github.com/ralsina) - creator and maintainer
--- a/shard.yml
+++ b/shard.yml
@ -1,5 +1,5 @@
 name: tartrazine
-version: 0.4.0
+version: 0.5.1

 authors:
  - Roberto Alsina <roberto.alsina@gmail.com>
--- a/src/formatter.cr
+++ b/src/formatter.cr
@ -12,6 +12,10 @@ module Tartrazine
    property theme : Theme = Tartrazine.theme("default-dark")

    # Format the text using the given lexer.
+    def format(text : String, lexer : Lexer, io : IO = nil) : Nil
+      raise Exception.new("Not implemented")
+    end
+
    def format(text : String, lexer : Lexer) : String
      raise Exception.new("Not implemented")
    end
--- a/src/formatters/ansi.cr
+++ b/src/formatters/ansi.cr
@ -12,33 +12,23 @@ module Tartrazine
    end

    def format(text : String, lexer : Lexer) : String
-      tokenizer = Tokenizer.new(lexer, text)
-      i = 0
-      output = String.build do |outp|
-        outp << line_label(i) if line_numbers?
-        tokenizer.each do |token|
-          outp << colorize(token[:value], token[:type])
-          if token[:value].includes?("\n")
-            i += 1
-            outp << line_label(i) if line_numbers?
-          end
-        end
-      end
-      output
+      outp = String::Builder.new("")
+      format(text, lexer, outp)
+      outp.to_s
    end

-    # def format(text : String, lexer : Lexer) : String
-    #   output = String.build do |outp|
-    #     lexer.group_tokens_in_lines(lexer.tokenize(text)).each_with_index do |line, i|
-    #       label = line_numbers? ? "#{i + 1}".rjust(4).ljust(5) : ""
-    #       outp << label
-    #       line.each do |token|
-    #         outp << colorize(token[:value], token[:type])
-    #       end
-    #     end
-    #   end
-    #   output
-    # end
+    def format(text : String, lexer : Lexer, outp : IO) : Nil
+      tokenizer = Tokenizer.new(lexer, text)
+      i = 0
+      outp << line_label(i) if line_numbers?
+      tokenizer.each do |token|
+        outp << colorize(token[:value], token[:type])
+        if token[:value].includes?("\n")
+          i += 1
+          outp << line_label(i) if line_numbers?
+        end
+      end
+    end

    def colorize(text : String, token : String) : String
      style = theme.styles.fetch(token, nil)
--- a/src/formatters/html.cr
+++ b/src/formatters/html.cr
@ -35,23 +35,26 @@ module Tartrazine
    end

    def format(text : String, lexer : Lexer) : String
-      text = format_text(text, lexer)
-      if standalone?
-        text = wrap_standalone(text)
-      end
-      text
+      outp = String::Builder.new("")
+      format(text, lexer, outp)
+      outp.to_s
+    end
+
+    def format(text : String, lexer : Lexer, io : IO) : Nil
+      pre, post = wrap_standalone
+      io << pre if standalone?
+      format_text(text, lexer, io)
+      io << post if standalone?
    end

    # Wrap text into a full HTML document, including the CSS for the theme
-    def wrap_standalone(text) : String
+    def wrap_standalone
      output = String.build do |outp|
        outp << "<!DOCTYPE html><html><head><style>"
        outp << style_defs
        outp << "</style></head><body>"
-        outp << text
-        outp << "</body></html>"
      end
-      output
+      {output.to_s, "</body></html>"}
    end

    private def line_label(i : Int32) : String
@ -61,27 +64,23 @@ module Tartrazine
      "<span #{line_id} #{line_class} style=\"user-select: none;\">#{line_label} </span>"
    end

-    def format_text(text : String, lexer : Lexer) : String
-      # lines = lexer.group_tokens_in_lines(lexer.tokenize(text))
+    def format_text(text : String, lexer : Lexer, outp : IO)
      tokenizer = Tokenizer.new(lexer, text)
      i = 0
-      output = String.build do |outp|
-        if surrounding_pre?
-          pre_style = wrap_long_lines? ? "style=\"white-space: pre-wrap; word-break: break-word;\"" : ""
-          outp << "<pre class=\"#{get_css_class("Background")}\" #{pre_style}>"
-        end
-        outp << "<code class=\"#{get_css_class("Background")}\">"
-        outp << line_label(i) if line_numbers?
-        tokenizer.each do |token|
-          outp << "<span class=\"#{get_css_class(token[:type])}\">#{HTML.escape(token[:value])}</span>"
-          if token[:value].ends_with? "\n"
-            i += 1
-            outp << line_label(i) if line_numbers?
-          end
-        end
-        outp << "</code></pre>"
+      if surrounding_pre?
+        pre_style = wrap_long_lines? ? "style=\"white-space: pre-wrap; word-break: break-word;\"" : ""
+        outp << "<pre class=\"#{get_css_class("Background")}\" #{pre_style}>"
      end
-      output
+      outp << "<code class=\"#{get_css_class("Background")}\">"
+      outp << line_label(i) if line_numbers?
+      tokenizer.each do |token|
+        outp << "<span class=\"#{get_css_class(token[:type])}\">#{HTML.escape(token[:value])}</span>"
+        if token[:value].ends_with? "\n"
+          i += 1
+          outp << line_label(i) if line_numbers?
+        end
+      end
+      outp << "</code></pre>"
    end

    # ameba:disable Metrics/CyclomaticComplexity
--- a/src/formatters/json.cr
+++ b/src/formatters/json.cr
@ -4,8 +4,15 @@ module Tartrazine
  class Json < Formatter
    property name = "json"

-    def format(text : String, lexer : Lexer, _theme : Theme) : String
-      lexer.tokenize(text).to_json
+    def format(text : String, lexer : Lexer) : String
+      outp = String::Builder.new("")
+      format(text, lexer, outp)
+      outp.to_s
+    end
+
+    def format(text : String, lexer : Lexer, io : IO) : Nil
+      tokenizer = Tokenizer.new(lexer, text)
+      io << Tartrazine::Lexer.collapse_tokens(tokenizer.to_a).to_json
    end
  end
 end
--- a/src/main.cr
+++ b/src/main.cr
@ -85,13 +85,11 @@ if options["-f"]
  lexer = Tartrazine.lexer(name: options["-l"].as(String), filename: options["FILE"].as(String))

  input = File.open(options["FILE"].as(String)).gets_to_end
-  output = formatter.format(input, lexer)

  if options["-o"].nil?
-    puts output
+    outf = STDOUT
  else
-    File.open(options["-o"].as(String), "w") do |outf|
-      outf << output
-    end
+    outf = File.open(options["-o"].as(String), "w")
  end
+  formatter.format(input, lexer, outf)
 end
Author	SHA1	Message	Date
Roberto Alsina	357b121af1	Fix example code in README	2024-08-19 12:58:02 -03:00
Roberto Alsina	91b973f464	0.5.1	2024-08-19 12:43:51 -03:00
Roberto Alsina	3ebedec6c1	Make formatter a bit more convenient	2024-08-19 11:26:34 -03:00
Roberto Alsina	57e63f2308	Make formatter a bit more convenient	2024-08-19 11:20:08 -03:00
Roberto Alsina	4a598a575b	Make formatter a bit more convenient	2024-08-19 11:18:54 -03:00
Roberto Alsina	9042138053	Make formatter a bit more convenient	2024-08-19 11:17:44 -03:00
Roberto Alsina	fa647e898a	Make formatter a bit more convenient	2024-08-19 10:15:02 -03:00
Roberto Alsina	ad92929a10	Make formatter a bit more convenient	2024-08-19 09:59:01 -03:00
Roberto Alsina	bb952a44b8	Use IO for output	2024-08-16 17:25:33 -03:00