Skip to content

Commit 8d70284

Browse files
feat: remove Visual Studio Dark+ theme
1 parent 67c3c73 commit 8d70284

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ For reference here are the sizes associated with their different functions
8686
| ^^ (fancy) | 937 | ^^ |
8787
| [`syntax::extra_no_newlines()`](https://docs.rs/two-face/latest/two_face/syntax/fn.extra_no_newlines.html) (onig) | 959 | 359 |
8888
| ^^ (fancy) | 935 | ^^ |
89-
| [`theme::extra()`](https://docs.rs/two-face/latest/two_face/theme/index.html) | 62 | 5 |
89+
| [`theme::extra()`](https://docs.rs/two-face/latest/two_face/theme/index.html) | 61 | 5 |
9090

9191
In short the syntax definitions are the real chonky part, and if you're
9292
switching from `syntect` to `two-face`, then you can expect a ~0.5MiB increase
@@ -151,7 +151,6 @@ only make sense situationally, so you'll likely want to only expose a subset
151151
| O | One Half (light/dark) |
152152
| S | Solarized (light/dark)†, Sublime Snazzy |
153153
| T | TwoDark |
154-
| V | Visual Studio Dark+ |
155154
| Z | Zenburn |
156155

157156
## Legal

generated/themes.bin

-1.1 KB
Binary file not shown.

src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
//! | ^^ (fancy) | 937 | ^^ |
8383
//! | [`syntax::extra_no_newlines()`] (onig) | 959 | 359 |
8484
//! | ^^ (fancy) | 935 | ^^ |
85-
//! | [`theme::extra()`] | 62 | 5 |
85+
//! | [`theme::extra()`] | 61 | 5 |
8686
//!
8787
//! In short the syntax definitions are the real chonky part, and if you're
8888
//! switching from `syntect` to `two-face`, then you can expect a ~0.5MiB increase
@@ -147,7 +147,6 @@
147147
//! | O | One Half (light/dark) |
148148
//! | S | Solarized (light/dark)†, Sublime Snazzy |
149149
//! | T | TwoDark |
150-
//! | V | Visual Studio Dark+ |
151150
//! | Z | Zenburn |
152151
//!
153152
//! ## Legal

src/theme/mod.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,12 +485,7 @@ mod tests {
485485
let _ = theme_set.get(theme_name);
486486
}
487487

488-
// ignoring `Visual Studio Dark+` as it will be removed later
489-
const NUM_IGNORED: usize = 1;
490-
assert_eq!(
491-
theme_set.0.themes.len() - NUM_IGNORED,
492-
EmbeddedThemeName::iter().len()
493-
);
488+
assert_eq!(theme_set.0.themes.len(), EmbeddedThemeName::iter().len());
494489
assert_eq!(
495490
EmbeddedLazyThemeSet::theme_names().len(),
496491
EmbeddedThemeName::iter().len()

tests/docs_watchdog/readme.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ fn embedded_asset_sizes() {
3636

3737
insta::assert_snapshot!(
3838
table,
39-
@r"
39+
@"
4040
| function | `two-face` (KiB) | `syntect` (KiB) |
4141
| ---: | ---: | ---: |
4242
| [`acknowledgement::listing()`] | 11 | - |
4343
| [`syntax::extra_newlines()`] (onig) | 961 | 360 |
4444
| ^^ (fancy) | 937 | ^^ |
4545
| [`syntax::extra_no_newlines()`] (onig) | 959 | 359 |
4646
| ^^ (fancy) | 935 | ^^ |
47-
| [`theme::extra()`] | 62 | 5 |
47+
| [`theme::extra()`] | 61 | 5 |
4848
"
4949
);
5050
}

xtask/src/gen/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@ impl AssetsDir {
149149
let mut full_set = ThemeSet::load_defaults();
150150
full_set.themes.append(&mut theme_set.themes);
151151

152+
// TODO(cosmic): remove vs-dark+ here until it's gone upstream too
153+
if full_set.themes.remove("Visual Studio Dark+").is_none() {
154+
log::warn!("visual studio dark+ not found. this code can be removed now");
155+
}
156+
152157
let lazy_theme_set = LazyThemeSet::from(&full_set);
153158
Ok(lazy_theme_set)
154159
}

0 commit comments

Comments
 (0)