Merge pull request #16 from adambullmer/fix-syntax

Fixed Python Extended syntax
adambullmer · Jun 27, 2016 · 891cf56 · 891cf56
2 parents 2d3bd82 + d96a7ce
commit 891cf56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/python.JSON-tmLanguage b/python.JSON-tmLanguage
@@ -1293,7 +1293,7 @@
                             "beginCaptures": {
                                 "0": { "name": "variable.parameter.function.python" }
                             },
-                            "end": "(^\\s*$|(?=\"\"\"))",
+                            "end": "(^\\s*$|\\s*(?=\"\"\"))",
                             "patterns": [
                                 {
                                     "match": "^\\s*(\\w*)\\s*\\{([^\\{\\}]*)\\}\\s*--\\s*(.*)$",
@@ -1310,7 +1310,7 @@
                             "beginCaptures": {
                                 "0": { "name": "constant.numeric.integer.decimal.python" }
                             },
-                            "end": "(^\\s*$|(?=\"\"\"))",
+                            "end": "(^\\s*$|\\s*(?=\"\"\"))",
                             "patterns": [
                                 {
                                     "match": "^\\s*(\\w*)\\s*\\{([^\\{\\}]*)\\}(\\s*--)?\\s*(.*)?$",
@@ -1327,14 +1327,14 @@
                             "beginCaptures": {
                                 "0": { "name": "support.function.magic.python" }
                             },
-                            "end": "(^\\s*$|(?=\"\"\"))"
+                            "end": "(^\\s*$|\\s*(?=\"\"\"))"
                         },
                         {
                             "begin": "^\\s*([Ee]xtends|[Dd]ecorators)(:)?\\s*$",
                             "beginCaptures": {
                                 "0": { "name": "entity.name.function.decorator.python" }
                             },
-                            "end": "(^\\s*$|(?=\"\"\"))",
+                            "end": "(^\\s*$|\\s*(?=\"\"\"))",
                             "patterns": [
                                 {
                                     "match": "^(.*)$",
@@ -1349,7 +1349,7 @@
                             "beginCaptures": {
                                 "0": { "name": "keyword.other.python" }
                             },
-                            "end": "(^\\s*$|(?=\"\"\"))",
+                            "end": "(^\\s*$|\\s*(?=\"\"\"))",
                             "patterns": [
                                 {
                                     "match": "^\\s*\\{([^\\{\\}]*)\\}",

diff --git a/python.tmLanguage b/python.tmLanguage
@@ -2249,7 +2249,7 @@
 								</dict>
 							</dict>
 							<key>end</key>
-							<string>(^\s*$|(?="""))</string>
+							<string>(^\s*$|\s*(?="""))</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -2288,7 +2288,7 @@
 								</dict>
 							</dict>
 							<key>end</key>
-							<string>(^\s*$|(?="""))</string>
+							<string>(^\s*$|\s*(?="""))</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -2327,7 +2327,7 @@
 								</dict>
 							</dict>
 							<key>end</key>
-							<string>(^\s*$|(?="""))</string>
+							<string>(^\s*$|\s*(?="""))</string>
 						</dict>
 						<dict>
 							<key>begin</key>
@@ -2341,7 +2341,7 @@
 								</dict>
 							</dict>
 							<key>end</key>
-							<string>(^\s*$|(?="""))</string>
+							<string>(^\s*$|\s*(?="""))</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -2370,7 +2370,7 @@
 								</dict>
 							</dict>
 							<key>end</key>
-							<string>(^\s*$|(?="""))</string>
+							<string>(^\s*$|\s*(?="""))</string>
 							<key>patterns</key>
 							<array>
 								<dict>