Skip to content

Commit fadcd83

Browse files
fda-odoofda-odoo
committed
[IMP] server: bump dependencies to last version
1 parent 56ecebc commit fadcd83

File tree

5 files changed

+44
-28
lines changed

5 files changed

+44
-28
lines changed

‎server/Cargo.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@ license = "../LICENSE"
1010
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1111

1212
[dependencies]
13-
anyhow = "1.0.79"
14-
clap = { version = "4.5.4", features = ["derive"] }
15-
glob = "0.3.1"
16-
regex = "1.10.3"
13+
anyhow = "1.0.98"
14+
clap = { version = "4.5.43", features = ["derive"] }
15+
glob = "0.3.2"
16+
regex = "1.11.1"
1717
ropey = "1.6.1"
18-
ruff_python_ast = { git = "https://github.com/astral-sh/ruff", tag = "0.11.4", version = "0.0.0" }
19-
ruff_python_parser = { git = "https://github.com/astral-sh/ruff", tag = "0.11.4", version = "0.0.0" }
20-
ruff_text_size = { git = "https://github.com/astral-sh/ruff", tag = "0.11.4", version = "0.0.0" }
21-
lsp-server = { git = "https://github.com/rust-lang/rust-analyzer", tag = "2024-06-17", version = "0.7.6" }
22-
serde = "1.0.195"
23-
serde_json = "1.0.111"
24-
url = "2.5.0"
18+
ruff_python_ast = { git = "https://github.com/astral-sh/ruff", tag = "0.12.7", version = "0.0.0" }
19+
ruff_python_parser = { git = "https://github.com/astral-sh/ruff", tag = "0.12.7", version = "0.0.0" }
20+
ruff_text_size = { git = "https://github.com/astral-sh/ruff", tag = "0.12.7", version = "0.0.0" }
21+
lsp-server = { git = "https://github.com/rust-lang/rust-analyzer", tag = "2025-08-04", version = "0.7.6" }
22+
serde = "1.0.219"
23+
serde_json = "1.0.142"
24+
url = "2.5.4"
2525
weak-table = "0.3.2"
2626
lsp-types = "0.97.0"
27-
crossbeam-channel = "0.5.13"
27+
crossbeam-channel = "0.5.15"
2828
path-slash = "0.2.1"
29-
tracing = "0.1.40"
30-
tracing-subscriber = "0.3.18"
29+
tracing = "0.1.41"
30+
tracing-subscriber = "0.3.19"
3131
tracing-appender = "0.2.3"
3232
tracing-panic = "0.1.2"
3333
winapi = { version = "0.3.9", features = ["winbase", "processthreadsapi", "synchapi", "handleapi"] }
34-
ctrlc = "3.4.4"
35-
once_cell = "1.20.1"
34+
ctrlc = "3.4.7"
35+
once_cell = "1.21.3"
3636
itertools = "0.14.0"
3737
byteyarn = "0.5.1"
3838
roxmltree = "0.20.0"
3939
dirs = "5.0"
40-
toml = "0.8.22"
40+
toml = "0.8.23"
4141
# ittapi = "0.3" # profiling with VTune profiler
4242
[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
4343
nix = { version = "0.29.0", features = ["process"] }
@@ -47,8 +47,8 @@ name = "iai_profiler"
4747
harness = false
4848

4949
[dev-dependencies]
50-
iai-callgrind = "0.14.0"
51-
assert_fs = "1.0"
50+
iai-callgrind = "0.14.2"
51+
assert_fs = "1.1"
5252

5353
[features]
5454
default = []

‎server/src/core/import_resolver.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::cell::RefCell;
88
use std::path::{Path, PathBuf};
99

1010
use ruff_text_size::{TextRange, TextSize};
11-
use ruff_python_ast::{Alias, Identifier};
11+
use ruff_python_ast::{Alias, AtomicNodeIndex, Identifier};
1212
use crate::{constants::*, oyarn, Sy, S};
1313
use crate::core::diagnostics::{create_diagnostic, DiagnosticCode};
1414
use crate::threads::SessionInfo;
@@ -57,15 +57,16 @@ fn resolve_import_stmt_hook(alias: &Alias, from_symbol: &Option<Rc<RefCell<Symbo
5757
*/
5858
pub fn manual_import(session: &mut SessionInfo, source_file_symbol: &Rc<RefCell<Symbol>>, from_stmt:Option<String>, name: &str, asname: Option<String>, level: Option<u32>, diagnostics: &mut Option<&mut Vec<Diagnostic>>) -> Vec<ImportResult> {
5959
let name_aliases = vec![Alias {
60-
name: Identifier { id: Name::new(name), range: TextRange::new(TextSize::new(0), TextSize::new(0)) },
60+
name: Identifier { id: Name::new(name), range: TextRange::new(TextSize::new(0), TextSize::new(0)), node_index: AtomicNodeIndex::dummy() },
6161
asname: match asname {
62-
Some(asname_inner) => Some(Identifier { id: Name::new(asname_inner), range: TextRange::new(TextSize::new(0), TextSize::new(0)) }),
62+
Some(asname_inner) => Some(Identifier { id: Name::new(asname_inner), range: TextRange::new(TextSize::new(0), TextSize::new(0)), node_index: AtomicNodeIndex::dummy() }),
6363
None => None,
6464
},
6565
range: TextRange::new(TextSize::new(0), TextSize::new(0)),
66+
node_index: AtomicNodeIndex::dummy()
6667
}];
6768
let from_stmt = match from_stmt {
68-
Some(from_stmt_inner) => Some(Identifier { id: Name::new(from_stmt_inner), range: TextRange::new(TextSize::new(0), TextSize::new(0)) }),
69+
Some(from_stmt_inner) => Some(Identifier { id: Name::new(from_stmt_inner), range: TextRange::new(TextSize::new(0), TextSize::new(0)), node_index: AtomicNodeIndex::dummy() }),
6970
None => None,
7071
};
7172
resolve_import_stmt(session, source_file_symbol, from_stmt.as_ref(), &name_aliases, level, diagnostics)

‎server/src/core/python_arch_builder.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,13 +415,20 @@ impl PythonArchBuilder {
415415
Expr::FString(expr_fstring) => {
416416
expr_fstring.value.iter().for_each(|fstring_part|{
417417
match fstring_part{
418-
FStringPart::FString(fstr) => fstr.elements.expressions().for_each(
419-
|fstring_expr| self.visit_expr(session, &fstring_expr.expression)
418+
FStringPart::FString(fstr) => fstr.elements.interpolations().map(|interpolation| &interpolation.expression).for_each(
419+
|expression| self.visit_expr(session, expression)
420420
),
421421
FStringPart::Literal(_) => {},
422422
}
423423
});
424424
},
425+
Expr::TString(expr_tstring) => {
426+
expr_tstring.value.iter().for_each(|tstring_part|{
427+
tstring_part.elements.interpolations().map(|interpolation| &interpolation.expression).for_each(
428+
|expression| self.visit_expr(session, expression)
429+
);
430+
});
431+
},
425432
Expr::Subscript(expr_subscript) => {
426433
self.visit_expr(session, &expr_subscript.value);
427434
self.visit_expr(session, &expr_subscript.slice);

‎server/src/core/python_arch_eval.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,20 @@ impl PythonArchEval {
280280
Expr::FString(expr_fstring) => {
281281
expr_fstring.value.iter().for_each(|fstring_part|{
282282
match fstring_part{
283-
FStringPart::FString(fstr) => fstr.elements.expressions().for_each(
284-
|fstring_expr| self.visit_expr(session, &fstring_expr.expression)
283+
FStringPart::FString(fstr) => fstr.elements.interpolations().map(|interpolation| &interpolation.expression).for_each(
284+
|expression| self.visit_expr(session, expression)
285285
),
286286
FStringPart::Literal(_) => {},
287287
}
288288
});
289289
},
290+
Expr::TString(expr_tstring) => {
291+
expr_tstring.value.iter().for_each(|tstring_part|{
292+
tstring_part.elements.interpolations().map(|interpolation| &interpolation.expression).for_each(
293+
|expression| self.visit_expr(session, expression)
294+
);
295+
});
296+
},
290297
Expr::Subscript(expr_subscript) => {
291298
self.visit_expr(session, &expr_subscript.value);
292299
self.visit_expr(session, &expr_subscript.slice);
@@ -1004,7 +1011,7 @@ impl PythonArchEval {
10041011
if func_sym.borrow().as_func().evaluations.is_empty() {
10051012
let has_implementation = !matches!(
10061013
func_body.first(),
1007-
Some(Stmt::Expr(StmtExpr { range: _, value: x})) if matches!(**x, Expr::EllipsisLiteral(_))
1014+
Some(Stmt::Expr(StmtExpr { range: _, value: x, node_index: _})) if matches!(**x, Expr::EllipsisLiteral(_))
10081015
);
10091016
func_sym.borrow_mut().as_func_mut().evaluations = vec![
10101017
if has_implementation {

‎server/src/features/completion.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ fn complete_expr(expr: &Expr, session: &mut SessionInfo, file: &Rc<RefCell<Symbo
390390
Expr::Compare(expr_compare) => complete_compare(session, file, expr_compare, offset, is_param, expected_type),
391391
Expr::Call(expr_call) => complete_call(session, file, expr_call, offset, is_param, expected_type),
392392
Expr::FString(_) => None,
393+
Expr::TString(_) => None,
393394
Expr::StringLiteral(expr_string_literal) => complete_string_literal(session, file, expr_string_literal, offset, is_param, expected_type),
394395
Expr::BytesLiteral(_) => None,
395396
Expr::NumberLiteral(_) => None,

0 commit comments

Comments
 (0)