Merge pull request #29 from MattDMo/master

update work with master (1.4.2)

Author: Matt Morrison

PythonImproved.YAML-tmLanguage

@@ -4,7 +4,7 @@ comment: To make PythonImproved your default Python syntax, open a .py file and
 name: PythonImproved
 scopeName: source.python
 fileTypes: [py, py3, rpy, pyw, cpy, SConstruct, Sconstruct, sconstruct, SConscript]
-uuid: 0F24FCF1-6543-4CC6-8B33-2EAED401FE3A
+uuid: 11B0273F-0284-4483-B17B-4B8D0A9294CC
 
 patterns:
 - name: support.ipython.in.python
@@ -28,7 +28,8 @@ patterns:
   captures:
     '1': {name: punctuation.definition.comment.python}
 
-- comment: Match identifiers in ALL_CAPS as constants, except when followed by . or (.
+- comment: Match identifiers in ALL_CAPS as constants, except when followed by . or
+    (.
   name: constant.other.allcaps.python
   match: \b([A-Z_][A-Z0-9_]*)\b(?![\.\(])
 
@@ -360,7 +361,12 @@ patterns:
 
 - include: '#dotted_name'
 
-- match: \b(\[)(\s*(\]))\b
+- begin: (\()
+  end: (\))
+  patterns:
+  - include: $self
+
+- match: (\[)(\s*(\]))\b
   captures:
     '1': {name: punctuation.definition.list.begin.python}
     '2': {name: meta.empty-list.python}
@@ -389,22 +395,6 @@ patterns:
     '2': {name: meta.empty-tuple.python}
     '3': {name: punctuation.definition.tuple.end.python}
 
-- name: meta.structure.tuple.python
-  begin: \b(\()
-  beginCaptures:
-    '1': {name: punctuation.definition.tuple.begin.python}
-  end: (\))\b
-  endCaptures:
-    '1': {name: punctuation.definition.tuple.end.python}
-  patterns:
-  - contentName: meta.structure.tuple.item.python
-    begin: (?<=\(|\,)\s*(?![\),])
-    end: \s*(?:(,)|(?=\)))
-    endCaptures:
-      '1': {name: punctuation.separator.tuple.python}
-    patterns:
-    - include: $self
-
 - name: meta.structure.dictionary.python
   match: (\{)(\s*(\}))
   captures:
@@ -501,7 +491,8 @@ repository:
         patterns:
         - include: '#keyword_arguments'
         - include: $self
-    - comment: "These are statements in Py2, but don't really fit into keyword.control.flow with the rest"
+    - comment: "These are statements in Py2, but don't really fit into keyword.control.flow\
+        \ with the rest"
       name: support.function.builtin.python
       match: (?<!\.)\b(print|del)\b
 
@@ -1040,7 +1031,7 @@ repository:
     - include: '#string_quoted_double'
     - include: '#string_quoted_single'
 author: Matt Morrison @MattDMo mattdmo@pigimal.com
-bundleUUID: 11B0273F-0284-4483-B17B-4B8D0A9294CC
+bundleUUID: 0F24FCF1-6543-4CC6-8B33-2EAED401FE3A
 firstLineMatch: ^#!/.*\bpython[0-9.-]*\b
 foldingStartMarker: ^\s*(def|class)\s+([.a-zA-Z0-9_ <]+)\s*(\((.*)\))?\s*:|\{\s*$|\(\s*$|\[\s*$|^\s*"""(?=.)(?!.*""")
 foldingStopMarker: ^\s*$|^\s*\}|^\s*\]|^\s*\)|^\s*"""\s*$

PythonImproved.tmLanguage

@@ -5,7 +5,7 @@
 	<key>author</key>
 	<string>Matt Morrison @MattDMo mattdmo@pigimal.com</string>
 	<key>bundleUUID</key>
-	<string>11B0273F-0284-4483-B17B-4B8D0A9294CC</string>
+	<string>0F24FCF1-6543-4CC6-8B33-2EAED401FE3A</string>
 	<key>comment</key>
 	<string>To make PythonImproved your default Python syntax, open a .py file and select View|Syntax|Open all with current extension as...|PythonImproved.</string>
 	<key>fileTypes</key>
@@ -1029,6 +1029,19 @@
 			<key>include</key>
 			<string>#dotted_name</string>
 		</dict>
+		<dict>
+			<key>begin</key>
+			<string>(\()</string>
+			<key>end</key>
+			<string>(\))</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>$self</string>
+				</dict>
+			</array>
+		</dict>
 		<dict>
 			<key>captures</key>
 			<dict>
@@ -1049,7 +1062,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>\b(\[)(\s*(\]))\b</string>
+			<string>(\[)(\s*(\]))\b</string>
 		</dict>
 		<dict>
 			<key>begin</key>
@@ -1125,56 +1138,6 @@
 			<key>name</key>
 			<string>meta.structure.tuple.python</string>
 		</dict>
-		<dict>
-			<key>begin</key>
-			<string>\b(\()</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tuple.begin.python</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(\))\b</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tuple.end.python</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.structure.tuple.python</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>(?&lt;=\(|\,)\s*(?![\),])</string>
-					<key>contentName</key>
-					<string>meta.structure.tuple.item.python</string>
-					<key>end</key>
-					<string>\s*(?:(,)|(?=\)))</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.separator.tuple.python</string>
-						</dict>
-					</dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>$self</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
 		<dict>
 			<key>captures</key>
 			<dict>
@@ -3334,6 +3297,6 @@
 	<key>scopeName</key>
 	<string>source.python</string>
 	<key>uuid</key>
-	<string>0F24FCF1-6543-4CC6-8B33-2EAED401FE3A</string>
+	<string>11B0273F-0284-4483-B17B-4B8D0A9294CC</string>
 </dict>
 </plist>

messages.json

@@ -3,5 +3,5 @@
   "1.2.1": "messages/1.2.1.txt",
   "1.3.0": "messages/1.3.0.txt",
   "1.3.1": "messages/1.3.1.txt",
-  "1.4.0": "messages/1.4.0.txt"
+  "1.4.2": "messages/1.4.2.txt"
 }

messages/1.4.0.txt messages/1.4.2.txtmessages/1.4.0.txt renamed to messages/1.4.2.txt

@@ -1,4 +1,4 @@
-Python Improved v1.4.0
+Python Improved v1.4.2
 ======================
 
 This is a "mid-way" release while I ponder some major changes to how functions,