Skip to content

refactor(linter): extract SourceTextCache to deduplicate source text lookups in tsgolint #16342

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
graphite-app merged 1 commit into from
Dec 1, 2025
Merged

refactor(linter): extract SourceTextCache to deduplicate source text lookups in tsgolint #16342

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
39 changes: 16 additions & 23 deletions crates/oxc_linter/src/tsgolint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,21 @@ impl TsGoLintState {
let cwd_clone = self.cwd.clone();

let stdout_handler = std::thread::spawn(move || -> Result<(), String> {
struct SourceTextCache(FxHashMap<PathBuf, String>);
impl SourceTextCache {
fn get_or_insert(&mut self, path: &Path) -> &str {
self.0
.entry(path.to_path_buf())
.or_insert_with(|| read_to_string(path).unwrap_or_default())
.as_str()
}
}

let disable_directives_map =
disable_directives_map.lock().expect("disable_directives_map mutex poisoned");
let msg_iter = TsGoLintMessageStream::new(stdout);

let mut source_text_map: FxHashMap<PathBuf, String> = FxHashMap::default();
let mut source_text_map = SourceTextCache(FxHashMap::default());

for msg in msg_iter {
match msg {
Expand Down Expand Up @@ -181,24 +191,15 @@ impl TsGoLintState {
);

let source_text: &str = if self.silent {
// The source text is not needed in silent mode.
// The source text is only here to wrap the line before and after into a nice `oxc_diagnostic` Error
// The source text is not needed in silent mode, the diagnostic isn't printed.
""
} else if let Some(source_text) = source_text_map.get(&path) {
source_text.as_str()
} else {
let source_text =
read_to_string(&path).unwrap_or_else(|_| String::new());
// Insert and get a reference to the inserted string
let entry = source_text_map
.entry(path.clone())
.or_insert(source_text);
entry.as_str()
source_text_map.get_or_insert(&path)
};

let diagnostics = DiagnosticService::wrap_diagnostics(
cwd_clone.clone(),
path.clone(),
path,
source_text,
vec![oxc_diagnostic],
);
Expand All @@ -212,18 +213,10 @@ impl TsGoLintState {

let diagnostics = if let Some(file_path) = e.file_path {
let source_text: &str = if self.silent {
// The source text is not needed in silent mode, the diagnostic isn't printed.
""
} else if let Some(source_text) =
source_text_map.get(&file_path)
{
source_text.as_str()
} else {
let source_text = read_to_string(&file_path)
.unwrap_or_else(|_| String::new());
let entry = source_text_map
.entry(file_path.clone())
.or_insert(source_text);
entry.as_str()
source_text_map.get_or_insert(&file_path)
};

DiagnosticService::wrap_diagnostics(
Expand Down
Loading