Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(create-farm): fix terminal color display #1986

Merged
merged 9 commits into from
Dec 9, 2024
Merged

fix(create-farm): fix terminal color display #1986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f058290
Fixed the issue where the terminal color was displayed abnormally whe…
iwen-conf Dec 6, 2024
ffe224b
delete test-project
iwen-conf Dec 6, 2024
cc16d0f
update Changeset info
iwen-conf Dec 6, 2024
281046e
删除了误添加的东西
iwen-conf Dec 7, 2024
b88c920
recover original style
iwen-conf Dec 7, 2024
991b9f1
修改了 minor为patch
iwen-conf Dec 7, 2024
c69a176
Trigger CI rebuild
iwen-conf Dec 7, 2024
080716f
Merge branch 'main' into fix-terminal-color
ErKeLost Dec 9, 2024
c15e9d7
Merge branch 'main' into fix-terminal-color
fu050409 Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/chilly-carrots-lick.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"create-farm": patch
---

Better support and compatibility for ansi color output
94 changes: 47 additions & 47 deletions crates/create-farm-rs/src/template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ impl ElectronSubTemplate {
impl Displayable for ElectronSubTemplate {
fn display_text(&self) -> &'static str {
match self {
ElectronSubTemplate::React => "\x1b[36mReact - (https://reactjs.org/)\x1b[39m",
ElectronSubTemplate::Vue => "\x1b[32mVue - (https://vuejs.org/)\x1b[39m",
ElectronSubTemplate::Svelte => "\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[39m",
ElectronSubTemplate::Vanilla => "\x1b[33mVanilla\x1b[39m",
ElectronSubTemplate::Solid => "\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[39m",
ElectronSubTemplate::Preact => "\x1b[36mPreact - (https://preactjs.com/)\x1b[36m",
ElectronSubTemplate::React => "\x1b[36mReact - (https://reactjs.org/)\x1b[0m",
ElectronSubTemplate::Vue => "\x1b[32mVue - (https://vuejs.org/)\x1b[0m",
ElectronSubTemplate::Svelte => "\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[0m",
ElectronSubTemplate::Vanilla => "\x1b[33mVanilla\x1b[0m",
ElectronSubTemplate::Solid => "\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[0m",
ElectronSubTemplate::Preact => "\x1b[36mPreact - (https://preactjs.com/)\x1b[0m",
}
}
}
Expand Down Expand Up @@ -106,12 +106,12 @@ impl TauriSubTemplate {
impl Displayable for TauriSubTemplate {
fn display_text(&self) -> &'static str {
match self {
TauriSubTemplate::React => "\x1b[36mReact - (https://react.dev/)\x1b[39m",
TauriSubTemplate::Vue => "\x1b[32mVue - (https://vuejs.org/)\x1b[39m",
TauriSubTemplate::Svelte => "\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[39m",
TauriSubTemplate::Vanilla => "\x1b[33mVanilla\x1b[39m",
TauriSubTemplate::Solid => "\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[39m",
TauriSubTemplate::Preact => "\x1b[36mPreact - (https://preactjs.com/)\x1b[36m",
TauriSubTemplate::React => "\x1b[36mReact - (https://react.dev/)\x1b[0m",
TauriSubTemplate::Vue => "\x1b[32mVue - (https://vuejs.org/)\x1b[0m",
TauriSubTemplate::Svelte => "\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[0m",
TauriSubTemplate::Vanilla => "\x1b[33mVanilla\x1b[0m",
TauriSubTemplate::Solid => "\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[0m",
TauriSubTemplate::Preact => "\x1b[36mPreact - (https://preactjs.com/)\x1b[0m",
}
}
}
Expand Down Expand Up @@ -214,35 +214,35 @@ impl FromStr for Template {
impl Displayable for Template {
fn display_text(&self) -> &'static str {
match self {
Template::Vanilla => "\x1b[33mVanilla\x1b[39m",
Template::React => "\x1b[36mReact - (https://react.dev/)\x1b[39m",
Template::Vue3 => "\x1b[32mVue3 - (https://vuejs.org/)\x1b[39m",
Template::Vue2 => "\x1b[32mVue2 - (https://v2.vuejs.org/)\x1b[39m",
Template::Solid => "\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[39m",
Template::Svelte => "\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[39m",
Template::Lit => "\x1b[33mLit - (https://lit.dev/)\x1b[39m",
Template::Preact => "\x1b[36mPreact - (https://preactjs.com/)\x1b[36m",
Template::Tauri(None) => "\x1b[38;2;255;137;54mTauri - (https://tauri.app/)\x1b[39m",
Template::Vanilla => "\x1b[33mVanilla\x1b[0m",
Template::React => "\x1b[36mReact - (https://react.dev/)\x1b[0m",
Template::Vue3 => "\x1b[32mVue3 - (https://vuejs.org/)\x1b[0m",
Template::Vue2 => "\x1b[32mVue2 - (https://v2.vuejs.org/)\x1b[0m",
Template::Solid => "\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[0m",
Template::Svelte => "\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[0m",
Template::Lit => "\x1b[33mLit - (https://lit.dev/)\x1b[0m",
Template::Preact => "\x1b[36mPreact - (https://preactjs.com/)\x1b[0m",
Template::Tauri(None) => "\x1b[38;2;255;137;54mTauri - (https://tauri.app/)\x1b[0m",
Template::Tauri(Some(sub_template)) => match sub_template {
TauriSubTemplate::React => "\x1b[38;2;255;215;0mTauri with React\x1b[39m",
TauriSubTemplate::Vue => "\x1b[38;2;255;215;0mTauri with Vue\x1b[39m",
TauriSubTemplate::Vanilla => "\x1b[38;2;255;215;0mTauri with Vanilla\x1b[39m",
TauriSubTemplate::Svelte => "\x1b[38;2;255;215;0mTauri with Svelte\x1b[39m",
TauriSubTemplate::Solid => "\x1b[38;2;255;215;0mTauri with Solid\x1b[39m",
TauriSubTemplate::Preact => "\x1b[38;2;255;215;0mTauri with Preact\x1b[39m",
TauriSubTemplate::React => "\x1b[38;2;255;215;0mTauri with React\x1b[0m",
TauriSubTemplate::Vue => "\x1b[38;2;255;215;0mTauri with Vue\x1b[0m",
TauriSubTemplate::Vanilla => "\x1b[38;2;255;215;0mTauri with Vanilla\x1b[0m",
TauriSubTemplate::Svelte => "\x1b[38;2;255;215;0mTauri with Svelte\x1b[0m",
TauriSubTemplate::Solid => "\x1b[38;2;255;215;0mTauri with Solid\x1b[0m",
TauriSubTemplate::Preact => "\x1b[38;2;255;215;0mTauri with Preact\x1b[0m",
},
Template::Electron(None) => {
"\x1b[38;2;255;215;0mElectron - (https://www.electronjs.org/)\x1b[39m"
"\x1b[38;2;255;215;0mElectron - (https://www.electronjs.org/)\x1b[0m"
}
Template::Electron(Some(sub_template)) => match sub_template {
ElectronSubTemplate::React => "\x1b[38;2;255;215;0mElectron with React\x1b[39m",
ElectronSubTemplate::Vue => "\x1b[38;2;255;215;0mElectron with Vue\x1b[39m",
ElectronSubTemplate::Vanilla => "\x1b[38;2;255;215;0mElectron with Vanilla\x1b[39m",
ElectronSubTemplate::Svelte => "\x1b[38;2;255;215;0mElectron with Svelte\x1b[39m",
ElectronSubTemplate::Solid => "\x1b[38;2;255;215;0mElectron with Solid\x1b[39m",
ElectronSubTemplate::Preact => "\x1b[38;2;255;215;0mElectron with Preact\x1b[39m",
ElectronSubTemplate::React => "\x1b[38;2;255;215;0mElectron with React\x1b[0m",
ElectronSubTemplate::Vue => "\x1b[38;2;255;215;0mElectron with Vue\x1b[0m",
ElectronSubTemplate::Vanilla => "\x1b[38;2;255;215;0mElectron with Vanilla\x1b[0m",
ElectronSubTemplate::Svelte => "\x1b[38;2;255;215;0mElectron with Svelte\x1b[0m",
ElectronSubTemplate::Solid => "\x1b[38;2;255;215;0mElectron with Solid\x1b[0m",
ElectronSubTemplate::Preact => "\x1b[38;2;255;215;0mElectron with Preact\x1b[0m",
},
Template::Nestjs => "\x1b[38;2;255;102;102mNestJS - (https://nestjs.com/)\x1b[39m",
Template::Nestjs => "\x1b[31mNestJS - (https://nestjs.com/)\x1b[0m",
}
}
}
Expand Down Expand Up @@ -391,34 +391,34 @@ where
if type_id == TypeId::of::<ElectronSubTemplate>() {
let electron_template: &ElectronSubTemplate = unsafe { transmute(template) };
match electron_template {
&ElectronSubTemplate::React => write!(f, "\x1b[36mReact - (https://react.dev/)\x1b[39m"),
&ElectronSubTemplate::Vue => write!(f, "\x1b[32mVue3 - (https://vuejs.org/)\x1b[39m"),
&ElectronSubTemplate::React => write!(f, "\x1b[36mReact - (https://react.dev/)\x1b[0m"),
&ElectronSubTemplate::Vue => write!(f, "\x1b[32mVue3 - (https://vuejs.org/)\x1b[0m"),
&ElectronSubTemplate::Svelte => write!(
f,
"\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[39m"
"\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[0m"
),
&ElectronSubTemplate::Vanilla => write!(f, "\x1b[33mVanilla\x1b[39m"),
&ElectronSubTemplate::Vanilla => write!(f, "\x1b[33mVanilla\x1b[0m"),
&ElectronSubTemplate::Solid => write!(
f,
"\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[39m"
"\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[0m"
),
&ElectronSubTemplate::Preact => write!(f, "\x1b[36mPreact - (https://preactjs.com/)\x1b[36m"),
&ElectronSubTemplate::Preact => write!(f, "\x1b[36mPreact - (https://preactjs.com/)\x1b[0m"),
}
} else if type_id == TypeId::of::<TauriSubTemplate>() {
let tauri_template: &TauriSubTemplate = unsafe { transmute(template) };
match tauri_template {
&TauriSubTemplate::React => write!(f, "\x1b[36mReact - (https://react.dev/)\x1b[39m"),
&TauriSubTemplate::Vue => write!(f, "\x1b[32mVue3 - (https://vuejs.org/)\x1b[39m"),
&TauriSubTemplate::React => write!(f, "\x1b[36mReact - (https://react.dev/)\x1b[0m"),
&TauriSubTemplate::Vue => write!(f, "\x1b[32mVue3 - (https://vuejs.org/)\x1b[0m"),
&TauriSubTemplate::Svelte => write!(
f,
"\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[39m"
"\x1b[38;2;255;137;54mSvelte - (https://svelte.dev/)\x1b[0m"
),
&TauriSubTemplate::Vanilla => write!(f, "\x1b[33mVanilla\x1b[39m"),
&TauriSubTemplate::Vanilla => write!(f, "\x1b[33mVanilla\x1b[0m"),
&TauriSubTemplate::Solid => write!(
f,
"\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[39m"
"\x1b[38;2;68;206;246mSolid - (https://solidjs.com/)\x1b[0m"
),
&TauriSubTemplate::Preact => write!(f, "\x1b[36mPreact - (https://preactjs.com/)\x1b[36m"),
&TauriSubTemplate::Preact => write!(f, "\x1b[36mPreact - (https://preactjs.com/)\x1b[0m"),
}
} else {
Err(std::fmt::Error)
Expand Down
23 changes: 17 additions & 6 deletions crates/create-farm-rs/src/utils/theme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl Default for ColorfulTheme {
values_style: Style::new().for_stderr().green(),
active_item_style: Style::new().for_stderr().cyan(),
inactive_item_style: Style::new().for_stderr(),
active_item_prefix: style("❯".to_string()).for_stderr().green(),
active_item_prefix: style("❯".to_string()).for_stderr().cyan(),
inactive_item_prefix: style(" ".to_string()).for_stderr(),
checked_item_prefix: style("✔".to_string()).for_stderr().green(),
unchecked_item_prefix: style("✔".to_string()).for_stderr().black(),
Expand Down Expand Up @@ -264,17 +264,28 @@ impl Theme for ColorfulTheme {
if active {
write!(
f,
"{} {}{}",
"{} {}",
self.active_item_prefix,
self.active_item_style.apply_to(text),
self.hint_style.apply_to(desc),
self.active_item_style.apply_to(&format!("{}{}",
text.trim(),
if !desc.is_empty() {
format!(" - {}", desc.trim())
} else {
String::new()
}
))
)
} else {
write!(
f,
"{} {}",
"{} {}{}",
self.inactive_item_prefix,
self.inactive_item_style.apply_to(text),
self.inactive_item_style.apply_to(text.trim()),
if !desc.is_empty() {
format!(" - {}", self.hint_style.apply_to(desc.trim()))
} else {
String::new()
}
)
}
}
Expand Down
Loading