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

Parse contextual dyn keyword properly in edition 2015

Browse source
This commit is contained in:
Lukas Wirth 2024-07-19 20:20:00 +02:00
parent 9fd6c695da
commit f4199f786e
10 changed files with 164 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/parser/src/shortcuts.rs
View file

@ -12,7 +12,7 @@
use std::mem;
use crate::{
LexedStr, Step,
Edition, LexedStr, Step,
SyntaxKind::{self, *},
};
@ -25,7 +25,7 @@ pub enum StrStep<'a> {
}
impl LexedStr<'_> {
pub fn to_input(&self) -> crate::Input {
pub fn to_input(&self, edition: Edition) -> crate::Input {
let _p = tracing::info_span!("LexedStr::to_input").entered();
let mut res = crate::Input::default();
let mut was_joint = false;
@ -35,8 +35,11 @@ impl LexedStr<'_> {
was_joint = false
} else if kind == SyntaxKind::IDENT {
let token_text = self.text(i);
let contextual_kw =
SyntaxKind::from_contextual_keyword(token_text).unwrap_or(SyntaxKind::IDENT);
let contextual_kw = if !edition.at_least_2018() && token_text == "dyn" {
SyntaxKind::DYN_KW
} else {
SyntaxKind::from_contextual_keyword(token_text).unwrap_or(SyntaxKind::IDENT)
};
res.push_ident(contextual_kw);
} else {
if was_joint {