From ccd3c1f94e64f7798ddf30d187274bd8905593fd Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 29 May 2017 15:50:50 +0200
Subject: [PATCH] [c++] grammar in endless loop. Fixes #23850

---
 extensions/cpp/OSSREADME.json                 |   2 +-
 extensions/cpp/syntaxes/c.json                |  22 ++--
 .../cpp/test/colorize-fixtures/test-23630.cpp |   3 +
 .../test/colorize-results/test-23630_cpp.json | 123 ++++++++++++++++++
 4 files changed, 138 insertions(+), 12 deletions(-)
 create mode 100644 extensions/cpp/test/colorize-fixtures/test-23630.cpp
 create mode 100644 extensions/cpp/test/colorize-results/test-23630_cpp.json

diff --git a/extensions/cpp/OSSREADME.json b/extensions/cpp/OSSREADME.json
index 58859a1b776..5137487d2ed 100644
--- a/extensions/cpp/OSSREADME.json
+++ b/extensions/cpp/OSSREADME.json
@@ -2,7 +2,7 @@
 [
 	{
 		"name": "atom/language-c",
-		"version": "0.51.3",
+		"version": "0.0.0",
 		"license": "MIT",
 		"repositoryURL": "https://github.com/atom/language-c",
 		"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from the Atom package https://atom.io/packages/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
diff --git a/extensions/cpp/syntaxes/c.json b/extensions/cpp/syntaxes/c.json
index 022f588cf28..b83b31ad22e 100644
--- a/extensions/cpp/syntaxes/c.json
+++ b/extensions/cpp/syntaxes/c.json
@@ -778,7 +778,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -858,7 +858,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1011,7 +1011,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1048,7 +1048,7 @@
 							"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 							"patterns": [
 								{
-									"begin": "\\G",
+									"begin": "\\G(?=.)",
 									"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 									"name": "meta.preprocessor.c",
 									"patterns": [
@@ -1108,7 +1108,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1145,7 +1145,7 @@
 							"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 							"patterns": [
 								{
-									"begin": "\\G",
+									"begin": "\\G(?=.)",
 									"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 									"name": "meta.preprocessor.c",
 									"patterns": [
@@ -1192,7 +1192,7 @@
 			"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 			"patterns": [
 				{
-					"begin": "\\G",
+					"begin": "\\G(?=.)",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
@@ -1251,7 +1251,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1353,7 +1353,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1442,7 +1442,7 @@
 			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
-					"begin": "\\G",
+					"begin": "\\G(?=.)",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
@@ -1529,7 +1529,7 @@
 			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
-					"begin": "\\G",
+					"begin": "\\G(?=.)",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
diff --git a/extensions/cpp/test/colorize-fixtures/test-23630.cpp b/extensions/cpp/test/colorize-fixtures/test-23630.cpp
new file mode 100644
index 00000000000..b4ad835f5f3
--- /dev/null
+++ b/extensions/cpp/test/colorize-fixtures/test-23630.cpp
@@ -0,0 +1,3 @@
+#ifndef _UCRT
+    #define _UCRT
+#endif
\ No newline at end of file
diff --git a/extensions/cpp/test/colorize-results/test-23630_cpp.json b/extensions/cpp/test/colorize-results/test-23630_cpp.json
new file mode 100644
index 00000000000..f22786a105f
--- /dev/null
+++ b/extensions/cpp/test/colorize-results/test-23630_cpp.json
@@ -0,0 +1,123 @@
+[
+	{
+		"c": "#",
+		"t": "source.cpp meta.preprocessor.c keyword.control.directive.conditional.c punctuation.definition.directive.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"
+		}
+	},
+	{
+		"c": "ifndef",
+		"t": "source.cpp meta.preprocessor.c keyword.control.directive.conditional.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"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cpp meta.preprocessor.c",
+		"r": {
+			"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": "_UCRT",
+		"t": "source.cpp meta.preprocessor.c entity.name.function.preprocessor.c",
+		"r": {
+			"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"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.cpp meta.preprocessor.macro.c",
+		"r": {
+			"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": "#",
+		"t": "source.cpp meta.preprocessor.macro.c keyword.control.directive.define.c punctuation.definition.directive.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"
+		}
+	},
+	{
+		"c": "define",
+		"t": "source.cpp meta.preprocessor.macro.c keyword.control.directive.define.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"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cpp meta.preprocessor.macro.c",
+		"r": {
+			"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": "_UCRT",
+		"t": "source.cpp meta.preprocessor.macro.c entity.name.function.preprocessor.c",
+		"r": {
+			"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"
+		}
+	},
+	{
+		"c": "#",
+		"t": "source.cpp meta.preprocessor.c keyword.control.directive.conditional.c punctuation.definition.directive.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"
+		}
+	},
+	{
+		"c": "endif",
+		"t": "source.cpp meta.preprocessor.c keyword.control.directive.conditional.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"
+		}
+	}
+]
\ No newline at end of file