Skip to content

Commit 28fd961

Browse files
committed
[FIX] server: remove autocompletion items that are not in dependencies
1 parent fdc5c43 commit 28fd961

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

server/src/core/symbols/symbol.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,14 +1768,14 @@ impl Symbol {
17681768
let model_data = sym.as_class_sym()._model.as_ref();
17691769
if let Some(model_data) = model_data {
17701770
if let Some(model) = session.sync_odoo.models.get(&model_data.name).cloned() {
1771-
for model_sym in model.borrow().all_symbols(session, from_module.clone()) {
1772-
if !Rc::ptr_eq(symbol, &model_sym.0) {
1773-
for s in model_sym.0.borrow().all_symbols() {
1771+
for (model_sym, dependency) in model.borrow().all_symbols(session, from_module.clone()) {
1772+
if dependency.is_none() && !Rc::ptr_eq(symbol, &model_sym) {
1773+
for s in model_sym.borrow().all_symbols() {
17741774
let name = s.borrow().name().clone();
17751775
if let Some(vec) = result.get_mut(&name) {
1776-
vec.push((s, Some(model_sym.0.borrow().name().clone())));
1776+
vec.push((s, Some(model_sym.borrow().name().clone())));
17771777
} else {
1778-
result.insert(name.clone(), vec![(s, Some(model_sym.0.borrow().name().clone()))]);
1778+
result.insert(name.clone(), vec![(s, Some(model_sym.borrow().name().clone()))]);
17791779
}
17801780
}
17811781
}

server/src/threads.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ pub fn message_processor_thread_main(sync_odoo: Arc<Mutex<SyncOdoo>>, generic_re
304304
Message::Request(r) => {
305305
let (value, error) = match r.method.as_str() {
306306
Completion::METHOD => {
307-
//Handle completion in main because updates has to be done before the autocompletion
308-
//Moreover, autocompletion will trigger a process_rebuild if needed.
309307
to_value::<CompletionResponse>(Odoo::handle_autocomplete(&mut session, serde_json::from_value(r.params).unwrap()))
310308
},
311309
_ => {error!("Request not handled by main thread: {}", r.method); (None, Some(ResponseError{

0 commit comments

Comments
 (0)