From 8db9d10d0ffb5b52f9e1ad2d7c94542eb9727730 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Tue, 30 May 2023 12:00:59 -0700
Subject: [PATCH] Fix nested comment colorization (#23245)

---
 extensions/sql/cgmanifest.json              |  6 ++---
 extensions/sql/syntaxes/sql.tmLanguage.json | 28 +++++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/extensions/sql/cgmanifest.json b/extensions/sql/cgmanifest.json
index 82846c1e67..a3092ba903 100644
--- a/extensions/sql/cgmanifest.json
+++ b/extensions/sql/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "microsoft/vscode-mssql",
 					"repositoryUrl": "https://github.com/microsoft/vscode-mssql",
-					"commitHash": "3929516cce0a570e91ee1be74b09ed886cb360f4"
+					"commitHash": "cb5940297a8cef76daaf4a6b63c4968c9a12d17a"
 				}
 			},
 			"license": "MIT",
-			"version": "1.19.0"
+			"version": "1.20.0"
 		}
 	],
 	"version": 1
-}
+}
\ No newline at end of file
diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json
index a3399137d3..8b214cb722 100644
--- a/extensions/sql/syntaxes/sql.tmLanguage.json
+++ b/extensions/sql/syntaxes/sql.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/microsoft/vscode-mssql/commit/3929516cce0a570e91ee1be74b09ed886cb360f4",
+	"version": "https://github.com/microsoft/vscode-mssql/commit/cb5940297a8cef76daaf4a6b63c4968c9a12d17a",
 	"name": "SQL",
 	"scopeName": "source.sql",
 	"patterns": [
@@ -424,14 +424,22 @@
 					"patterns": []
 				},
 				{
-					"begin": "/\\*",
-					"captures": {
-						"0": {
-							"name": "punctuation.definition.comment.sql"
-						}
-					},
-					"end": "\\*/",
-					"name": "comment.block.c"
+					"include": "#comment-block"
+				}
+			]
+		},
+		"comment-block": {
+			"begin": "/\\*",
+			"captures": {
+				"0": {
+					"name": "punctuation.definition.comment.sql"
+				}
+			},
+			"end": "\\*/",
+			"name": "comment.block",
+			"patterns": [
+				{
+					"include": "#comment-block"
 				}
 			]
 		},
@@ -624,4 +632,4 @@
 			]
 		}
 	}
-}
+}
\ No newline at end of file