Fix: TOML table to avoid splitting brackets from key (#4045)

* Fix: toml parsing for table headers places punctuation and key under one parent token

* comments from code review

* Update src/languages/toml.js

Co-authored-by: Dmitry Sharabin <dmitrysharabin@gmail.com>

* remove unused regex

---------

Co-authored-by: Dmitry Sharabin <dmitrysharabin@gmail.com>

Author: alasdairwilson

src/languages/toml.js

@@ -3,35 +3,36 @@ export default {
 	id: 'toml',
 	grammar () {
 		const key = /(?:[\w-]+|'[^'\n\r]*'|"(?:\\.|[^\\"\r\n])*")/.source;
-
-		/**
-		 *
-		 * @param {string} pattern
-		 * @returns {string}
-		 */
-		function insertKey (pattern) {
-			return pattern.replace(/__/g, () => key);
-		}
+		const dottedKey = key + '(?:\\s*\\.\\s*' + key + ')*';
 
 		return {
 			'comment': {
 				pattern: /#.*/,
 				greedy: true,
 			},
 			'table': {
+				// keep entire table header (including brackets) under one parent token
 				pattern: RegExp(
-					insertKey(/(^[\t ]*\[\s*(?:\[\s*)?)__(?:\s*\.\s*__)*(?=\s*\])/.source),
+					'(^[\\t ]*)(?:\\[\\[\\s*' +
+						dottedKey +
+						'\\s*\\]\\]|\\[\\s*' +
+						dottedKey +
+						'\\s*\\])(?!\\])',
 					'm'
 				),
 				lookbehind: true,
 				greedy: true,
-				alias: 'class-name',
+				inside: {
+					'table-name': {
+						pattern: RegExp('(^\\[\\[?\\s*)' + dottedKey),
+						lookbehind: true,
+						alias: 'variable',
+					},
+					'punctuation': /\[|\]/,
+				},
 			},
 			'key': {
-				pattern: RegExp(
-					insertKey(/(^[\t ]*|[{,]\s*)__(?:\s*\.\s*__)*(?=\s*=)/.source),
-					'm'
-				),
+				pattern: RegExp('(^[\\t ]*|[{,]\\s*)' + dottedKey + '(?=\\s*=)', 'm'),
 				lookbehind: true,
 				greedy: true,
 				alias: 'property',

tests/languages/toml/table_feature.test

@@ -1,20 +1,59 @@
 [table]
 [[array]]
+[a.b]
+[[a.b]]
+[name] # trailing comment
+[name]]
+[[name]
+[name
+name]
 
 # not a table
 foo = [ "bar" ]
 
 ----------------------------------------------------
 
 [
+	["table", [
+		["punctuation", "["],
+		["table-name", "table"],
+		["punctuation", "]"]
+	]],
+	["table", [
+		["punctuation", "["],
+		["punctuation", "["],
+		["table-name", "array"],
+		["punctuation", "]"],
+		["punctuation", "]"]
+	]],
+	["table", [
+		["punctuation", "["],
+		["table-name", "a.b"],
+		["punctuation", "]"]
+	]],
+	["table", [
+		["punctuation", "["],
+		["punctuation", "["],
+		["table-name", "a.b"],
+		["punctuation", "]"],
+		["punctuation", "]"]
+	]],
+	["table", [
+		["punctuation", "["],
+		["table-name", "name"],
+		["punctuation", "]"]
+	]],
+	["comment", "# trailing comment"],
 	["punctuation", "["],
-	["table", "table"],
+	"name",
+	["punctuation", "]"],
 	["punctuation", "]"],
-
 	["punctuation", "["],
 	["punctuation", "["],
-	["table", "array"],
+	"name",
 	["punctuation", "]"],
+	["punctuation", "["],
+	"name\r\nname",
 	["punctuation", "]"],
 
 	["comment", "# not a table"],