support commands block in gdb log format #44

Author: pirpyn

syntaxes/gdb-log.tmLanguage.json

@@ -10,6 +10,7 @@
 		"expression": {
 			"patterns": [
 				{ "include": "#prompt" },
+				{ "include": "#carret" },
 				{ "include": "#frame" },
 				{ "include": "#at_location" },
 				{ "include": "#in_function" },
@@ -27,6 +28,16 @@
 				}
 			]
 		},
+		"carret": {
+			"patterns": [
+				{
+					"name": "carret.gdb",
+					"begin": "(?:^|\\G)>",
+					"patterns": [ { "include": "source.gdb" } ],
+					"end": "$"
+				}
+			]
+		},
 		"frame": {
 			"patterns": [
 				{

syntaxes/gdb.tmLanguage.json

@@ -1375,6 +1375,11 @@
 						"1": { "name": "keyword.control.command.gdb" },
 						"2": { "patterns": [ { "include": "#numeric"} ] }
 					}
+				},
+				{
+					"name": "meta.command.silent.gdb",
+					"match": "(?:^|\\G)(silent)[ \t]*$",
+					"captures": { "1": { "name": "keyword.control.command.gdb" } }
 				}
 			]
 		},
@@ -1387,15 +1392,28 @@
 						"1": { "name": "keyword.control.command.gdb" },
 						"2": { "name": "entity.name.tag.breakpoint.gdb" }
 					},
-					"end": "^[ \t]*(end)[ \t]*$",
 					"patterns": [
 						{
-							"match": "^[ \t]*(silent)[ \t]*$",
-							"captures": { "1": { "name": "keyword.control.command.gdb" } }
+							"begin": "(?:^|\\G)(>)",
+							"beginCaptures": { "1": { "name" : "support.class.carret.gdb" }},
+							"patterns": [ { "include": "#expression"} ],
+							"end": "$"
+						},
+						{
+							"match": "^[ \t]*(Type commands for breakpoint\\(s\\) \\d+, one per line.)$",
+							"captures": { "1": { "name": "comment.line.gdb" } }
+						},
+						{
+							"match": "^[ \t]*(End with a line saying just \"end\".)$",
+							"captures": { "1": { "name": "comment.line.gdb" } }
 						},
 						{ "include": "#expression" }
 					],
-					"endCaptures": { "1": { "name": "keyword.control.end.commands.gdb" } }
+					"end": "^[ \t]*(>?)(end)[ \t]*$",
+					"endCaptures": {
+						"1": { "name": "support.class.carret.gdb" },
+						"2": { "name": "keyword.control.end.commands.gdb" }
+					}
 				},
 				{
 					"name": "meta.block.conditional.gdb",

tests/scripts/issues/44.gdb-log

@@ -0,0 +1,15 @@
+(gdb) continue
+Continuing.
+^C
+Program received signal SIGINT, Interrupt.
+0x9affb062b0f7 in testme () from /some/lib.so
+(gdb) commands
+Type commands for breakpoint(s) 4, one per line.
+End with a line saying just "end".
+>silent
+>break somefunc
+>end
+(gdb) break test.c:1098
+Breakpoint 5 at 0x7fffb062b0f7: file /tmp/test.c, line 1098.
+(gdb) c
+Continuing.