GRAM: Fix parsing of nested async functions

intellij-rust · Aug 13, 2019 · e83838e · e83838e
1 parent e25ceab
commit e83838e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/src/main/grammars/RustParser.bnf b/src/main/grammars/RustParser.bnf
@@ -171,7 +171,7 @@ MetaItemArgs ::= '(' ( [ <<comma_separated_list (LitExpr | MetaItemWithoutTT )>>
 // Paths
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-private PathIdent ::= !("union" identifier) identifier | self | super | 'Self' | crate
+private PathIdent ::= !("union" identifier | "async" fn) identifier | self | super | 'Self' | crate
 
 fake Path ::= (Path '::' | '::' | TypeQual)? PathIdent PathTypeArguments? {
   implements = [ "org.rust.lang.core.psi.ext.RsPathReferenceElement" ]

diff --git a/src/main/kotlin/org/rust/lang/core/stubs/StubImplementations.kt b/src/main/kotlin/org/rust/lang/core/stubs/StubImplementations.kt
@@ -36,7 +36,7 @@ class RsFileStub : PsiFileStubImpl<RsFile> {
 
     object Type : IStubFileElementType<RsFileStub>(RsLanguage) {
         // Bump this number if Stub structure changes
-        override fun getStubVersion(): Int = 178
+        override fun getStubVersion(): Int = 179
 
         override fun getBuilder(): StubBuilder = object : DefaultStubBuilder() {
             override fun createStubForFile(file: PsiFile): StubElement<*> = RsFileStub(file as RsFile)

diff --git a/src/test/resources/org/rust/lang/core/parser/fixtures/complete/async_await.rs b/src/test/resources/org/rust/lang/core/parser/fixtures/complete/async_await.rs
@@ -23,4 +23,6 @@ fn main() {
     async || { () };
     async move || { () };
     static move || { () };
+
+    async fn nested() {}
 }
diff --git a/src/test/resources/org/rust/lang/core/parser/fixtures/complete/async_await.txt b/src/test/resources/org/rust/lang/core/parser/fixtures/complete/async_await.txt
@@ -311,5 +311,19 @@ FILE
               PsiWhiteSpace(' ')
               PsiElement(})('}')
         PsiElement(;)(';')
+      PsiWhiteSpace('\n\n    ')
+      RsFunctionImpl(FUNCTION)
+        PsiElement(async_kw)('async')
+        PsiWhiteSpace(' ')
+        PsiElement(fn)('fn')
+        PsiWhiteSpace(' ')
+        PsiElement(identifier)('nested')
+        RsValueParameterListImpl(VALUE_PARAMETER_LIST)
+          PsiElement(()('(')
+          PsiElement())(')')
+        PsiWhiteSpace(' ')
+        RsBlockImpl(BLOCK)
+          PsiElement({)('{')
+          PsiElement(})('}')
       PsiWhiteSpace('\n')
       PsiElement(})('}')