Merge branch 'master' of github.com:KokaKiwi/sublime-rust

Conflicts:
	Rust.JSON-tmLanguage
	Rust.tmLanguage

Author: KokaKiwi

Rust.JSON-tmLanguage

@@ -5,7 +5,7 @@
   "foldingStopMarker": "^\\s*\\}",
   "patterns": [
     {"name": "variable.other.source.rust",
-     "match": "'[a-zA-Z_][a-zA-Z0-9_]*[^\\']"
+     "match": "'[a-zA-Z_][a-zA-Z0-9_]*(?=[^\'])"
     },
     {"name": "string.quoted.single.source.rust",
      "begin": "'",
@@ -22,14 +22,15 @@
      ]
     },
     {"name": "meta.function.source.rust",
-     "match": "\\b(fn)\\s+([a-zA-Z_][a-zA-Z0-9_]?)[\\w\\:,+ \\'<>]*\\s*\\(",
+     "match": "\\b(fn)\\s+([a-zA-Z_][a-zA-Z0-9_]?[\\w\\:,+ \\'<>]*)\\s*(\\()",
      "captures": {
         "1": {"name": "keyword.source.rust"},
-        "2": {"name": "entity.name.function.source.rust"}
+        "2": {"name": "entity.name.function.source.rust"},
+        "3": {"name": "keyword.operator.rust"}
         }
     },
     {"name": "keyword.source.rust",
-     "match": "\\b(as|break|claim|const|copy|Copy|crate|do|drop|else|extern|for|if|in|impl|let|loop|match|mod|mut|Owned|priv|pub|pure|ref|return|unsafe|use|while|mod|Send|static|trait|struct|enum|type)\\b"
+     "match": "\\b(as|break|claim|const|copy|Copy|crate|do|drop|else|extern|for|if|impl|in|let|loop|match|mod|mut|Owned|priv|pub|pure|ref|return|unsafe|use|while|mod|Send|static|trait|struct|enum|type)\\b"
     },
     {"name": "storage.type.source.rust",
      "match": "\\b(Self|m32|m64|m128|f80|f16|f128|int|uint|float|char|bool|u8|u16|u32|u64|f32|f64|i8|i16|i32|i64|str|Option|Either|c_float|c_double|c_void|FILE|fpos_t|DIR|dirent|c_char|c_schar|c_uchar|c_short|c_ushort|c_int|c_uint|c_long|c_ulong|size_t|ptrdiff_t|clock_t|time_t|c_longlong|c_ulonglong|intptr_t|uintptr_t|off_t|dev_t|ino_t|pid_t|mode_t|ssize_t)\\b"
@@ -43,8 +44,17 @@
     {"name": "support.constant.source.rust",
      "match": "\\b(EXIT_FAILURE|EXIT_SUCCESS|RAND_MAX|EOF|SEEK_SET|SEEK_CUR|SEEK_END|_IOFBF|_IONBF|_IOLBF|BUFSIZ|FOPEN_MAX|FILENAME_MAX|L_tmpnam|TMP_MAX|O_RDONLY|O_WRONLY|O_RDWR|O_APPEND|O_CREAT|O_EXCL|O_TRUNC|S_IFIFO|S_IFCHR|S_IFBLK|S_IFDIR|S_IFREG|S_IFMT|S_IEXEC|S_IWRITE|S_IREAD|S_IRWXU|S_IXUSR|S_IWUSR|S_IRUSR|F_OK|R_OK|W_OK|X_OK|STDIN_FILENO|STDOUT_FILENO|STDERR_FILENO)\\b"
     },
-    {"name": "meta.preprocessor.source.rust",
-     "match": "\\b(\\w\\(\\w\\)*!)|(#\\[[\\w=\\(\\)_]+\\])\\b"
+    {"name": "comment.block.preprocessor.rust",
+     "match": "^(\\w\\(\\w\\)*!)|(#\\[[\\w=\\(\\)_]+\\])$"
+    },
+    {"name": "keyword.operator.rust",
+     "match": "\\{|\\}"
+    },
+    {"name": "keyword.operator.rust",
+     "match": "\\[|\\]"
+    },
+    {"name": "keyword.operator.rust",
+     "match": "\\(|\\)"
     },
     {"name": "constant.numeric.integer.source.rust",
      "match": "\\b(([0-9][0-9_]*)|([0-9][0-9_]*(u|u8|u16|u32|u64))|([0-9][0-9_]*(i|i8|i16|i32|i64)))\\b"
@@ -69,6 +79,12 @@
     {"name": "comment.block.source.rust",
      "begin": "/\\*",
      "end": "\\*/"
+    },
+    {"name": "keyword.operator.rust",
+     "match": "(=>)|(->)|[-:=*,!.+|%/&amp;~@<>;]"
+    },
+    {"name": "support.function.rust",
+     "match": "_"
     }
   ],
   "repository": {
@@ -78,4 +94,4 @@
     }
   },
   "uuid": "4339386b-4d67-4f0e-9e78-09ecbcddf71d"
-}
+}

Rust.tmLanguage

@@ -17,7 +17,7 @@
 	<array>
 		<dict>
 			<key>match</key>
-			<string>'[a-zA-Z_][a-zA-Z0-9_]*[^\']</string>
+			<string>'[a-zA-Z_][a-zA-Z0-9_]*(?=[^\'])</string>
 			<key>name</key>
 			<string>variable.other.source.rust</string>
 		</dict>
@@ -64,9 +64,14 @@
 					<key>name</key>
 					<string>entity.name.function.source.rust</string>
 				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.operator.rust</string>
+				</dict>
 			</dict>
 			<key>match</key>
-			<string>\b(fn)\s+([a-zA-Z_][a-zA-Z0-9_]?[\w\:,+ \'&lt;&gt;]*)\s*\(</string>
+			<string>\b(fn)\s+([a-zA-Z_][a-zA-Z0-9_]?[\w\:,+ \'&lt;&gt;]*)\s*(\()</string>
 			<key>name</key>
 			<string>meta.function.source.rust</string>
 		</dict>
@@ -102,9 +107,27 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(\w\(\w\)*!)|(#\[[\w=\(\)_]+\])\b</string>
+			<string>^(\w\(\w\)*!)|(#\[[\w=\(,\s\)_]+\])$</string>
+			<key>name</key>
+			<string>comment.block.preprocessor.rust</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\{|\}</string>
+			<key>name</key>
+			<string>keyword.operator.rust</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\(|\)</string>
 			<key>name</key>
-			<string>meta.preprocessor.source.rust</string>
+			<string>keyword.operator.rust</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\[|\]</string>
+			<key>name</key>
+			<string>keyword.operator.rust</string>
 		</dict>
 		<dict>
 			<key>match</key>
@@ -154,6 +177,18 @@
 			<key>name</key>
 			<string>comment.block.source.rust</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>(=&gt;)|(-&gt;)|[-:=*,!.+|%/&amp;~@&lt;&gt;;]</string>
+			<key>name</key>
+			<string>keyword.operator.rust</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>_</string>
+			<key>name</key>
+			<string>support.function.rust</string>
+		</dict>
 	</array>
 	<key>repository</key>
 	<dict>