rust-analyzer

diff --git a/crates/hir-def/src/expr_store/lower/format_args.rs b/crates/hir-def/src/expr_store/lower/format_args.rs
index 4bbfc5b144..32c9df3dfe 100644
--- a/crates/hir-def/src/expr_store/lower/format_args.rs
+++ b/crates/hir-def/src/expr_store/lower/format_args.rs

@@ -1,12 +1,9 @@

//! Lowering of `format_args!()`.

use base_db::FxIndexSet;

-use hir_expand::name::{AsName, Name};

+use hir_expand::name::Name;

use intern::{Symbol, sym};

-use syntax::{

- AstPtr, AstToken as _,

- ast::{self, HasName},

-};

+use syntax::{AstPtr, AstToken as _, ast};

use crate::{

builtin_type::BuiltinUint,

@@ -32,8 +29,8 @@ impl<'db> ExprCollector<'db> {

let mut args = FormatArgumentsCollector::default();

f.args().for_each(|arg| {

args.add(FormatArgument {

- kind: match arg.name() {

- Some(name) => FormatArgumentKind::Named(name.as_name()),

+ kind: match arg.arg_name() {

+ Some(name) => FormatArgumentKind::Named(Name::new_root(name.name().text())),

None => FormatArgumentKind::Normal,

expr: self.collect_expr_opt(arg.expr()),

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
index 1b0512977a..e178782c79 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html

@@ -101,18 +101,18 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

println!("Hello, {}!", "world"); // => "Hello, world!"

println!("The number is {}", 1); // => "The number is 1"

println!("{:?}", (3, 4)); // => "(3, 4)"

println!("{1} {} {0} {}", 1, 2); // => "2 1 1 2"

- println!("{a} {c} {b}", a="a", b='b', c=3); // => "a 3 b"

+ println!("{a} {c} {b}", a="a", b='b', c=3); // => "a 3 b"

println!("Hello {1:0$}!", 5, "x");

@@ -127,10 +127,10 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

println!("Hello {0} is {2:.1$}", "x", 5, 0.01);

println!("Hello {} is {:.*}", "x", 5, 0.01);

println!("Hello {} is {2:.*}", "x", 5, 0.01);

- println!("Hello {} is {number:.prec$}", "x", prec = 5, number = 0.01);

- println!("{}, `{name:.*}` has 3 fractional digits", "Hello", 3, name=1234.56);

- println!("{}, `{name:.*}` has 3 characters", "Hello", 3, name="1234.56");

- println!("{}, `{name:>8.*}` has 3 right-aligned characters", "Hello", 3, name="1234.56");

+ println!("Hello {} is {number:.prec$}", "x", prec = 5, number = 0.01);

+ println!("{}, `{name:.*}` has 3 fractional digits", "Hello", 3, name=1234.56);

+ println!("{}, `{name:.*}` has 3 characters", "Hello", 3, name="1234.56");

+ println!("{}, `{name:>8.*}` has 3 right-aligned characters", "Hello", 3, name="1234.56");

let _ = "{}"

let _ = "{{}}";

@@ -154,8 +154,8 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

let _ = c"\u{FF}\xFF"; // valid bytes, valid unicodes

let backslash = r"\\";

println!("{:x?} {} ", thingy, n2);

panic!("{}", 0);

diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs
index ab18309308..d83e2eb2b4 100644
--- a/crates/parser/src/grammar/expressions/atom.rs
+++ b/crates/parser/src/grammar/expressions/atom.rs

@@ -278,14 +278,20 @@ fn builtin_expr(p: &mut Parser<'_>) -> Option<CompletedMarker> {

}

Some(m.complete(p, OFFSET_OF_EXPR))

} else if p.eat_contextual_kw(T![format_args]) {

+ // test format_args_named_arg_keyword

+ // fn main() {

+ // builtin#format_args("{type}", type=1);

+ // }

p.expect(T!['(']);

expr(p);

if p.eat(T![,]) {

while !p.at(EOF) && !p.at(T![')']) {

let m = p.start();

- if p.at(IDENT) && p.nth_at(1, T![=]) && !p.nth_at(2, T![=]) {

- name(p);

+ if p.current().is_any_identifier() && p.nth_at(1, T![=]) && !p.nth_at(2, T![=]) {

+ let m = p.start();

+ p.bump_any();

p.bump(T![=]);

+ m.complete(p, FORMAT_ARGS_ARG_NAME);

}

if expr(p).is_none() {

m.abandon(p);

diff --git a/crates/parser/src/syntax_kind/generated.rs b/crates/parser/src/syntax_kind/generated.rs
index 6cf2524c16..5d22d966b2 100644
--- a/crates/parser/src/syntax_kind/generated.rs
+++ b/crates/parser/src/syntax_kind/generated.rs

@@ -201,6 +201,7 @@ pub enum SyntaxKind {

FN,

FN_PTR_TYPE,

FORMAT_ARGS_ARG,

+ FORMAT_ARGS_ARG_NAME,

FORMAT_ARGS_EXPR,

FOR_BINDER,

FOR_EXPR,

@@ -373,6 +374,7 @@ impl SyntaxKind {

| FN

| FN_PTR_TYPE

| FORMAT_ARGS_ARG

+ | FORMAT_ARGS_ARG_NAME

| FORMAT_ARGS_EXPR

| FOR_BINDER

| FOR_EXPR

diff --git a/crates/parser/test_data/generated/runner.rs b/crates/parser/test_data/generated/runner.rs
index 7b0d32d9d1..9f919f6cea 100644
--- a/crates/parser/test_data/generated/runner.rs
+++ b/crates/parser/test_data/generated/runner.rs

@@ -265,6 +265,10 @@ mod ok {

#[test]

fn for_type() { run_and_expect_no_errors("test_data/parser/inline/ok/for_type.rs"); }

#[test]

+ fn format_args_named_arg_keyword() {

+ run_and_expect_no_errors("test_data/parser/inline/ok/format_args_named_arg_keyword.rs");

+ }

+ #[test]

fn frontmatter() { run_and_expect_no_errors("test_data/parser/inline/ok/frontmatter.rs"); }

#[test]

fn full_range_expr() {

diff --git a/crates/parser/test_data/parser/inline/ok/builtin_expr.rast b/crates/parser/test_data/parser/inline/ok/builtin_expr.rast
index 19a84ac540..78c3bee4c8 100644
--- a/crates/parser/test_data/parser/inline/ok/builtin_expr.rast
+++ b/crates/parser/test_data/parser/inline/ok/builtin_expr.rast

@@ -44,10 +44,10 @@ SOURCE_FILE

COMMA ","

WHITESPACE " "

FORMAT_ARGS_ARG

- NAME

+ FORMAT_ARGS_ARG_NAME

IDENT "a"

- WHITESPACE " "

- EQ "="

+ WHITESPACE " "

+ EQ "="

WHITESPACE " "

BIN_EXPR

LITERAL

diff --git a/crates/parser/test_data/parser/inline/ok/format_args_named_arg_keyword.rast b/crates/parser/test_data/parser/inline/ok/format_args_named_arg_keyword.rast
new file mode 100644
index 0000000000..03bc2ecf7c
--- /dev/null
+++ b/crates/parser/test_data/parser/inline/ok/format_args_named_arg_keyword.rast

@@ -0,0 +1,35 @@

+SOURCE_FILE

+ FN

+ FN_KW "fn"

+ WHITESPACE " "

+ NAME

+ IDENT "main"

+ PARAM_LIST

+ L_PAREN "("

+ R_PAREN ")"

+ WHITESPACE " "

+ BLOCK_EXPR

+ STMT_LIST

+ L_CURLY "{"

+ WHITESPACE "\n "

+ EXPR_STMT

+ FORMAT_ARGS_EXPR

+ BUILTIN_KW "builtin"

+ POUND "#"

+ FORMAT_ARGS_KW "format_args"

+ L_PAREN "("

+ LITERAL

+ STRING "\"{type}\""

+ COMMA ","

+ WHITESPACE " "

+ FORMAT_ARGS_ARG

+ FORMAT_ARGS_ARG_NAME

+ TYPE_KW "type"

+ EQ "="

+ LITERAL

+ INT_NUMBER "1"

+ R_PAREN ")"

+ SEMICOLON ";"

+ WHITESPACE "\n"

+ R_CURLY "}"

+ WHITESPACE "\n"

diff --git a/crates/parser/test_data/parser/inline/ok/format_args_named_arg_keyword.rs b/crates/parser/test_data/parser/inline/ok/format_args_named_arg_keyword.rs
new file mode 100644
index 0000000000..7af45894ed
--- /dev/null
+++ b/crates/parser/test_data/parser/inline/ok/format_args_named_arg_keyword.rs

@@ -0,0 +1,3 @@

+fn main() {

+ builtin#format_args("{type}", type=1);

diff --git a/crates/syntax/rust.ungram b/crates/syntax/rust.ungram
index d73d60c51f..991fe7d83a 100644
--- a/crates/syntax/rust.ungram
+++ b/crates/syntax/rust.ungram

@@ -438,7 +438,10 @@ FormatArgsExpr =

')'

FormatArgsArg =

- (Name '=')? Expr

+ arg_name:FormatArgsArgName? Expr

+FormatArgsArgName =

+ '=' // This also has a name, but it's any token and we can't put it here

MacroExpr =

MacroCall

diff --git a/crates/syntax/src/ast/generated/nodes.rs b/crates/syntax/src/ast/generated/nodes.rs
index 6c1dcf336a..7b9f5b9166 100644
--- a/crates/syntax/src/ast/generated/nodes.rs
+++ b/crates/syntax/src/ast/generated/nodes.rs

@@ -639,10 +639,16 @@ impl ForType {

pub struct FormatArgsArg {

pub(crate) syntax: SyntaxNode,

}

-impl ast::HasName for FormatArgsArg {}

impl FormatArgsArg {

#[inline]

+ pub fn arg_name(&self) -> Option<FormatArgsArgName> { support::child(&self.syntax) }

+ #[inline]

pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }

+pub struct FormatArgsArgName {

+ pub(crate) syntax: SyntaxNode,

+impl FormatArgsArgName {

#[inline]

pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }

}

@@ -3722,6 +3728,38 @@ impl fmt::Debug for FormatArgsArg {

f.debug_struct("FormatArgsArg").field("syntax", &self.syntax).finish()

}

+impl AstNode for FormatArgsArgName {

+ #[inline]

+ fn kind() -> SyntaxKind

+ where

+ Self: Sized,

+ {

+ FORMAT_ARGS_ARG_NAME

+ }

+ #[inline]

+ fn can_cast(kind: SyntaxKind) -> bool { kind == FORMAT_ARGS_ARG_NAME }

+ #[inline]

+ fn cast(syntax: SyntaxNode) -> Option<Self> {

+ if Self::can_cast(syntax.kind()) { Some(Self { syntax }) } else { None }

+ }

+ #[inline]

+ fn syntax(&self) -> &SyntaxNode { &self.syntax }

+impl hash::Hash for FormatArgsArgName {

+ fn hash<H: hash::Hasher>(&self, state: &mut H) { self.syntax.hash(state); }

+impl Eq for FormatArgsArgName {}

+impl PartialEq for FormatArgsArgName {

+ fn eq(&self, other: &Self) -> bool { self.syntax == other.syntax }

+impl Clone for FormatArgsArgName {

+ fn clone(&self) -> Self { Self { syntax: self.syntax.clone() } }

+impl fmt::Debug for FormatArgsArgName {

+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

+ f.debug_struct("FormatArgsArgName").field("syntax", &self.syntax).finish()

+ }

impl AstNode for FormatArgsExpr {

#[inline]

fn kind() -> SyntaxKind

@@ -8947,7 +8985,6 @@ impl AstNode for AnyHasName {

| CONST_PARAM

| ENUM

| FN

- | FORMAT_ARGS_ARG

| IDENT_PAT

| MACRO_DEF

| MACRO_RULES

@@ -9006,10 +9043,6 @@ impl From<Fn> for AnyHasName {

#[inline]

fn from(node: Fn) -> AnyHasName { AnyHasName { syntax: node.syntax } }

}

-impl From<FormatArgsArg> for AnyHasName {

- #[inline]

- fn from(node: FormatArgsArg) -> AnyHasName { AnyHasName { syntax: node.syntax } }

impl From<IdentPat> for AnyHasName {

#[inline]

fn from(node: IdentPat) -> AnyHasName { AnyHasName { syntax: node.syntax } }

@@ -9541,6 +9574,11 @@ impl std::fmt::Display for FormatArgsArg {

std::fmt::Display::fmt(self.syntax(), f)

}

+impl std::fmt::Display for FormatArgsArgName {

+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

+ std::fmt::Display::fmt(self.syntax(), f)

+ }

impl std::fmt::Display for FormatArgsExpr {

fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

std::fmt::Display::fmt(self.syntax(), f)

diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index 800dd5f4ac..3357b25011 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs

@@ -1118,6 +1118,15 @@ impl From<ast::AssocItem> for ast::AnyHasAttrs {

}

+impl ast::FormatArgsArgName {

+ /// This is not a [`ast::Name`], because the name may be a keyword.

+ pub fn name(&self) -> SyntaxToken {

+ let name = self.syntax.first_token().unwrap();

+ assert!(name.kind().is_any_identifier());

+ name

+ }

impl ast::OrPat {

pub fn leading_pipe(&self) -> Option<SyntaxToken> {

self.syntax