Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 54 additions & 0 deletions cli/src/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,28 @@ impl<'a> DiagnosticRenderer<'a> {
.map(|r| serde_json::json!({ "severity": r.severity.label(), "message": r.message }))
.collect();

let suggestions_json: Vec<_> = diag
.suggestions
.iter()
.map(|s| {
serde_json::json!({
"message": s.message,
"replacement": s.replacement,
"span": {
"start": s.span.start,
"end": s.span.end,
}
})
})
.collect();

let obj = serde_json::json!({
"severity": diag.severity.label(),
"code": diag.code.map(|c| format!("{:?}", c)),
"message": diag.message,
"span": span_json,
"related": related_json,
"suggestions": suggestions_json,
});

obj.to_string()
Expand Down Expand Up @@ -480,3 +496,41 @@ impl DiagnosticStats {
.to_string()
}
}

#[cfg(test)]
mod tests {
use super::*;
use techscript_common::Span;

#[test]
fn test_fix_suggestion_rendering() {
let sm = SourceManager::new();
let diag =
RichDiagnostic::error("undefined variable `foo`").with_suggestion(FixSuggestion {
message: "change to `bar`".into(),
span: Span::new(0, 3),
replacement: "bar".into(),
});

// Plain output rendering
let renderer_plain = DiagnosticRenderer::new(DiagnosticOutput::Plain, &sm);
let rendered_plain = renderer_plain.render(&diag);
assert!(rendered_plain.contains("suggestion: change to `bar` → `bar`"));

// Colored output rendering
let renderer_colored = DiagnosticRenderer::new(DiagnosticOutput::Colored, &sm);
let rendered_colored = renderer_colored.render(&diag);
assert!(rendered_colored.contains("suggestion"));
assert!(rendered_colored.contains("change to `bar`"));
assert!(rendered_colored.contains("bar"));

// JSON output rendering
let renderer_json = DiagnosticRenderer::new(DiagnosticOutput::Json, &sm);
let json_str = renderer_json.render(&diag);
let parsed: serde_json::Value = serde_json::from_str(&json_str).unwrap();
assert_eq!(parsed["suggestions"][0]["message"], "change to `bar`");
assert_eq!(parsed["suggestions"][0]["replacement"], "bar");
assert_eq!(parsed["suggestions"][0]["span"]["start"], 0);
assert_eq!(parsed["suggestions"][0]["span"]["end"], 3);
}
}
4 changes: 2 additions & 2 deletions examples/threads/threads.txs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ spawn_fn = thread["spawn"]
join_fn = thread["join"]

do task_a()
time.sleep(100)
time.sleep(200)
say "Task A completed on worker thread."
end

do task_b()
time.sleep(50)
time.sleep(10)
say "Task B completed on worker thread."
end

Expand Down
1 change: 1 addition & 0 deletions stdlib/tests/stdlib_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ fn test_http_module() {
let response = "HTTP/1.1 200 OK\r\nContent-Length: 13\r\nContent-Type: text/plain\r\nConnection: close\r\n\r\nHello Server!";
let _ = stream.write_all(response.as_bytes());
let _ = stream.flush();
let _ = stream.shutdown(std::net::Shutdown::Both);
}
});

Expand Down
Loading