Merge branch 'fix-mcs-16997'

erik-kallen · Jan 2, 2014 · 9c668b5 · 9c668b5
2 parents 90187ea + 6732d97
commit 9c668b5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
@@ -6164,6 +6164,8 @@ void case_320()
 void case_321()
 #line 2666 "cs-parser.jay"
 {
+		lexer.parsing_modifiers = true;
+
 	  	/* here will be evaluated after CLOSE_BLACE is consumed.*/
 		if (doc_support)
 			Lexer.doc_state = XmlCommentState.Allowed;

diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay
@@ -2664,6 +2664,8 @@ enum_declaration
 	  }
 	  opt_enum_member_declarations
 	  {
+		lexer.parsing_modifiers = true;
+
 	  	// here will be evaluated after CLOSE_BLACE is consumed.
 		if (doc_support)
 			Lexer.doc_state = XmlCommentState.Allowed;

diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs
@@ -654,6 +654,23 @@ protected override void UpdateSourceProperties (string targetBasePath)
 
 		}
 
+		[Test]
+		public void AsyncAfterEnum() {
+			string code = @"
+using System.Threading.Tasks;
+class C
+{
+	enum E {}
+	async Task M() {
+	}
+}";
+
+			var unit = SyntaxTree.Parse(code);
+			var type = unit.Members.OfType<TypeDeclaration>().Single();
+			var member = type.Members.OfType<MethodDeclaration>().SingleOrDefault(m => m.Name == "M");
+			Assert.IsNotNull(member, "M() not found."); 
+			Assert.That(member.Modifiers, Is.EqualTo(Modifiers.Async));
+		}
 	}
 }