4 files changed, 23 insertions, 13 deletions

diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index 2aa472fb4..27381ba80 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -133,7 +133,7 @@ impl ast::Attr {
             first_token.and_then(|token| token.next_token()).as_ref().map(SyntaxToken::kind);
 
         match (first_token_kind, second_token_kind) {
-            (Some(SyntaxKind::POUND), Some(T![!])) => AttrKind::Inner,
+            (Some(T![#]), Some(T![!])) => AttrKind::Inner,
             _ => AttrKind::Outer,
         }
     }
diff --git a/crates/syntax/src/validation.rs b/crates/syntax/src/validation.rs
index b3a02f4ae..bfa2dc4ba 100644
--- a/crates/syntax/src/validation.rs
+++ b/crates/syntax/src/validation.rs
@@ -344,9 +344,9 @@ fn validate_trait_object_ty(ty: ast::DynTraitType) -> Option<SyntaxError> {
 
     if tbl.bounds().count() > 1 {
         let dyn_token = ty.dyn_token()?;
-        let potential_parentheses =
+        let potential_parenthesis =
             algo::skip_trivia_token(dyn_token.prev_token()?, Direction::Prev)?;
-        let kind = potential_parentheses.kind();
+        let kind = potential_parenthesis.kind();
         if !matches!(kind, T!['('] | T![<] | T![=]) {
             return Some(SyntaxError::new("ambiguous `+` in a type", ty.syntax().text_range()));
         }
diff --git a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 51e881a8e..68c0f1c66 100644
--- a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -1,5 +1,5 @@
-SOURCE_FILE@0..46
-  TYPE_ALIAS@0..45
+SOURCE_FILE@0..59
+  [email protected]8
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -7,12 +7,12 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    PATH_TYPE@9..44
-      PATH@9..44
-        PATH_SEGMENT@9..44
+    PATH_TYPE@9..57
+      PATH@9..57
+        PATH_SEGMENT@9..57
           [email protected]
             [email protected] "B"
-          GENERIC_ARG_LIST@10..44
+          GENERIC_ARG_LIST@10..57
             [email protected] "<"
             [email protected]
               [email protected]
@@ -51,6 +51,16 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "u64"
-            [email protected] ">"
-    [email protected] ";"
-  [email protected] "\n"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "true"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "false"
+            [email protected] ">"
+    [email protected] ";"
+  [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs
index 0d07d7651..6a8721a73 100644
--- a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs
@@ -1 +1 @@
-type A = B<'static, i32, 1, { 2 }, Item=u64>;
+type A = B<'static, i32, 1, { 2 }, Item=u64, true, false>;