3 files changed, 22 insertions, 24 deletions

diff --git a/crates/ra_syntax/src/grammar/expressions.rs b/crates/ra_syntax/src/grammar/expressions.rs
index 2236555e0..7ee32fa7c 100644
--- a/crates/ra_syntax/src/grammar/expressions.rs
+++ b/crates/ra_syntax/src/grammar/expressions.rs
@@ -305,6 +305,8 @@ fn postfix_expr(
 // fn foo() {
 //     let _ = f();
 //     let _ = f()(1)(1, 2,);
+//     let _ = f(<Foo>::func());
+//     f(<Foo as Trait>::func());
 // }
 fn call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
     assert!(p.at(L_PAREN));
diff --git a/crates/ra_syntax/src/grammar/expressions/atom.rs b/crates/ra_syntax/src/grammar/expressions/atom.rs
index 167a76551..6d6d89f70 100644
--- a/crates/ra_syntax/src/grammar/expressions/atom.rs
+++ b/crates/ra_syntax/src/grammar/expressions/atom.rs
@@ -36,26 +36,22 @@ pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> {
 }
 
 // E.g. for after the break in `if break {}`, this should not match
-pub(super) const ATOM_EXPR_FIRST: TokenSet = LITERAL_FIRST.union(token_set![
-    L_PAREN,
-    L_CURLY,
-    L_BRACK,
-    PIPE,
-    MOVE_KW,
-    IF_KW,
-    WHILE_KW,
-    MATCH_KW,
-    UNSAFE_KW,
-    RETURN_KW,
-    IDENT,
-    SELF_KW,
-    SUPER_KW,
-    CRATE_KW,
-    COLONCOLON,
-    BREAK_KW,
-    CONTINUE_KW,
-    LIFETIME,
-]);
+pub(super) const ATOM_EXPR_FIRST: TokenSet =
+    LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![
+        L_PAREN,
+        L_CURLY,
+        L_BRACK,
+        PIPE,
+        MOVE_KW,
+        IF_KW,
+        WHILE_KW,
+        MATCH_KW,
+        UNSAFE_KW,
+        RETURN_KW,
+        BREAK_KW,
+        CONTINUE_KW,
+        LIFETIME,
+    ]);
 
 const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW];
 
diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs
index b50cd8a52..13ee1305f 100644
--- a/crates/ra_syntax/src/ptr.rs
+++ b/crates/ra_syntax/src/ptr.rs
@@ -42,7 +42,7 @@ impl SyntaxNodePtr {
 /// Like `SyntaxNodePtr`, but remembers the type of node
 #[derive(Debug, PartialEq, Eq, Hash)]
 pub struct AstPtr<N: AstNode> {
-    ptr: SyntaxNodePtr,
+    raw: SyntaxNodePtr,
     _ty: PhantomData<N>,
 }
 
@@ -56,18 +56,18 @@ impl<N: AstNode> Clone for AstPtr<N> {
 impl<N: AstNode> AstPtr<N> {
     pub fn new(node: &N) -> AstPtr<N> {
         AstPtr {
-            ptr: SyntaxNodePtr::new(node.syntax()),
+            raw: SyntaxNodePtr::new(node.syntax()),
             _ty: PhantomData,
         }
     }
 
     pub fn to_node(self, source_file: &SourceFile) -> &N {
-        let syntax_node = self.ptr.to_node(source_file);
+        let syntax_node = self.raw.to_node(source_file);
         N::cast(syntax_node).unwrap()
     }
 
     pub fn syntax_node_ptr(self) -> SyntaxNodePtr {
-        self.ptr
+        self.raw
     }
 }