KT-847 Allow "this" without {} in string templates

2011-12-15 20:54:30 +04:00
parent 94ad86e79e
commit 55c11d0f44
9 changed files with 476 additions and 393 deletions
@@ -157,6 +157,25 @@ JetFile: StringTemplates.jet
            PsiElement(INTEGER_LITERAL)('3')
        PsiElement(SEMICOLON)(';')
        PsiWhiteSpace('\n    ')
+        STRING_TEMPLATE
+          PsiElement(OPEN_QUOTE)('"')
+          SHORT_STRING_TEMPLATE_ENTRY
+            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
+            THIS_EXPRESSION
+              REFERENCE_EXPRESSION
+                PsiElement(this)('this')
+          LITERAL_STRING_TEMPLATE_ENTRY
+            PsiElement(REGULAR_STRING_PART)(' must be')
+          SHORT_STRING_TEMPLATE_ENTRY
+            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
+            PsiErrorElement:Keyword cannot be used as a reference
+              PsiElement(as)('as')
+          SHORT_STRING_TEMPLATE_ENTRY
+            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('t')
+          PsiElement(CLOSING_QUOTE)('"')
+        PsiWhiteSpace('\n    ')
        STRING_TEMPLATE
          PsiElement(OPEN_QUOTE)('"')
          SHORT_STRING_TEMPLATE_ENTRY