mirror of
https://github.com/rust-lang/rustlings.git
synced 2024-12-26 15:26:29 +00:00
Only disable links in VS code in the list
This commit is contained in:
parent
5556d42b46
commit
cba4a6f9c8
3 changed files with 18 additions and 12 deletions
|
@ -1,5 +1,6 @@
|
||||||
use anyhow::{bail, Context, Error, Result};
|
use anyhow::{bail, Context, Error, Result};
|
||||||
use std::{
|
use std::{
|
||||||
|
env,
|
||||||
fs::{self, File},
|
fs::{self, File},
|
||||||
io::{Read, StdoutLock, Write},
|
io::{Read, StdoutLock, Write},
|
||||||
path::Path,
|
path::Path,
|
||||||
|
@ -44,6 +45,8 @@ pub struct AppState {
|
||||||
file_buf: Vec<u8>,
|
file_buf: Vec<u8>,
|
||||||
official_exercises: bool,
|
official_exercises: bool,
|
||||||
cmd_runner: CmdRunner,
|
cmd_runner: CmdRunner,
|
||||||
|
// Running in VS Code.
|
||||||
|
vs_code: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppState {
|
impl AppState {
|
||||||
|
@ -131,6 +134,7 @@ impl AppState {
|
||||||
file_buf: Vec::with_capacity(2048),
|
file_buf: Vec::with_capacity(2048),
|
||||||
official_exercises: !Path::new("info.toml").exists(),
|
official_exercises: !Path::new("info.toml").exists(),
|
||||||
cmd_runner,
|
cmd_runner,
|
||||||
|
vs_code: env::var_os("TERM_PROGRAM").is_some_and(|v| v == "vscode"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let state_file_status = slf.update_from_file();
|
let state_file_status = slf.update_from_file();
|
||||||
|
@ -163,6 +167,11 @@ impl AppState {
|
||||||
&self.cmd_runner
|
&self.cmd_runner
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub fn vs_code(&self) -> bool {
|
||||||
|
self.vs_code
|
||||||
|
}
|
||||||
|
|
||||||
// Write the state file.
|
// Write the state file.
|
||||||
// The file's format is very simple:
|
// The file's format is very simple:
|
||||||
// - The first line is a comment.
|
// - The first line is a comment.
|
||||||
|
@ -457,6 +466,7 @@ mod tests {
|
||||||
file_buf: Vec::new(),
|
file_buf: Vec::new(),
|
||||||
official_exercises: true,
|
official_exercises: true,
|
||||||
cmd_runner: CmdRunner::build().unwrap(),
|
cmd_runner: CmdRunner::build().unwrap(),
|
||||||
|
vs_code: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut assert = |done: [bool; 3], expected: [Option<usize>; 3]| {
|
let mut assert = |done: [bool; 3], expected: [Option<usize>; 3]| {
|
||||||
|
|
|
@ -163,7 +163,13 @@ impl<'a> ListState<'a> {
|
||||||
writer.write_str(exercise.name)?;
|
writer.write_str(exercise.name)?;
|
||||||
writer.write_ascii(&self.name_col_padding[exercise.name.len()..])?;
|
writer.write_ascii(&self.name_col_padding[exercise.name.len()..])?;
|
||||||
|
|
||||||
terminal_file_link(&mut writer, exercise.path, Color::Blue)?;
|
// The list links aren't shown correctly in VS Code on Windows.
|
||||||
|
// But VS Code shows its own links anyway.
|
||||||
|
if self.app_state.vs_code() {
|
||||||
|
writer.write_str(exercise.path)?;
|
||||||
|
} else {
|
||||||
|
terminal_file_link(&mut writer, exercise.path, Color::Blue)?;
|
||||||
|
}
|
||||||
|
|
||||||
next_ln(stdout)?;
|
next_ln(stdout)?;
|
||||||
stdout.queue(ResetColor)?;
|
stdout.queue(ResetColor)?;
|
||||||
|
|
12
src/term.rs
12
src/term.rs
|
@ -1,6 +1,5 @@
|
||||||
use std::{
|
use std::{
|
||||||
cell::Cell,
|
fmt, fs,
|
||||||
env, fmt, fs,
|
|
||||||
io::{self, BufRead, StdoutLock, Write},
|
io::{self, BufRead, StdoutLock, Write},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -11,10 +10,6 @@ use crossterm::{
|
||||||
Command, QueueableCommand,
|
Command, QueueableCommand,
|
||||||
};
|
};
|
||||||
|
|
||||||
thread_local! {
|
|
||||||
static VS_CODE: Cell<bool> = Cell::new(env::var_os("TERM_PROGRAM").is_some_and(|v| v == "vscode"));
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct MaxLenWriter<'a, 'b> {
|
pub struct MaxLenWriter<'a, 'b> {
|
||||||
pub stdout: &'a mut StdoutLock<'b>,
|
pub stdout: &'a mut StdoutLock<'b>,
|
||||||
len: usize,
|
len: usize,
|
||||||
|
@ -161,11 +156,6 @@ pub fn terminal_file_link<'a>(
|
||||||
path: &str,
|
path: &str,
|
||||||
color: Color,
|
color: Color,
|
||||||
) -> io::Result<()> {
|
) -> io::Result<()> {
|
||||||
// VS Code shows its own links. This also avoids some issues, especially on Windows.
|
|
||||||
if VS_CODE.get() {
|
|
||||||
return writer.write_str(path);
|
|
||||||
}
|
|
||||||
|
|
||||||
let canonical_path = fs::canonicalize(path).ok();
|
let canonical_path = fs::canonicalize(path).ok();
|
||||||
|
|
||||||
let Some(canonical_path) = canonical_path.as_deref().and_then(|p| p.to_str()) else {
|
let Some(canonical_path) = canonical_path.as_deref().and_then(|p| p.to_str()) else {
|
||||||
|
|
Loading…
Reference in a new issue