language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-01 12:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge commit '9d8889cdfc' into sync-from-ra

Browse source
This commit is contained in:
Laurențiu Nicola 2024-01-15 11:40:09 +02:00
parent 3afeb24198
commit 6bbd106c70
104 changed files with 1652 additions and 1026 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/parser/Cargo.toml
View file

@ -13,8 +13,7 @@ doctest = false
[dependencies]
drop_bomb = "0.1.5"
rustc-dependencies.workspace = true
ra-ap-rustc_lexer.workspace = true
limit.workspace = true
[dev-dependencies]
@ -24,7 +23,7 @@ stdx.workspace = true
sourcegen.workspace = true
[features]
in-rust-tree = ["rustc-dependencies/in-rust-tree"]
in-rust-tree = []
[lints]
workspace = true
workspace = true

10
crates/parser/src/grammar/expressions.rs
View file

@ -371,7 +371,15 @@ fn lhs(p: &mut Parser<'_>, r: Restrictions) -> Option<(CompletedMarker, BlockLik
if p.at(op) {
m = p.start();
p.bump(op);
if p.at_ts(EXPR_FIRST) && !(r.forbid_structs && p.at(T!['{'])) {
// test closure_range_method_call
// fn foo() {
// || .. .method();
// || .. .field;
// }
let has_access_after = p.at(T![.]) && p.nth_at(1, SyntaxKind::IDENT);
let struct_forbidden = r.forbid_structs && p.at(T!['{']);
if p.at_ts(EXPR_FIRST) && !has_access_after && !struct_forbidden {
expr_bp(p, None, r, 2);
}
let cm = m.complete(p, RANGE_EXPR);

2
crates/parser/src/lexed_str.rs
View file

@ -8,8 +8,6 @@
//! Note that these tokens, unlike the tokens we feed into the parser, do
//! include info about comments and whitespace.
use rustc_dependencies::lexer as rustc_lexer;
use std::ops;
use rustc_lexer::unescape::{EscapeError, Mode};

5
crates/parser/src/lib.rs
View file

@ -21,6 +21,11 @@
#![allow(rustdoc::private_intra_doc_links)]
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_lexer as rustc_lexer;
#[cfg(feature = "in-rust-tree")]
extern crate rustc_lexer;
mod lexed_str;
mod token_set;
mod syntax_kind;

49
crates/parser/test_data/parser/inline/ok/0208_closure_range_method_call.rast Normal file
View file

@ -0,0 +1,49 @@
SOURCE_FILE
FN
FN_KW "fn"
WHITESPACE " "
NAME
IDENT "foo"
PARAM_LIST
L_PAREN "("
R_PAREN ")"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
WHITESPACE "\n "
EXPR_STMT
METHOD_CALL_EXPR
CLOSURE_EXPR
PARAM_LIST
PIPE "|"
PIPE "|"
WHITESPACE " "
RANGE_EXPR
DOT2 ".."
WHITESPACE " "
DOT "."
NAME_REF
IDENT "method"
ARG_LIST
L_PAREN "("
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n "
EXPR_STMT
FIELD_EXPR
CLOSURE_EXPR
PARAM_LIST
PIPE "|"
PIPE "|"
WHITESPACE " "
RANGE_EXPR
DOT2 ".."
WHITESPACE " "
DOT "."
NAME_REF
IDENT "field"
SEMICOLON ";"
WHITESPACE "\n"
R_CURLY "}"
WHITESPACE "\n"

4
crates/parser/test_data/parser/inline/ok/0208_closure_range_method_call.rs Normal file
View file

@ -0,0 +1,4 @@
fn foo() {
|| .. .method();
|| .. .field;
}