Commits

Georg Brandl committed 90041e7 Merge

Merged in leafo/pygments-main (pull request #51)

  • Participants
  • Parent commits a6b47ae, eac3afd

Comments (0)

Files changed (1)

pygments/lexers/agile.py

             (r'(==|!=|~=|<=|>=|\.\.|\.\.\.|[=+\-*/%^<>#!.\\:])', Operator),
             (r'[;,]', Punctuation),
             (r'[\[\]\{\}\(\)]', Keyword.Type),
+            (r'[a-zA-Z_][a-zA-Z0-9_]*:', Name.Variable),
             (r"(class|extends|if|then|super|do|with|import|export|"
             r"while|elseif|return|for|in|from|when|using|else|"
             r"and|or|not|switch|break)\b", Keyword),
             (r'(true|false|nil)\b', Keyword.Constant),
             (r'(and|or|not)\b', Operator.Word),
             (r'(self)\b', Name.Builtin.Pseudo),
-            (r'[a-zA-Z_][a-zA-Z0-9_]*:', Name.Variable),
-            (r'@[a-zA-Z_][a-zA-Z0-9_]*', Name.Variable.Class),
-            (r'[A-Z]\w+', Name.Class), # proper name
+            (r'@@?([a-zA-Z_][a-zA-Z0-9_]*)?', Name.Variable.Class),
+            (r'[A-Z]\w*', Name.Class), # proper name
             (r'[A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)?', Name),
             ("'", String.Single, combined('stringescape', 'sqs')),
             ('"', String.Double, combined('stringescape', 'dqs'))