Skip to content

Use cross platform escape codes #9

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

Open
JesterOrNot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use cross platform escape codes #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 25 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,23 @@ macro_rules! gen_lexer {
macro_rules! gen_parse {
($enumName:ident, $funcName:ident, $(($token:ident, $ansi:expr)), *) => {
use logos::{Logos, Lexer};
let mut CSI = "";
if cfg!(not(target_os = "linux")) {
CSI = "$([char]27)";
} else {
CSI = r"\x1b";
}
fn $funcName(mut tokens: Lexer<$enumName>) {
let mut CSI = "";
if cfg!(target_os = "windows") {
CSI = "$([char]27)";
} else {
CSI = r"\x1b";
}
while let Some(token) = tokens.next() {
match token {
$(
$enumName::$token => print!("\x1b[{}m{}\x1b[m", $ansi, tokens.slice()),
$enumName::$token => print!("{}[{}m{}{}[m", CSI, $ansi, tokens.slice(), CSI),
)*
_ => print!("{}", tokens.slice())
}
Expand Down Expand Up @@ -159,6 +171,12 @@ pub trait CommandLineTool {

/// Starts the REPL
fn repl(&self) {
let mut CSI = "";
if cfg!(target_os = "windows") {
CSI = "$([char]27)";
} else {
CSI = r"\x1b";
}
let mut cursor_position = 0;
let mut file = OpenOptions::new()
.create(true)
Expand All @@ -171,12 +189,14 @@ pub trait CommandLineTool {
loop {
enable_raw_mode().unwrap();
// Move to the left, clear line, print prompt
print!("\x1b[1000D\x1b[0K{}\x1b[m", Self::PROMPT);
print!("{}[1000D{}[0K{}{}[m", CSI, CSI, Self::PROMPT, CSI);
// Print buffer
Self::syntax_highlight(&buffer);
// Move to the left and move to the right cursor position
print!(
"\x1b[1000D\x1b[{}C",
"{}[1000D{}[{}C",
CSI,
CSI,
cursor_position + calculate_whitespace(Self::PROMPT)
);
stdout().flush().unwrap();
Expand Down Expand Up @@ -223,9 +243,9 @@ pub trait CommandLineTool {
} else {
position = lines_from_file(Self::HISTORY_FILE_PATH).count();
}
print!("\x1b[1000D\x1b[0K{}", Self::PROMPT);
print!("{}[1000D{}[0K{}", CSI, CSI, Self::PROMPT);
buffer = Self::get_hist(position);
print!("\x1b[1000D");
print!("{}[1000D", CSI);
cursor_position = buffer.len();
}
KeyCode::Down => {
Expand Down