From 8bdc88f76331c544dd1db81f5266bda53093be42 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 19 Jul 2016 13:54:45 +0300
Subject: [PATCH] Grammar: obsolete 'annotationEntry' changed to
 'unescapedAnnotation' in a few places (cherry picked from commit d9818bd)

---
 grammar/src/expressions.grm | 2 +-
 grammar/src/toplevel.grm    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/grammar/src/expressions.grm b/grammar/src/expressions.grm
index a9426c0f8d3..09edf68b597 100644
--- a/grammar/src/expressions.grm
+++ b/grammar/src/expressions.grm
@@ -229,7 +229,7 @@ callSuffix
   ;
 
 annotatedLambda
-  : ("@" annotationEntry)* labelDefinition? functionLiteral
+  : ("@" unescapedAnnotation)* labelDefinition? functionLiteral
 
 memberAccessOperation
   : "." : "?." : "?"
diff --git a/grammar/src/toplevel.grm b/grammar/src/toplevel.grm
index 9730771d27a..716d233b6a2 100644
--- a/grammar/src/toplevel.grm
+++ b/grammar/src/toplevel.grm
@@ -24,7 +24,7 @@ fileAnnotations
   ;
 
 fileAnnotation
-  : "@" "file" ":" ("[" annotationEntry+ "]" | annotationEntry)
+  : "@" "file" ":" ("[" unescapedAnnotation+ "]" | unescapedAnnotation)
   ;
 
 packageHeader