Complete crate:: paths

3 files changed, 36 insertions, 1 deletions

diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs
index 98c7de361..096405a38 100644
--- a/crates/ra_syntax/src/ast/generated.rs
+++ b/crates/ra_syntax/src/ast/generated.rs
@@ -1371,6 +1371,10 @@ impl<'a> Path<'a> {
     pub fn segment(self) -> Option<PathSegment<'a>> {
         super::child_opt(self)
     }
+
+    pub fn qualifier(self) -> Option<Path<'a>> {
+        super::child_opt(self)
+    }
 }
 
 // PathExpr
diff --git a/crates/ra_syntax/src/ast/mod.rs b/crates/ra_syntax/src/ast/mod.rs
index 900426a8a..c033263a1 100644
--- a/crates/ra_syntax/src/ast/mod.rs
+++ b/crates/ra_syntax/src/ast/mod.rs
@@ -232,6 +232,36 @@ impl<'a> IfExpr<'a> {
     }
 }
 
+
+#[derive(Debug, Clone, Copy)]
+pub enum PathSegmentKind<'a> {
+    Name(NameRef<'a>),
+    SelfKw,
+    SuperKw,
+    CrateKw,
+}
+
+impl<'a> PathSegment<'a> {
+    pub fn parent_path(self) -> Path<'a> {
+        self.syntax().parent().and_then(Path::cast)
+            .expect("segments are always nested in paths")
+    }
+
+    pub fn kind(self) -> Option<PathSegmentKind<'a>> {
+        let res = if let Some(name_ref) = self.name_ref() {
+            PathSegmentKind::Name(name_ref)
+        } else {
+            match self.syntax().first_child()?.kind() {
+                SELF_KW => PathSegmentKind::SelfKw,
+                SUPER_KW => PathSegmentKind::SuperKw,
+                CRATE_KW => PathSegmentKind::CrateKw,
+                _ => return None,
+            }
+        };
+        Some(res)
+    }
+}
+
 fn child_opt<'a, P: AstNode<'a>, C: AstNode<'a>>(parent: P) -> Option<C> {
     children(parent).next()
 }
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index 0830e02f2..c1c215e0d 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -531,7 +531,8 @@ Grammar(
         ),
         "Path": (
             options: [
-                ["segment", "PathSegment"]
+                ["segment", "PathSegment"],
+                ["qualifier", "Path"],
             ]
         ),
         "PathSegment": (