Skip to content

Commit 3c8d3a7

Browse files
committed
fix(lang-server): improve logging in failure case for tsgolint (#15299)
1 parent 7763029 commit 3c8d3a7

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

crates/oxc_linter/src/lint_runner.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ use crate::{
1515
};
1616

1717
#[cfg(feature = "language_server")]
18-
use crate::Message;
18+
use crate::{Message, PossibleFixes};
19+
#[cfg(feature = "language_server")]
20+
use oxc_diagnostics::OxcDiagnostic;
1921

2022
/// Unified runner that orchestrates both regular (oxc) and type-aware (tsgolint) linting
2123
/// with centralized disable directives handling.
@@ -243,11 +245,21 @@ impl LintRunner {
243245

244246
let mut messages = self.lint_service.run_source();
245247

246-
if let Some(type_aware_linter) = &self.type_aware_linter
247-
&& let Ok(tso_messages) =
248-
type_aware_linter.lint_source(file, source_text, self.directives_store.map())
249-
{
250-
messages.extend(tso_messages);
248+
if let Some(type_aware_linter) = &self.type_aware_linter {
249+
let tsgo_messages =
250+
match type_aware_linter.lint_source(file, source_text, self.directives_store.map())
251+
{
252+
Ok(msgs) => msgs,
253+
Err(err) => {
254+
vec![Message::new(
255+
OxcDiagnostic::warn(format!(
256+
"Failed to run type-aware linting: `{err}`",
257+
)),
258+
PossibleFixes::None,
259+
)]
260+
}
261+
};
262+
messages.extend(tsgo_messages);
251263
}
252264

253265
messages

0 commit comments

Comments
 (0)