Skip to content

refactor(tsgolint): remove always Some option wrapper #14296

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

Merged
merged 1 commit into from
Oct 2, 2025
Merged

refactor(tsgolint): remove always Some option wrapper #14296

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
28 changes: 8 additions & 20 deletions crates/oxc_linter/src/tsgolint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ impl TsGoLintState {
while cursor.position() < buffer.len() as u64 {
let start_pos = cursor.position();
match parse_single_message(&mut cursor) {
Ok(Some(TsGoLintMessage::Error(err))) => {
Ok(TsGoLintMessage::Error(err)) => {
return Err(err.error);
}
Ok(Some(TsGoLintMessage::Diagnostic(tsgolint_diagnostic))) => {
Ok(TsGoLintMessage::Diagnostic(tsgolint_diagnostic)) => {
processed_up_to = cursor.position();

let path = tsgolint_diagnostic.file_path.clone();
Expand Down Expand Up @@ -219,10 +219,6 @@ impl TsGoLintState {
return Ok(());
}
}
Ok(None) => {
// Successfully parsed but no diagnostic to add
processed_up_to = cursor.position();
}
Err(_) => {
// Could not parse a complete message, break and keep remaining data
cursor.set_position(start_pos);
Expand Down Expand Up @@ -351,12 +347,10 @@ impl TsGoLintState {
while cursor.position() < buffer.len() as u64 {
let start_pos = cursor.position();
match parse_single_message(&mut cursor) {
Ok(Some(TsGoLintMessage::Error(err))) => {
Ok(TsGoLintMessage::Error(err)) => {
return Err(err.error);
}
Ok(Some(TsGoLintMessage::Diagnostic(
tsgolint_diagnostic,
))) => {
Ok(TsGoLintMessage::Diagnostic(tsgolint_diagnostic)) => {
processed_up_to = cursor.position();

let path = tsgolint_diagnostic.file_path.clone();
Expand Down Expand Up @@ -400,10 +394,6 @@ impl TsGoLintState {

result.push(message_with_position);
}
Ok(None) => {
// Successfully parsed but no diagnostic to add
processed_up_to = cursor.position();
}
Err(_) => {
// Could not parse a complete message, break and keep remaining data
cursor.set_position(start_pos);
Expand Down Expand Up @@ -701,9 +691,7 @@ impl MessageType {
/// Parses a single message from the binary tsgolint output.
// Messages are encoded as follows:
// | Payload Size (uint32 LE) - 4 bytes | Message Type (uint8) - 1 byte | Payload |
fn parse_single_message(
cursor: &mut std::io::Cursor<&[u8]>,
) -> Result<Option<TsGoLintMessage>, String> {
fn parse_single_message(cursor: &mut std::io::Cursor<&[u8]>) -> Result<TsGoLintMessage, String> {
let mut size_bytes = [0u8; 4];
if cursor.read_exact(&mut size_bytes).is_err() {
return Err("Failed to read size bytes".to_string());
Expand All @@ -728,21 +716,21 @@ fn parse_single_message(
let error_payload = serde_json::from_str::<TsGoLintErrorPayload>(&payload_str)
.map_err(|e| format!("Failed to parse tsgolint error payload: {e}"))?;

Ok(Some(TsGoLintMessage::Error(TsGoLintError { error: error_payload.error })))
Ok(TsGoLintMessage::Error(TsGoLintError { error: error_payload.error }))
}
MessageType::Diagnostic => {
let diagnostic_payload =
serde_json::from_str::<TsGoLintDiagnosticPayload>(&payload_str)
.map_err(|e| format!("Failed to parse tsgolint diagnostic payload: {e}"))?;

Ok(Some(TsGoLintMessage::Diagnostic(TsGoLintDiagnostic {
Ok(TsGoLintMessage::Diagnostic(TsGoLintDiagnostic {
range: diagnostic_payload.range,
rule: diagnostic_payload.rule,
message: diagnostic_payload.message,
fixes: diagnostic_payload.fixes,
suggestions: diagnostic_payload.suggestions,
file_path: diagnostic_payload.file_path,
})))
}))
}
}
}
Expand Down
Loading