From 508ff930eef4e744b13a3ffdf369c5460a369a12 Mon Sep 17 00:00:00 2001
From: PWBENNETT <paul.w.bennett@gmail.com>
Date: Sun, 10 Nov 2013 00:34:48 -0500
Subject: [PATCH] Update mop.tmLanguage

Better handling of optional args to a trait invocation.
---
 inc/mop.tmLanguage | 53 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/inc/mop.tmLanguage b/inc/mop.tmLanguage
index a20d5be..a8c3b27 100644
--- a/inc/mop.tmLanguage
+++ b/inc/mop.tmLanguage
@@ -14,7 +14,7 @@
                 <key>applyEndPatternLast</key>
                 <integer>1</integer>
                 <key>begin</key>
-                <string>^\s*(class|role)\s+([^;\s]+)</string>
+                <string>^\s*(class|role|trait)\s+([^;\s]+)</string>
                 <key>end</key>
                 <string>^\s*\}$\n?</string>
                 <key>name</key>
@@ -34,6 +34,10 @@
                 </dict>
                 <key>patterns</key>
                 <array>
+                    <dict>
+                        <key>include</key>
+                        <string>#is</string>
+                    </dict>
                     <dict>
                         <key>match</key>
                         <string>^\s*(method)\s+([-a-zA-Z0-9_]+)\s*(\([\$\@\*;]*\))?</string>
@@ -64,7 +68,7 @@
                     </dict>
                     <dict>
                         <key>match</key>
-                        <string>\b(extends|with|is|does)\s+([^;\s]+)</string>
+                        <string>\b(extends|with|does)\s+([^;\s]+)</string>
                         <key>name</key>
                         <string>keyword.control.mop</string>
                         <key>captures</key>
@@ -99,6 +103,51 @@
                 </array>
             </dict>
         </array>
+        <key>repository</key>
+        <dict>
+            <key>is</key>
+            <dict>
+                <key>match</key>
+                <string>\s(is)\s+([^;\(\s]+)</string>
+                <key>captures</key>
+                <dict>
+                    <key>1</key>
+                    <dict>
+                        <key>name</key>
+                        <string>keyword.control.mop</string>
+                    </dict>
+                    <key>2</key>
+                    <dict>
+                        <key>name</key>
+                        <string>entity.name.function.mop</string>
+                    </dict>
+                </dict>
+                <key>patterns</key>
+                <array>
+                    <dict>
+                        <key>match</key>
+                        <string>\((.+)\)</string>
+                        <key>captures</key>
+                        <dict>
+                            <key>0</key>
+                            <dict>
+                                <key>name</key>
+                                <string>punctuation.perl</string>
+                            </dict>
+                            <key>1</key>
+                            <dict>
+                                <key>name</key>
+                                <string>text.perl.embedded.mop</string>
+                            </dict>
+                        </dict>
+                    </dict>
+                    <dict>
+                        <key>include</key>
+                        <string>source.perl</string>
+                    </dict>
+                </array>
+            </dict>
+        </dict>
         <key>scopeName</key>
         <string>source.mop</string>
         <key>uuid</key>