[IMP] server: autocompletion take sections into account

Author: mmahrouss

server/src/core/symbols/symbol.rs

@@ -1234,6 +1234,18 @@ impl Symbol {
         }
     }
 
+    /// Return all symbols before the given position that are visible in the body of this symbol.
+    pub fn get_all_visible_symbols(&self, name_prefix: &String, position: u32) -> HashMap<OYarn, Vec<Rc<RefCell<Symbol>>>> {
+        match self {
+            Symbol::Class(c) => c.get_all_visible_symbols(name_prefix, position),
+            Symbol::File(f) => f.get_all_visible_symbols(name_prefix, position),
+            Symbol::Package(PackageSymbol::Module(m)) => m.get_all_visible_symbols(name_prefix, position),
+            Symbol::Package(PackageSymbol::PythonPackage(p)) => p.get_all_visible_symbols(name_prefix, position),
+            Symbol::Function(f) => f.get_all_visible_symbols(name_prefix, position),
+            _ => HashMap::new(),
+        }
+    }
+
     /**
      * Return a symbol that can be called from outside of the body of the symbol
      */
@@ -2100,17 +2112,18 @@ impl Symbol {
     /*
     Return all the symbols that are available at a given position or in a scope for a given start name
      */
-    pub fn get_all_inferred_names(on_symbol: &Rc<RefCell<Symbol>>, name: &String, position: Option<u32>) -> HashMap<OYarn, Vec<Rc<RefCell<Symbol>>>> {
+    pub fn get_all_inferred_names(on_symbol: &Rc<RefCell<Symbol>>, name: &String, position: u32) -> HashMap<OYarn, Vec<Rc<RefCell<Symbol>>>> {
         fn helper(
-            on_symbol: &Rc<RefCell<Symbol>>, name: &String, position: Option<u32>, acc: &mut HashMap<OYarn, Vec<Rc<RefCell<Symbol>>>>
+            on_symbol: &Rc<RefCell<Symbol>>, name: &String, position: u32, acc: &mut HashMap<OYarn, Vec<Rc<RefCell<Symbol>>>>
         ) {
             // Add symbols from files and functions
             if matches!(on_symbol.borrow().typ(), SymType::FILE | SymType::FUNCTION) {
-                on_symbol.borrow().all_symbols().filter(|sym|
-                    sym.borrow().name().starts_with(name) && (position.is_none() || !sym.borrow().has_range() || position.unwrap() > sym.borrow().range().end().to_u32())
-                ).for_each(| sym| {
-                    acc.entry(sym.borrow().name().clone()).or_default().push(sym.clone());
-                });
+                let symbols_map = on_symbol.borrow().get_all_visible_symbols(name, position);
+                for (sym_name, sym_vec) in symbols_map {
+                    acc.entry(sym_name)
+                        .or_default()
+                        .extend(sym_vec);
+                }
             }
             // Traverse upwards if we are under a class or a function
             if matches!(on_symbol.borrow().typ(), SymType::CLASS | SymType::FUNCTION) {

server/src/core/symbols/symbol_mgr.rs

@@ -37,6 +37,7 @@ pub trait SymbolMgr {
     fn get_ext_symbol(&self, name: OYarn) -> Option<&Vec<Rc<RefCell<Symbol>>>>;
     fn _init_symbol_mgr(&mut self);
     fn _get_loc_symbol(&self, map: &HashMap<u32, Vec<Rc<RefCell<Symbol>>>>, position: u32, index: &SectionIndex, acc: &mut HashSet<u32>) -> ContentSymbols;
+    fn get_all_visible_symbols(&self, name_prefix: &String, position: u32) -> HashMap<OYarn, Vec<Rc<RefCell<Symbol>>>>;
 }
 
 
@@ -156,6 +157,24 @@ macro_rules! impl_section_mgr_for {
             res
         }
 
+        fn get_all_visible_symbols(&self, name_prefix: &String, position: u32) -> HashMap<OYarn, Vec<Rc<RefCell<Symbol>>>> {
+            let mut result = HashMap::new();
+            let current_section = self.get_section_for(position);
+            let current_index = SectionIndex::INDEX(current_section.index);
+
+            for (name, section_map) in self.symbols.iter() {
+                if !name.starts_with(name_prefix) {
+                    continue;
+                }
+                let mut seen = HashSet::new();
+                let content = self._get_loc_symbol(section_map, position, &current_index, &mut seen);
+
+                if !content.symbols.is_empty() {
+                    result.insert(name.clone(), content.symbols);
+                }
+            }
+            result
+        }
     }
 )+)
 }

server/src/features/completion.rs

@@ -800,7 +800,7 @@ fn complete_name_expression(session: &mut SessionInfo, file: &Rc<RefCell<Symbol>
 
 fn complete_name(session: &mut SessionInfo, file: &Rc<RefCell<Symbol>>, offset: usize, is_param: bool, name: &String) -> Option<CompletionResponse> {
     let scope = Symbol::get_scope_symbol(file.clone(), offset as u32, is_param);
-    let symbols = Symbol::get_all_inferred_names(&scope, name, Some(offset as u32));
+    let symbols = Symbol::get_all_inferred_names(&scope, name, offset as u32);
     Some(CompletionResponse::List(CompletionList {
         is_incomplete: false,
         items: symbols.into_iter().map(|(_symbol_name, symbols)| {