diff options
| author | Nayeem Rahman <nayeemrmn99@gmail.com> | 2024-07-23 19:39:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-23 19:39:14 +0100 |
| commit | a45a40533eb25c5a12df98189338320f8aa6dcc4 (patch) | |
| tree | 5cfa841deb39f933ace9336f76e1dce4d8c7d2ff /cli/lsp/analysis.rs | |
| parent | 9806064ac22680c732f64f990e672a58e946a58a (diff) | |
fix(lsp): rewrite import for 'infer return type' action (#24685)
Diffstat (limited to 'cli/lsp/analysis.rs')
| -rw-r--r-- | cli/lsp/analysis.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs index 8480f6e1d..a6a69cbf0 100644 --- a/cli/lsp/analysis.rs +++ b/cli/lsp/analysis.rs @@ -73,8 +73,9 @@ static PREFERRED_FIXES: Lazy<HashMap<&'static str, (u32, bool)>> = .collect() }); -static IMPORT_SPECIFIER_RE: Lazy<Regex> = - lazy_regex::lazy_regex!(r#"\sfrom\s+["']([^"']*)["']"#); +static IMPORT_SPECIFIER_RE: Lazy<Regex> = lazy_regex::lazy_regex!( + r#"\sfrom\s+["']([^"']*)["']|import\s*\(\s*["']([^"']*)["']\s*\)"# +); const SUPPORTED_EXTENSIONS: &[&str] = &[ ".ts", ".tsx", ".js", ".jsx", ".mjs", ".mts", ".cjs", ".cts", ".d.ts", @@ -528,7 +529,8 @@ pub fn fix_ts_import_changes( .map(|line| { // This assumes that there's only one import per line. if let Some(captures) = IMPORT_SPECIFIER_RE.captures(line) { - let specifier = captures.get(1).unwrap().as_str(); + let specifier = + captures.iter().skip(1).find_map(|s| s).unwrap().as_str(); if let Some(new_specifier) = import_mapper.check_unresolved_specifier(specifier, referrer) { |