From e671ee9722f1a2da17157c3f6021225d208ac363 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 4 Oct 2017 18:15:42 +0200
Subject: [PATCH] Improved fix for #23850

---
 extensions/cpp/syntaxes/c.json                | 22 ++++++++---------
 .../test/colorize-results/test-23630_cpp.json | 24 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/extensions/cpp/syntaxes/c.json b/extensions/cpp/syntaxes/c.json
index c81bd51eadc..d02d09bdaeb 100644
--- a/extensions/cpp/syntaxes/c.json
+++ b/extensions/cpp/syntaxes/c.json
@@ -780,7 +780,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -860,7 +860,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1013,7 +1013,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1050,7 +1050,7 @@
 							"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 							"patterns": [
 								{
-									"begin": "\\G",
+									"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 									"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 									"name": "meta.preprocessor.c",
 									"patterns": [
@@ -1110,7 +1110,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1147,7 +1147,7 @@
 							"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 							"patterns": [
 								{
-									"begin": "\\G",
+									"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 									"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 									"name": "meta.preprocessor.c",
 									"patterns": [
@@ -1194,7 +1194,7 @@
 			"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 			"patterns": [
 				{
-					"begin": "\\G",
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
@@ -1253,7 +1253,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1355,7 +1355,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
 							"name": "meta.preprocessor.c",
 							"patterns": [
@@ -1444,7 +1444,7 @@
 			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
-					"begin": "\\G",
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
@@ -1531,7 +1531,7 @@
 			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
-					"begin": "\\G",
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
 					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
 					"name": "meta.preprocessor.c",
 					"patterns": [
diff --git a/extensions/cpp/test/colorize-results/test-23630_cpp.json b/extensions/cpp/test/colorize-results/test-23630_cpp.json
index 0f6ce5827ae..f22786a105f 100644
--- 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",
+		"t": "source.cpp meta.preprocessor.c keyword.control.directive.conditional.c punctuation.definition.directive.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"
+			"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 entity.name.function.preprocessor.c",
+		"t": "source.cpp meta.preprocessor.c keyword.control.directive.conditional.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"
+			"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
-- 
GitLab