From c1e17a643f098b914174b7fbba3e57f3f782bd64 Mon Sep 17 00:00:00 2001
From: "Colin J. Fuller" <colin@khanacademy.org>
Date: Tue, 8 Jul 2014 10:11:05 -0400
Subject: [PATCH 1/2] add python grammar extensions

---
 grammars/python.cson | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/grammars/python.cson b/grammars/python.cson
index ce38718..03f0c50 100644
--- a/grammars/python.cson
+++ b/grammars/python.cson
@@ -14,6 +14,39 @@
 ]
 'firstLineMatch': '^#!/.*\\bpython\\b'
 'patterns': [
+# begin personal extensions
+    {
+        'begin': '^\\s*(?=[uU]?[rR]?""")'
+        'end': '(?<=""")'
+        'patterns': [
+            {
+                'match': '"""((?:.(?!"""))*.(?="""|\\Z))'
+                'captures':
+                    '1':
+                        'name': 'summary.docstring.python'
+            }
+            {
+                'match': 'Args:'
+                'name': 'args.docstring.python'
+            }
+            {
+                'match': '(?:Return:|Returns:)'
+                'name': 'return.docstring.python'
+            }
+            {
+                'include': '#string_quoted_double'
+            }
+        ]
+        'name': 'docstring.python'
+    }
+    {
+        'match': '(\\s+)\\Z'
+        'captures':
+            '1':
+                'name': 'trailing.whitespace.python'
+    }
+# end personal extensions
+
   {
     'begin': '(^[ \\t]+)?(?=#)'
     'beginCaptures':

From 6785b3460927bc16042fa16105724e3e514d5a5e Mon Sep 17 00:00:00 2001
From: "Colin J. Fuller" <colin@khanacademy.org>
Date: Tue, 8 Jul 2014 10:42:42 -0400
Subject: [PATCH 2/2] fix docstring extensions

---
 grammars/python.cson | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/grammars/python.cson b/grammars/python.cson
index 03f0c50..8163196 100644
--- a/grammars/python.cson
+++ b/grammars/python.cson
@@ -16,26 +16,20 @@
 'patterns': [
 # begin personal extensions
     {
-        'begin': '^\\s*(?=[uU]?[rR]?""")'
+        'begin': '^\\s*(?=[uU]?[rR]?""")(.(?:.(?!"""))+.(?="""|\\Z))'
         'end': '(?<=""")'
+        'captures':
+            '1':
+                'name': 'summary.docstring.python'
         'patterns': [
             {
-                'match': '"""((?:.(?!"""))*.(?="""|\\Z))'
-                'captures':
-                    '1':
-                        'name': 'summary.docstring.python'
-            }
-            {
-                'match': 'Args:'
+                'match': '(?:Args:|Arguments:)'
                 'name': 'args.docstring.python'
             }
             {
                 'match': '(?:Return:|Returns:)'
                 'name': 'return.docstring.python'
             }
-            {
-                'include': '#string_quoted_double'
-            }
         ]
         'name': 'docstring.python'
     }