Merge branch 'master' into joh/snaps

adarsh2397 · Jul 11, 2017 · 09bcb50 · 09bcb50
2 parents 53285a0 + 7bb3b89
commit 09bcb50
Show file tree

Hide file tree

Showing 26 changed files with 1,184 additions and 654 deletions.
diff --git a/build/tfs/common/publish.ts b/build/tfs/common/publish.ts
@@ -178,6 +178,9 @@ async function publish(commit: string, quality: string, platform: string, type:
 	const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
 		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
 
+	// mooncake is fussy and far away, this is needed!
+	mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+
 	await Promise.all([
 		assertContainer(blobService, quality),
 		assertContainer(mooncakeBlobService, quality)

diff --git a/extensions/cpp/syntaxes/c++.json b/extensions/cpp/syntaxes/c++.json
@@ -4,6 +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-c/commit/3a269f88b12e512fb9495dc006a1dabf325d3d7f",
 	"scopeName": "source.cpp",
 	"fileTypes": [
 		"cc",

diff --git a/extensions/cpp/syntaxes/c.json b/extensions/cpp/syntaxes/c.json
@@ -4,10 +4,12 @@
 		"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-c/commit/0a57fd7ee32bd14e3ee8291434263d744a8ecf1e",
 	"scopeName": "source.c",
 	"fileTypes": [
 		"c",
-		"h.in"
+		"h.in",
+		"xpm"
 	],
 	"firstLineMatch": "(?i)-\\*-[^*]*(Mode:\\s*)?C(\\s*;.*?)?\\s*-\\*-",
 	"name": "C",
@@ -273,7 +275,7 @@
 			"include": "#parens"
 		},
 		{
-			"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()\n(?=\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
+			"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()\n(?=\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
 			"end": "(?<=\\))(?!\\w)",
 			"name": "meta.function.c",
 			"patterns": [
@@ -404,7 +406,7 @@
 			]
 		},
 		"c_function_call": {
-			"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(?=\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
+			"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate)\\s*\\()\n(?=\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
 			"end": "(?<=\\))(?!\\w)",
 			"name": "meta.function-call.c",
 			"patterns": [
@@ -778,7 +780,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G(?=.)",
+							"begin": "\\G",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -858,7 +860,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G(?=.)",
+							"begin": "\\G",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1011,7 +1013,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G(?=.)",
+							"begin": "\\G",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1048,7 +1050,7 @@
 							"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 							"patterns": [
 								{
-									"begin": "\\G(?=.)",
+									"begin": "\\G",
 									"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 									"name": "meta.preprocessor.c",
 									"patterns": [
@@ -1108,7 +1110,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G(?=.)",
+							"begin": "\\G",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1145,7 +1147,7 @@
 							"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 							"patterns": [
 								{
-									"begin": "\\G(?=.)",
+									"begin": "\\G",
 									"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 									"name": "meta.preprocessor.c",
 									"patterns": [
@@ -1192,7 +1194,7 @@
 			"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 			"patterns": [
 				{
-					"begin": "\\G(?=.)",
+					"begin": "\\G",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
@@ -1251,7 +1253,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G(?=.)",
+							"begin": "\\G",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1353,7 +1355,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G(?=.)",
+							"begin": "\\G",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1442,7 +1444,7 @@
 			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
-					"begin": "\\G(?=.)",
+					"begin": "\\G",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
@@ -1529,7 +1531,7 @@
 			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
-					"begin": "\\G(?=.)",
+					"begin": "\\G",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
@@ -1674,7 +1676,7 @@
 					"name": "punctuation.section.parens.end.bracket.round.c"
 				},
 				{
-					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()\n(?=\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()\n(?=\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
 					"end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
 					"name": "meta.function.c",
 					"patterns": [
@@ -1790,7 +1792,7 @@
 					"include": "#operators"
 				},
 				{
-					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.c"
@@ -1850,7 +1852,7 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.c"
@@ -1910,7 +1912,7 @@
 					"include": "#operators"
 				},
 				{
-					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.c"

diff --git a/extensions/cpp/test/colorize-results/test-23630_cpp.json b/extensions/cpp/test/colorize-results/test-23630_cpp.json
@@ -100,24 +100,24 @@
 	},
 	{
 		"c": "#",
-		"t": "source.cpp meta.preprocessor.c keyword.control.directive.conditional.c punctuation.definition.directive.c",
+		"t": "source.cpp meta.preprocessor.c",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "meta.preprocessor: #569CD6",
+			"light_plus": "meta.preprocessor: #0000FF",
+			"dark_vs": "meta.preprocessor: #569CD6",
+			"light_vs": "meta.preprocessor: #0000FF",
+			"hc_black": "meta.preprocessor: #569CD6"
 		}
 	},
 	{
 		"c": "endif",
-		"t": "source.cpp meta.preprocessor.c keyword.control.directive.conditional.c",
+		"t": "source.cpp meta.preprocessor.c entity.name.function.preprocessor.c",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "meta.preprocessor: #569CD6",
+			"light_vs": "meta.preprocessor: #0000FF",
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	}
 ]
diff --git a/extensions/javascript/package.json b/extensions/javascript/package.json
@@ -102,14 +102,14 @@
         "fileMatch": "bower.json",
         "url": "http://json.schemastore.org/bower"
       },
-      {
-        "fileMatch": ".bower.json",
-        "url": "http://json.schemastore.org/bower"
-      },
       {
         "fileMatch": ".bowerrc",
         "url": "http://json.schemastore.org/bowerrc"
       },
+      {
+        "fileMatch": ".babelrc",
+        "url": "http://json.schemastore.org/babelrc"
+      },
       {
         "fileMatch": "jsconfig.json",
         "url": "http://json.schemastore.org/jsconfig"

diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.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-php/commit/e1290265f3d68316347e0ab2665686016b4b24b7",
+	"version": "https://github.com/atom/language-php/commit/16d8c3ea6f30c808e270a7be02a33e27ed19eed0",
 	"scopeName": "text.html.php",
 	"name": "PHP",
 	"fileTypes": [
@@ -449,6 +449,10 @@
 				{
 					"include": "#comments"
 				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.php"
+				},
 				{
 					"begin": "(?xi)\n(array)                                                            # Typehint\n\\s+((&)?\\s*(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable name with possible reference\n\\s*(=)\\s*(array)\\s*(\\()                                        # Default value",
 					"beginCaptures": {
@@ -535,21 +539,34 @@
 					}
 				},
 				{
-					"begin": "(?xi)\n([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)                               # Typehinted class name\n\\s*((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable name with possible reference",
+					"begin": "(?xi)\n(\\\\?(?:[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\\\)*)                 # Optional namespace\n([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)                               # Typehinted class name\n\\s+((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable name with possible reference",
 					"beginCaptures": {
 						"1": {
-							"name": "storage.type.php"
+							"name": "support.other.namespace.php",
+							"patterns": [
+								{
+									"match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+									"name": "storage.type.php"
+								},
+								{
+									"match": "\\\\",
+									"name": "punctuation.separator.inheritance.php"
+								}
+							]
 						},
 						"2": {
-							"name": "variable.other.php"
+							"name": "storage.type.php"
 						},
 						"3": {
-							"name": "storage.modifier.reference.php"
+							"name": "variable.other.php"
 						},
 						"4": {
-							"name": "keyword.operator.variadic.php"
+							"name": "storage.modifier.reference.php"
 						},
 						"5": {
+							"name": "keyword.operator.variadic.php"
+						},
+						"6": {
 							"name": "punctuation.definition.variable.php"
 						}
 					},
@@ -1760,13 +1777,10 @@
 					"name": "keyword.control.exception.php"
 				},
 				{
-					"begin": "(?i)\\b(function)\\s*(&)?\\s*(?=\\()",
+					"begin": "(?i)\\b(function)\\s*(?=\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.type.function.php"
-						},
-						"2": {
-							"name": "storage.modifier.reference.php"
 						}
 					},
 					"end": "(?={)",
@@ -1829,7 +1843,7 @@
 					]
 				},
 				{
-					"begin": "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\n\\s*(&)?\\s*\n(?i:\n  (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|tostring|\n        clone|set_state|sleep|wakeup|autoload|invoke|callStatic))\n  |([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n)\n\\s*(\\()",
+					"begin": "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\\s+\n(?i:\n  (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|tostring|\n        clone|set_state|sleep|wakeup|autoload|invoke|callStatic))\n  |([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n)\n\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"patterns": [
@@ -1843,15 +1857,12 @@
 							"name": "storage.type.function.php"
 						},
 						"3": {
-							"name": "storage.modifier.reference.php"
-						},
-						"4": {
 							"name": "support.function.magic.php"
 						},
-						"5": {
+						"4": {
 							"name": "entity.name.function.php"
 						},
-						"6": {
+						"5": {
 							"name": "punctuation.definition.parameters.begin.bracket.round.php"
 						}
 					},
@@ -2099,6 +2110,10 @@
 				},
 				{
 					"include": "#constants"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.php"
 				}
 			]
 		},