language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-10-02 23:24:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: make ParsedModule implement Sync (#11581)

Browse source
This commit is contained in:
David Sherret 2021-08-06 10:36:16 -04:00 • committed by GitHub
parent e9ddc7a41a
commit 466d3df9d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 436 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cli/tools/test_runner.rs
View file

@ -399,7 +399,7 @@ fn extract_files_from_regex_blocks(
let file_specifier = deno_core::resolve_url_or_path(&format!(
"{}${}-{}{}",
location.filename,
location.specifier,
location.line + line_offset,
location.line + line_offset + line_count,
file_media_type.as_ts_extension(),
@ -425,10 +425,7 @@ fn extract_files_from_source_comments(
media_type: &MediaType,
) -> Result<Vec<File>, AnyError> {
let parsed_module = ast::parse(specifier.as_str(), source, media_type)?;
let mut comments = parsed_module.get_comments();
comments
.sort_by_key(|comment| parsed_module.get_location(&comment.span).line);
let comments = parsed_module.get_comments();
let blocks_regex = Regex::new(r"```([^\n]*)\n([\S\s]*?)```")?;
let lines_regex = Regex::new(r"(?:\* ?)(?:\# ?)?(.*)")?;
@ -442,7 +439,7 @@ fn extract_files_from_source_comments(
true
})
.flat_map(|comment| {
let location = parsed_module.get_location(&comment.span);
let location = parsed_module.get_location(comment.span.lo);
extract_files_from_regex_blocks(
&location,
@ -464,7 +461,7 @@ fn extract_files_from_fenced_blocks(
media_type: &MediaType,
) -> Result<Vec<File>, AnyError> {
let location = Location {
filename: specifier.to_string(),
specifier: specifier.to_string(),
line: 1,
col: 0,
};