diff options
Diffstat (limited to 'cli/tools/doc.rs')
| -rw-r--r-- | cli/tools/doc.rs | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs index 5e9f32a8f..7a51f6356 100644 --- a/cli/tools/doc.rs +++ b/cli/tools/doc.rs @@ -11,8 +11,8 @@ use crate::factory::CliFactory; use crate::graph_util::graph_lock_or_exit; use crate::tsc::get_types_declaration_file_text; use crate::util::fs::collect_specifiers; -use crate::util::glob::FilePatterns; -use crate::util::glob::PathOrPatternSet; +use deno_config::glob::FilePatterns; +use deno_config::glob::PathOrPatternSet; use deno_core::anyhow::bail; use deno_core::anyhow::Context; use deno_core::error::AnyError; @@ -25,7 +25,6 @@ use deno_graph::ModuleSpecifier; use doc::DocDiagnostic; use indexmap::IndexMap; use std::collections::BTreeMap; -use std::path::PathBuf; use std::rc::Rc; async fn generate_doc_nodes_for_builtin_types( @@ -94,21 +93,9 @@ pub async fn doc(flags: Flags, doc_flags: DocFlags) -> Result<(), AnyError> { let module_specifiers = collect_specifiers( FilePatterns { - include: Some(PathOrPatternSet::from_absolute_paths( - source_files - .iter() - .map(|p| { - if p.starts_with("https:") - || p.starts_with("http:") - || p.starts_with("file:") - { - // todo(dsherret): don't store URLs in PathBufs - PathBuf::from(p) - } else { - cli_options.initial_cwd().join(p) - } - }) - .collect(), + include: Some(PathOrPatternSet::from_relative_path_or_patterns( + cli_options.initial_cwd(), + source_files, )?), exclude: Default::default(), }, |