Update grammars

extensions/cpp/cgmanifest.json

@@ -6,11 +6,11 @@
 				"git": {
 					"name": "jeff-hykin/cpp-textmate-grammar",
 					"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
-					"commitHash": "d57808aa3db2242f1f2be1aec19649a852aaa52e"
+					"commitHash": "47f33650b7eee1cc3d5c9e72a85ac415797a08db"
 				}
 			},
 			"license": "MIT",
-			"version": "1.4.5",
+			"version": "1.6.7",
 			"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
 		},
 		{

extensions/css/cgmanifest.json

@@ -11,7 +11,7 @@
 			},
 			"license": "MIT",
 			"description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/octref/language-css which was derived from the Atom package https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
-			"version": "0.0.0"
+			"version": "0.42.11"
 		}
 	],
 	"version": 1

extensions/java/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "atom/language-java",
 					"repositoryUrl": "https://github.com/atom/language-java",
-					"commitHash": "f6d349a5ca698be25d3f48511888fe62d158e42c"
+					"commitHash": "a91b17906a2142bc61c06c6f214f135a2e3cdc96"
 				}
 			},
 			"license": "MIT",

extensions/java/syntaxes/java.tmLanguage.json

@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-java/commit/f6d349a5ca698be25d3f48511888fe62d158e42c",
+	"version": "https://github.com/atom/language-java/commit/a91b17906a2142bc61c06c6f214f135a2e3cdc96",
 	"name": "Java",
 	"scopeName": "source.java",
 	"patterns": [
@@ -124,15 +124,15 @@
 		"annotations": {
 			"patterns": [
 				{
-					"begin": "((@)[^\\s(]+)(\\()",
+					"begin": "((@)\\s*([^\\s(]+))(\\()",
 					"beginCaptures": {
-						"1": {
-							"name": "storage.type.annotation.java"
-						},
 						"2": {
 							"name": "punctuation.definition.annotation.java"
 						},
 						"3": {
+							"name": "storage.type.annotation.java"
+						},
+						"4": {
 							"name": "punctuation.definition.annotation-arguments.begin.bracket.round.java"
 						}
 					},
@@ -161,7 +161,7 @@
 					]
 				},
 				{
-					"match": "(@)(interface)\\s+(\\w*)|((@)\\w*)",
+					"match": "(@)(interface)\\s+(\\w*)|((@)\\s*(\\w+))",
 					"name": "meta.declaration.annotation.java",
 					"captures": {
 						"1": {
@@ -173,11 +173,11 @@
 						"3": {
 							"name": "storage.type.annotation.java"
 						},
-						"4": {
-							"name": "storage.type.annotation.java"
-						},
 						"5": {
 							"name": "punctuation.definition.annotation.java"
+						},
+						"6": {
+							"name": "storage.type.annotation.java"
 						}
 					}
 				}

extensions/python/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "MagicStack/MagicPython",
 					"repositoryUrl": "https://github.com/MagicStack/MagicPython",
-					"commitHash": "8ff35b3e5fcde471fae62a57ea1ae1c7cd34c9fc"
+					"commitHash": "38422d302fe0b3e7716d26ce8cd7d0b9685f3a38"
 				}
 			},
 			"license": "MIT",

extensions/python/syntaxes/MagicPython.tmLanguage.json

@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/MagicStack/MagicPython/commit/8ff35b3e5fcde471fae62a57ea1ae1c7cd34c9fc",
+	"version": "https://github.com/MagicStack/MagicPython/commit/38422d302fe0b3e7716d26ce8cd7d0b9685f3a38",
 	"name": "MagicPython",
 	"scopeName": "source.python",
 	"patterns": [
@@ -827,7 +827,7 @@
 			]
 		},
 		"f-expression": {
-			"comment": "All valid Python expressions, except comments and line cont",
+			"comment": "All valid Python expressions, except comments and line continuation",
 			"patterns": [
 				{
 					"include": "#expression-bare"