refactor: simplify struct names

gen/README.md

@@ -31,10 +31,10 @@ To modify colors or highlights, you can update tables and lists in `src/main.rs`
 
 - `Palette` is a struct to define colors. `Palette::default` method constructs the instance. You
   can find the color palette inside the function body.
-- `ColorschemeWriter` is a struct to generate Vim colorscheme file. `ColorschemeWriter::new` method
+- `Colorscheme` is a struct to generate Vim colorscheme file. `ColorschemeWriter::new` method
   constructs the definition of highlights. Read the function body to know/modify the highlights for
   each syntax items. The terminal colors used in `:terminal` are also defined here.
-- `AirlineThemeWriter` is a struct to generate [vim-airline](https://github.com/vim-airline/vim-airline)
+- `AirlineTheme` is a struct to generate [vim-airline](https://github.com/vim-airline/vim-airline)
   theme file. `AirlineThemeWriter::new` method defines color palettes for each modes.
-- `AlacrittyThemeWriter` is a struct to generate [Alacritty](https://alacritty.org/) theme file.
-  `AlacrittyThemeWriter` defines the terminal ANSI colors.
+- `AlacrittyTheme` is a struct to generate [Alacritty](https://alacritty.org/) theme file.
+  `AlacrittyTheme::new` method defines the terminal ANSI colors.

gen/src/main.rs

@@ -144,13 +144,13 @@ fn indent(level: u8) -> &'static str {
 }
 
 #[derive(Debug)]
-struct ColorschemeWriter<'a> {
+struct Colorscheme<'a> {
     palette: &'a Palette,
     highlightings: &'a [Highlighting],
     term_colors: [&'static str; 16],
 }
 
-impl<'a> ColorschemeWriter<'a> {
+impl<'a> Colorscheme<'a> {
     fn new(palette: &'a Palette) -> Self {
         macro_rules! highlight {
             ($name:ident, $fg:expr, $bg:expr, $sp:expr, $attr:ident) => {
@@ -673,7 +673,7 @@ struct AirlineModeColors<'a> {
 }
 
 #[derive(Debug)]
-struct AirlineThemeWriter<'a> {
+struct AirlineTheme<'a> {
     palette: &'a Palette,
     modes: HashMap<&'a str, AirlineModeColors<'a>>,
     paste: &'a str,
@@ -682,7 +682,7 @@ struct AirlineThemeWriter<'a> {
     warning: (&'a str, &'a str),
 }
 
-impl<'a> AirlineThemeWriter<'a> {
+impl<'a> AirlineTheme<'a> {
     fn new(palette: &'a Palette) -> Self {
         //  Note: Pairs of strings are color names of (fg, bg)
         Self {
@@ -874,15 +874,15 @@ struct AlacrittyFgColors<'a> {
 }
 
 #[derive(Debug)]
-struct AlacrittyThemeWriter<'a> {
+struct AlacrittyTheme<'a> {
     palette: &'a Palette,
     background: &'a str,
     dim: AlacrittyFgColors<'a>,
     normal: AlacrittyFgColors<'a>,
     bright: AlacrittyFgColors<'a>,
 }
 
-impl<'a> AlacrittyThemeWriter<'a> {
+impl<'a> AlacrittyTheme<'a> {
     fn new(palette: &'a Palette) -> Self {
         Self {
             palette,
@@ -992,21 +992,21 @@ fn write_to_files(dir: &str) -> Result<()> {
     let path = join(&[dir, "colors", "spring-night.vim"]);
     let file = File::create(&path)
         .with_context(|| format!("Could not create colorscheme file: {:?}", &path))?;
-    ColorschemeWriter::new(&palette)
+    Colorscheme::new(&palette)
         .write_to(&mut BufWriter::new(file))
         .with_context(|| format!("While generate colorscheme file {:?}", &path))?;
 
     let path = join(&[dir, "autoload", "airline", "themes", "spring_night.vim"]);
     let file = File::create(&path)
         .with_context(|| format!("Could not create airline theme file {:?}", &path))?;
-    AirlineThemeWriter::new(&palette)
+    AirlineTheme::new(&palette)
         .write_to(&mut BufWriter::new(file))
         .with_context(|| format!("Could not generate airline theme file {:?}", &path))?;
 
     let path = join(&[dir, "alacritty", "spring_night.toml"]);
     let file = File::create(&path)
         .with_context(|| format!("Could not create alacritty theme file {:?}", &path))?;
-    AlacrittyThemeWriter::new(&palette)
+    AlacrittyTheme::new(&palette)
         .write_to(&mut BufWriter::new(file))
         .with_context(|| format!("Could not generate alacritty theme file {:?}", &path))
 }
@@ -1015,15 +1015,15 @@ fn write_to_stdout() -> Result<()> {
     let palette = Palette::default();
     let mut stdout = io::stdout().lock();
 
-    ColorschemeWriter::new(&palette)
+    Colorscheme::new(&palette)
         .write_to(&mut stdout)
         .context("While writing colorscheme to stdout")?;
     writeln!(stdout)?;
-    AirlineThemeWriter::new(&palette)
+    AirlineTheme::new(&palette)
         .write_to(&mut stdout)
         .context("While writing airline theme to stdout")?;
     writeln!(stdout)?;
-    AlacrittyThemeWriter::new(&palette)
+    AlacrittyTheme::new(&palette)
         .write_to(&mut stdout)
         .context("While writing alacritty theme to stdout")
 }

gen/src/test.rs

@@ -13,7 +13,7 @@ fn test_color_code() {
 #[test]
 fn test_write_header() {
     let palette = Palette(HashMap::new());
-    let w = ColorschemeWriter::new(&palette);
+    let w = Colorscheme::new(&palette);
     let mut out = vec![];
     w.write_header(&mut out).unwrap();
     let rendered = str::from_utf8(&out).unwrap();
@@ -24,7 +24,7 @@ fn test_write_header() {
 #[test]
 fn test_write_contrast_color_variables() {
     let palette = Palette(HashMap::new());
-    let w = ColorschemeWriter::new(&palette);
+    let w = Colorscheme::new(&palette);
     let mut out = vec![];
     w.write_contrast_color_variables(&mut out).unwrap();
     assert_eq!(str::from_utf8(&out).unwrap(), "\n");
@@ -59,7 +59,7 @@ fn test_write_contrast_color_variables() {
         },
     );
     let palette = Palette(m);
-    let w = ColorschemeWriter::new(&palette);
+    let w = Colorscheme::new(&palette);
     let mut out = vec![];
     w.write_contrast_color_variables(&mut out).unwrap();
     for (actual, expected) in [
@@ -122,15 +122,15 @@ fn test_write_highlight() {
             },
         );
         let palette = Palette(m);
-        let w = ColorschemeWriter::new(&palette);
+        let w = Colorscheme::new(&palette);
         let mut out = vec![];
         w.write_highlight(&mut out, &hl, indent).unwrap();
         assert_eq!(str::from_utf8(&out).unwrap(), format!("{}\n", expected));
     }
 
     // Edge case
     let palette = Palette(HashMap::new());
-    let mut w = ColorschemeWriter::new(&palette);
+    let mut w = Colorscheme::new(&palette);
     w.highlightings = &[];
     let mut out = vec![];
     w.write_highlightings(&mut out).unwrap();
@@ -150,7 +150,7 @@ fn test_write_highlights() {
     }
 
     let palette = Palette(HashMap::new());
-    let mut w = ColorschemeWriter::new(&palette);
+    let mut w = Colorscheme::new(&palette);
     let fixed = &[Fixed(hl())];
     w.highlightings = fixed;
     let mut out = vec![];
@@ -162,7 +162,7 @@ fn test_write_highlights() {
         term: hl(),
     }];
     let palette = Palette(HashMap::new());
-    let mut w = ColorschemeWriter::new(&palette);
+    let mut w = Colorscheme::new(&palette);
     w.highlightings = dynamic;
     let mut out = vec![];
     w.write_highlightings(&mut out).unwrap();
@@ -197,7 +197,7 @@ fn test_write_term_colors() {
         },
     );
     let palette = Palette(m);
-    let mut w = ColorschemeWriter::new(&palette);
+    let mut w = Colorscheme::new(&palette);
     w.term_colors = [
         "normal", "contrast", "normal", "contrast", "normal", "contrast", "normal", "contrast",
         "normal", "contrast", "normal", "contrast", "normal", "contrast", "normal", "contrast",
@@ -215,7 +215,7 @@ fn test_write_term_colors() {
 #[test]
 fn test_colorscheme_writer() {
     let palette = Palette::default();
-    let w = ColorschemeWriter::new(&palette);
+    let w = Colorscheme::new(&palette);
 
     // Check duplicate highlights
     let mut unique_check = HashSet::new();
@@ -280,7 +280,7 @@ fn test_write_airline_theme() {
     );
 
     let palette = Palette(m);
-    let w = AirlineThemeWriter {
+    let w = AirlineTheme {
         palette: &palette,
         modes: {
             let mut m = HashMap::new();
@@ -408,7 +408,7 @@ fn test_write_alacritty_theme() {
     );
     let palette = Palette(m);
 
-    let w = AlacrittyThemeWriter {
+    let w = AlacrittyTheme {
         palette: &palette,
         background: "color1",
         dim: AlacrittyFgColors {