language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-15 23:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove mdcat dependency (#2959)

Browse source
This commit is contained in:
Charlie Marsh 2023-02-16 12:09:37 -05:00 • committed by GitHub
parent fdcb78fd8c
commit 370c3a5daf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 850 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ruff_cli/src/commands/linter.rs
View file

@ -63,24 +63,6 @@ pub fn linter(format: HelpFormat) -> Result<()> {
output.push_str(&serde_json::to_string_pretty(&linters)?);
output.push('\n');
}
HelpFormat::Pretty => {
output.push_str(&format!("| {:>6} | {:<27} |\n", "Prefix", "Name"));
output.push_str(&format!("| {:>6} | {:<27} |\n", "------", "-".repeat(27)));
for linter in Linter::iter() {
let prefix = match linter.common_prefix() {
"" => linter
.upstream_categories()
.unwrap()
.iter()
.map(|UpstreamCategory(prefix, ..)| prefix.short_code())
.join("/"),
prefix => prefix.to_string(),
};
output.push_str(&format!("| {:>6} | {:<27} |\n", prefix, linter.name()));
}
}
}
write!(stdout, "{output}")?;

37
crates/ruff_cli/src/commands/rule.rs
View file

@ -1,12 +1,7 @@
use std::io::{self, BufWriter, Write};
use anyhow::Result;
use colored::control::SHOULD_COLORIZE;
use mdcat::terminal::{TerminalProgram, TerminalSize};
use mdcat::{Environment, ResourceAccess, Settings};
use pulldown_cmark::{Options, Parser};
use serde::Serialize;
use syntect::parsing::SyntaxSet;
use ruff::registry::{Linter, Rule, RuleNamespace};
use ruff::AutofixAvailability;
@ -27,7 +22,7 @@ pub fn rule(rule: &Rule, format: HelpFormat) -> Result<()> {
let mut output = String::new();
match format {
HelpFormat::Text | HelpFormat::Pretty => {
HelpFormat::Text => {
output.push_str(&format!("# {} ({})", rule.as_ref(), rule.noqa_code()));
output.push('\n');
output.push('\n');
@ -65,35 +60,7 @@ pub fn rule(rule: &Rule, format: HelpFormat) -> Result<()> {
}
};
match format {
HelpFormat::Json | HelpFormat::Text => {
writeln!(stdout, "{output}")?;
}
HelpFormat::Pretty => {
let parser = Parser::new_ext(
&output,
Options::ENABLE_TASKLISTS | Options::ENABLE_STRIKETHROUGH,
);
let cwd = std::env::current_dir()?;
let env = &Environment::for_local_directory(&cwd)?;
let terminal = if SHOULD_COLORIZE.should_colorize() {
TerminalProgram::detect()
} else {
TerminalProgram::Dumb
};
let settings = &Settings {
resource_access: ResourceAccess::LocalOnly,
syntax_set: SyntaxSet::load_defaults_newlines(),
terminal_capabilities: terminal.capabilities(),
terminal_size: TerminalSize::detect().unwrap_or_default(),
};
mdcat::push_tty(settings, env, &mut stdout, parser)?;
}
};
writeln!(stdout, "{output}")?;
Ok(())
}