Better spacing for larger regexes

MattDMo · MattDMo · commit 643a5be55aae · 2015-09-10T16:46:00.000-04:00
diff --git a/PythonImproved-Unicode.YAML-tmLanguage b/PythonImproved-Unicode.YAML-tmLanguage
@@ -226,7 +226,12 @@ patterns:
       let 'async def' be matched *first*.
 
   name: keyword.control.flow.python
-  match: (?x)\b(async|await|break|continue|elif|else|except|finally|for|if|pass|raise|return|try|while|with|(yield(?:\s+from)?))\b
+  match: |
+        (?x) \b(
+          async | await | break | continue | elif | else | except | finally | for |
+          if | pass | raise | return | try | while | with |
+          (yield(?:\s+from)?)
+        )\b
 
 - name: meta.function.inline.python
   begin: (lambda)(?=\s+|:)
@@ -501,7 +506,20 @@ repository:
   builtin_functions:
     patterns:
     - name: meta.function-call.python
-      begin: (?<!\.)(__import__|abs|all|any|ascii|basestring|bin|bool|bytearray|bytes|callable|chr|classmethod|cmp|compile|complex|delattr|dict|dir|divmod|enumerate|eval|exec|execfile|file|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|isinstance|issubclass|iter|len|list|locals|long|map|max|memoryview|min|next|object|oct|open|ord|pow|print|property|range|raw_input|reduce|reload|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|unichr|unicode|vars|xrange|zip)\s*(?=(\())
+      begin: |
+        (?x)
+          (?<!\.)(
+            __import__ | abs | all | any | ascii | basestring | bin | bool | bytearray |
+            bytes | callable | chr | classmethod | cmp | compile | complex | delattr |
+            dict | dir | divmod | enumerate | eval | exec | execfile | file | filter |
+            float | format | frozenset | getattr | globals | hasattr | hash | help |
+            hex | id | input | int | isinstance | issubclass | iter | len | list |
+            locals | long | map | max | memoryview | min | next | object | oct | open |
+            ord | pow | print | property | range | raw_input | reduce | reload | repr |
+            reversed | round | set | setattr | slice | sorted | staticmethod | str |
+            sum | super | tuple | type | unichr | unicode | vars | xrange | zip)
+          \s*
+          (?=(\())
       beginCaptures:
         '1': {name: support.function.builtin.python}
         '2': {name: punctuation.definition.arguments.begin.python}
@@ -524,7 +542,15 @@ repository:
 
   builtin_types:
     name: support.type.python
-    match: (?<!\.)\b(ascii|basestring|bin|bool|buffer|bytearray|bytes|classmethod|complex|dict|file|float|frozenset|hex|int|list|long|object|oct|property|reversed|set|slice|staticmethod|str|super|tuple|type|unicode|xrange)\b
+    match: |
+      (?x)
+        (?<!\.)
+        \b(
+          ascii | basestring | bin | bool | buffer | bytearray | bytes | classmethod |
+          complex | dict | file | float | frozenset | hex | int | list | long |
+          object | oct | property | reversed | set | slice | staticmethod | str |
+          super | tuple | type | unicode | xrange)
+        \b
 
   character-class:
     patterns:
@@ -578,7 +604,12 @@ repository:
       - include: '#string_quoted_single'
 
   dotted_name:
-    begin: (?=(?:\.(?!\s+import)\s*)?[\p{Alpha}_][\p{Alnum}_]*(?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*)
+    begin: |
+      (?x)(?=
+        (?:\.(?!\s+import)\s*)?
+        [\p{Alpha}_][\p{Alnum}_]*
+        (?:\s*\.\s*[\p{Alpha}_][\p{Alnum}_]*)*
+      )
     end: (?![\p{Alnum}_\.\s])|(?=(?<!\.)\s+[^.])|$
     # contentName: meta.dotted-name.python
     patterns:
@@ -616,8 +647,29 @@ repository:
 
   errors_warnings_exceptions:
     name: support.type.exception.python
-    match: (?x)\b((Arithmetic|Assertion|Attribute|Buffer|BlockingIO|BrokenPipe|ChildProcess|(Connection(Aborted|Refused|Reset)?)|EOF|Environment|FileExists|FileNotFound|FloatingPoint|IO|Import|Indentation|Index|Interrupted|IsADirectory|NotADirectory|Permission|ProcessLookup|Timeout|Key|Lookup|Memory|Name|NotImplemented|OS|Overflow|Reference|Runtime|Recursion|Standard|Syntax|System|Tab|Type|UnboundLocal|Unicode(Encode|Decode|Translate)?|Value|VMS|Windows|ZeroDivision|([\.\p{Alpha}_][\p{Alnum}_]*))?Error|((Pending)?Deprecation|Runtime|Syntax|User|Future|Import|Unicode|Bytes|Resource)?Warning|SystemExit|Stop(Async)?Iteration|NotImplemented|KeyboardInterrupt|GeneratorExit|([\.\p{Alpha}_][\p{Alnum}_]*)?Exception)\b
-
+    match: |
+      (?x)
+      \b(
+        (
+          Arithmetic | Assertion | Attribute | Buffer | BlockingIO | BrokenPipe |
+          ChildProcess |
+            (Connection(Aborted | Refused | Reset)?) |
+          EOF | Environment | FileExists | FileNotFound | FloatingPoint | IO |
+          Import | Indentation | Index | Interrupted | IsADirectory | NotADirectory |
+          Permission | ProcessLookup | Timeout | Key | Lookup | Memory | Name |
+          NotImplemented | OS | Overflow | Reference | Runtime | Recursion | Standard |
+          Syntax | System | Tab | Type | UnboundLocal |
+          Unicode(Encode | Decode | Translate)? | Value | VMS | Windows | ZeroDivision |
+          ([\.\p{Alpha}_][\p{Alnum}_]*))
+        ? Error
+        | (
+          (Pending)?Deprecation | Bytes | Future | Import | Resource | Runtime |
+          Syntax | Unicode | User)
+        ?Warning
+        |
+          SystemExit | Stop(Async)?Iteration | NotImplemented | KeyboardInterrupt |
+          GeneratorExit | ([\.\p{Alpha}_][\p{Alnum}_]*)?Exception)
+      \b
   escaped_char:
     match: (\\x[\h]{2})|(\\[0-7]{3})|(\\\n)|(\\\\)|(\\\")|(\\')|(\\a)|(\\b)|(\\f)|(\\n)|(\\r)|(\\t)|(\\v)
     captures:
@@ -660,7 +712,13 @@ repository:
 
   illegal_names:
     name: invalid.illegal.name.python
-    match: \b(and|as|assert|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|print|raise|return|try|while|with|yield)\b
+    match: |
+      (?x)
+      \b (
+        and | as | assert | await | break | class | continue | def | del | elif | else |
+        except | exec | finally | for | from | global | if | import | in | is | lambda |
+        nonlocal | not | or | pass | print | raise | return | try | while | with | yield)
+      \b
 
   keyword_arguments:
     begin: \b([\p{Alpha}_][\p{Alnum}_]*)\s*(=)(?!=)
@@ -685,7 +743,24 @@ repository:
   magic_function_names:
     comment: these methods have magic interpretation by python and are generally called
       indirectly through syntactic constructs
-    match: (\.)?\b(__(?:abs|add|and|bool|call|ceil|cmp|complex|contains|copy|deepcopy|del|delattr|delete|delitem|delslice|dir|div|divmod|enter|eq|exit|float|floor|floordiv|format|ge|get|getattr|getattribute|getinitargs|getitem|getnewargs|getslice|getstate|gt|hash|hex|iadd|iand|idiv|ifloordiv|ilshift|imod|imul|index|init|instancecheck|int|invert|ior|ipow|irshift|isub|iter|itruediv|ixor|le|len|long|lshift|lt|missing|mod|mul|ne|neg|new|nonzero|oct|or|pos|pow|radd|rand|rdiv|rdivmod|reduce|reduce_ex|repr|reversed|rfloordiv|rlshift|rmod|rmul|ror|round|rpow|rrshift|rshift|rsub|rtruediv|rxor|set|setattr|setitem|setslice|setstate|sizeof|str|sub|subclasscheck|truediv|trunc|unicode|xor)__)\b
+    match: |
+      (?x)
+      (\.)?
+      \b (
+        __(?:abs | add | and | bool | call | ceil | cmp | complex | contains | copy |
+          deepcopy | del | delattr | delete | delitem | delslice | dir | div | divmod |
+          enter | eq | exit | float | floor | floordiv | format | ge | get | getattr |
+          getattribute | getinitargs | getitem | getnewargs | getslice | getstate |
+          gt | hash | hex | iadd | iand | idiv | ifloordiv | ilshift | imod | imul |
+          index | init | instancecheck | int | invert | ior | ipow | irshift | isub |
+          iter | itruediv | ixor | le | len | long | lshift | lt | missing | mod |
+          mul | ne | neg | new | nonzero | oct | or | pos | pow | radd | rand | rdiv |
+          rdivmod | reduce | reduce_ex | repr | reversed | rfloordiv | rlshift | rmod |
+          rmul | ror | round | rpow | rrshift | rshift | rsub | rtruediv | rxor | set |
+          setattr | setitem | setslice | setstate | sizeof | str | sub | subclasscheck |
+          truediv | trunc | unicode | xor)
+        __)
+      \b
     captures:
       '2': {name: support.function.magic.python}
 
