Update C++ grammar to fix freeze

alexr00 · alexr00 · commit b8b79709b73a · 2019-05-21T11:19:36.000+02:00
diff --git a/extensions/cpp/cgmanifest.json b/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": "dc404ccf4eb08a5f76434e759b519f59051a32e5"
+					"commitHash": "e33a317ccd0babba4b07ffc042ab9796e6412ddc"
 				}
 			},
 			"license": "MIT",
-			"version": "1.8.13",
+			"version": "1.8.15",
 			"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."
 		},
 		{
diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.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/jeff-hykin/cpp-textmate-grammar/commit/48734a7a8b365c12aeb7551aed0090b49601ed70",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/e33a317ccd0babba4b07ffc042ab9796e6412ddc",
 	"name": "C",
 	"scopeName": "source.c",
 	"patterns": [
@@ -2162,6 +2162,9 @@
 						},
 						{
 							"include": "$base"
+						},
+						{
+							"include": "#block_innards"
 						}
 					]
 				},
@@ -2241,6 +2244,9 @@
 			"patterns": [
 				{
 					"include": "$base"
+				},
+				{
+					"include": "#block_innards"
 				}
 			]
 		},
diff --git a/extensions/cpp/syntaxes/cpp.tmLanguage.json b/extensions/cpp/syntaxes/cpp.tmLanguage.json

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`"git": {`
`7`	`7`	`"name": "jeff-hykin/cpp-textmate-grammar",`
`8`	`8`	`"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",`
`9`		`- "commitHash": "dc404ccf4eb08a5f76434e759b519f59051a32e5"`
	`9`	`+ "commitHash": "e33a317ccd0babba4b07ffc042ab9796e6412ddc"`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"license": "MIT",`
`13`		`- "version": "1.8.13",`
	`13`	`+ "version": "1.8.15",`
`14`	`14`	`"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."`
`15`	`15`	`},`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"If you want to provide a fix or improvement, please create a pull request against the original repository.",`
`5`	`5`	`"Once accepted there, we are happy to receive an update request."`
`6`	`6`	`],`
`7`		`- "version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/48734a7a8b365c12aeb7551aed0090b49601ed70",`
	`7`	`+ "version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/e33a317ccd0babba4b07ffc042ab9796e6412ddc",`
`8`	`8`	`"name": "C",`
`9`	`9`	`"scopeName": "source.c",`
`10`	`10`	`"patterns": [`
`@@ -2162,6 +2162,9 @@`
`2162`	`2162`	`},`
`2163`	`2163`	`{`
`2164`	`2164`	`"include": "$base"`
	`2165`	`+ },`
	`2166`	`+ {`
	`2167`	`+ "include": "#block_innards"`
`2165`	`2168`	`}`
`2166`	`2169`	`]`
`2167`	`2170`	`},`
`@@ -2241,6 +2244,9 @@`
`2241`	`2244`	`"patterns": [`
`2242`	`2245`	`{`
`2243`	`2246`	`"include": "$base"`
	`2247`	`+ },`
	`2248`	`+ {`
	`2249`	`+ "include": "#block_innards"`
`2244`	`2250`	`}`
`2245`	`2251`	`]`
`2246`	`2252`	`},`