Skip to content

Commit d225eeb

Browse files
sean-mcmanussean-mcmanus
committed
Fix stopAtEntry, sourceFileMap, processId.
1 parent 10563fa commit d225eeb

File tree

3 files changed

+46
-45
lines changed

3 files changed

+46
-45
lines changed

‎Extension/package.json‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3840,7 +3840,7 @@
38403840
},
38413841
"stopAtEntry": {
38423842
"type": "boolean",
3843-
"description": "%c_cpp.debuggers.stopAtEntry.description%",
3843+
"markdownDescription": "%c_cpp.debuggers.stopAtEntry.markdownDescription%",
38443844
"default": false
38453845
},
38463846
"debugServerPath": {
@@ -3889,16 +3889,15 @@
38893889
"default": false
38903890
},
38913891
"sourceFileMap": {
3892+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
38923893
"anyOf": [
38933894
{
38943895
"type": "object",
3895-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
38963896
"default": {
38973897
"<source-path>": "<target-path>"
38983898
}
38993899
},
39003900
{
3901-
"description": "%c_cpp.debuggers.sourceFileMap.sourceFileMapEntry.description%",
39023901
"type": "object",
39033902
"default": {
39043903
"<source-path>": {
@@ -4651,15 +4650,14 @@
46514650
"default": false
46524651
},
46534652
"processId": {
4653+
"markdownDescription": "%c_cpp.debuggers.processId.anyOf.markdownDescription%",
46544654
"anyOf": [
46554655
{
46564656
"type": "string",
4657-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
46584657
"default": "${command:pickProcess}"
46594658
},
46604659
{
46614660
"type": "integer",
4662-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
46634661
"default": 0
46644662
}
46654663
]
@@ -4675,16 +4673,15 @@
46754673
"default": false
46764674
},
46774675
"sourceFileMap": {
4676+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
46784677
"anyOf": [
46794678
{
46804679
"type": "object",
4681-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
46824680
"default": {
46834681
"<source-path>": "<target-path>"
46844682
}
46854683
},
46864684
{
4687-
"description": "%c_cpp.debuggers.sourceFileMap.sourceFileMapEntry.description%",
46884685
"type": "object",
46894686
"default": {
46904687
"<source-path>": {
@@ -5447,7 +5444,7 @@
54475444
},
54485445
"stopAtEntry": {
54495446
"type": "boolean",
5450-
"description": "%c_cpp.debuggers.stopAtEntry.description%",
5447+
"markdownDescription": "%c_cpp.debuggers.stopAtEntry.markdownDescription%",
54515448
"default": false
54525449
},
54535450
"dumpPath": {
@@ -5484,7 +5481,7 @@
54845481
},
54855482
"sourceFileMap": {
54865483
"type": "object",
5487-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
5484+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
54885485
"default": {
54895486
"<source-path>": "<target-path>"
54905487
}
@@ -5633,15 +5630,14 @@
56335630
"default": ""
56345631
},
56355632
"processId": {
5633+
"markdownDescription": "%c_cpp.debuggers.processId.anyOf.markdownDescription%",
56365634
"anyOf": [
56375635
{
56385636
"type": "string",
5639-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
56405637
"default": "${command:pickProcess}"
56415638
},
56425639
{
56435640
"type": "integer",
5644-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
56455641
"default": 0
56465642
}
56475643
]
@@ -5653,7 +5649,7 @@
56535649
},
56545650
"sourceFileMap": {
56555651
"type": "object",
5656-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
5652+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
56575653
"default": {
56585654
"<source-path>": "<target-path>"
56595655
}
@@ -5844,7 +5840,7 @@
58445840
},
58455841
"stopAtEntry": {
58465842
"type": "boolean",
5847-
"description": "%c_cpp.debuggers.stopAtEntry.description%",
5843+
"markdownDescription": "%c_cpp.debuggers.stopAtEntry.markdownDescription%",
58485844
"default": false
58495845
},
58505846
"serverLaunchTimeout": {
@@ -5858,16 +5854,15 @@
58585854
"default": false
58595855
},
58605856
"sourceFileMap": {
5857+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
58615858
"anyOf": [
58625859
{
58635860
"type": "object",
5864-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
58655861
"default": {
58665862
"<source-path>": "<target-path>"
58675863
}
58685864
},
58695865
{
5870-
"description": "%c_cpp.debuggers.sourceFileMap.sourceFileMapEntry.description%",
58715866
"type": "object",
58725867
"default": {
58735868
"<source-path>": {
@@ -6504,30 +6499,28 @@
65046499
"default": ""
65056500
},
65066501
"processId": {
6502+
"markdownDescription": "%c_cpp.debuggers.processId.anyOf.markdownDescription%",
65076503
"anyOf": [
65086504
{
65096505
"type": "string",
6510-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
65116506
"default": "${command:pickProcess}"
65126507
},
65136508
{
65146509
"type": "integer",
6515-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
65166510
"default": 0
65176511
}
65186512
]
65196513
},
65206514
"sourceFileMap": {
6515+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
65216516
"anyOf": [
65226517
{
65236518
"type": "object",
6524-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
65256519
"default": {
65266520
"<source-path>": "<target-path>"
65276521
}
65286522
},
65296523
{
6530-
"description": "%c_cpp.debuggers.sourceFileMap.sourceFileMapEntry.description%",
65316524
"type": "object",
65326525
"default": {
65336526
"<source-path>": {

‎Extension/package.nls.json‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,12 @@
889889
"c_cpp.debuggers.miDebuggerArgs.description": "Additional arguments for the MI debugger (such as gdb).",
890890
"c_cpp.debuggers.miDebuggerServerAddress.description": "Network address of the MI Debugger Server to connect to (example: localhost:1234).",
891891
"c_cpp.debuggers.useExtendedRemote.description": "Connect to the MI Debugger Server with target extended-remote mode.",
892-
"c_cpp.debuggers.stopAtEntry.description": "Optional parameter. If true, the debugger should stop at the entrypoint of the target. If processId is passed, has no effect.",
892+
"c_cpp.debuggers.stopAtEntry.markdownDescription": {
893+
"message": "Optional parameter. If `true`, the debugger should stop at the entry point of the target. If `processId` is passed, this has no effect.",
894+
"comment": [
895+
"{Locked=\"`true`\"} {Locked=\"`processId`\"}"
896+
]
897+
},
893898
"c_cpp.debuggers.debugServerPath.description": "Optional full path to the debug server to launch. Defaults to null. It is used in conjunction with either \"miDebugServerAddress\" or your own server with a \"customSetupCommand\" that runs \"-target-select remote <server:port>\".",
894899
"c_cpp.debuggers.debugServerArgs.description": "Optional debug server args. Defaults to null.",
895900
"c_cpp.debuggers.serverStarted.description": "Optional server-started pattern to look for in the debug server output. Defaults to null.",
@@ -905,8 +910,18 @@
905910
"c_cpp.debuggers.cppvsdbg.console.externalTerminal.description": "Console applications will be launched in an external terminal window. The window will be reused in relaunch scenarios and will not automatically disappear when the application exits.",
906911
"c_cpp.debuggers.cppvsdbg.console.newExternalWindow.description": "Console applications will be launched in their own external console window which will end when the application stops. Non-console applications will run without a terminal, and stdout/stderr will be ignored.",
907912
"c_cpp.debuggers.avoidWindowsConsoleRedirection.description": "If true, disables debuggee console redirection that is required for Integrated Terminal support.",
908-
"c_cpp.debuggers.sourceFileMap.description": "Optional source file mappings passed to the debug engine. Example: '{ \"/original/source/path\":\"/current/source/path\" }'.",
909-
"c_cpp.debuggers.processId.anyOf.description": "Optional process id to attach the debugger to. Use \"${command:pickProcess}\" to get a list of local running processes to attach to. Note that some platforms require administrator privileges in order to attach to a process.",
913+
"c_cpp.debuggers.sourceFileMap.markdownDescription": {
914+
"message": "Optional source file mappings passed to the debug engine. Example: `{ \"<original source path>\": \"<current source path>\" }`.",
915+
"comment": [
916+
"{Locked=\"`{ \\\"<\"} {Locked=\">\\\": \\\"<\"} {Locked=\">\\\" }`\"}"
917+
]
918+
},
919+
"c_cpp.debuggers.processId.anyOf.markdownDescription": {
920+
"message": "Optional process ID to attach the debugger to. Use `${command:pickProcess}` to get a list of local running processes to attach to. Note that some platforms require administrator privileges in order to attach to a process.",
921+
"comment": [
922+
"{Locked=\"`${command:pickProcess}`\"}"
923+
]
924+
},
910925
"c_cpp.debuggers.symbolSearchPath.description": "Semicolon separated list of directories to use to search for symbol (that is, pdb) files. Example: \"c:\\dir1;c:\\dir2\".",
911926
"c_cpp.debuggers.dumpPath.description": "Optional full path to a dump file for the specified program. Example: \"c:\\temp\\app.dmp\". Defaults to null.",
912927
"c_cpp.debuggers.enableDebugHeap.description": "If false, the process will be launched with debug heap disabled. This sets the environment variable '_NO_DEBUG_HEAP' to '1'.",

‎Extension/tools/OptionsSchema.json‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@
726726
},
727727
"stopAtEntry": {
728728
"type": "boolean",
729-
"description": "%c_cpp.debuggers.stopAtEntry.description%",
729+
"markdownDescription": "%c_cpp.debuggers.stopAtEntry.markdownDescription%",
730730
"default": false
731731
},
732732
"debugServerPath": {
@@ -775,17 +775,16 @@
775775
"default": false
776776
},
777777
"sourceFileMap": {
778+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
778779
"anyOf": [
779780
{
780781
"type": "object",
781-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
782782
"default": {
783783
"<source-path>": "<target-path>"
784784
}
785785
},
786786
{
787-
"$ref": "#/definitions/SourceFileMapEntry",
788-
"description": "%c_cpp.debuggers.sourceFileMap.sourceFileMapEntry.description%"
787+
"$ref": "#/definitions/SourceFileMapEntry"
789788
}
790789
]
791790
},
@@ -886,15 +885,14 @@
886885
"default": false
887886
},
888887
"processId": {
888+
"markdownDescription": "%c_cpp.debuggers.processId.anyOf.markdownDescription%",
889889
"anyOf": [
890890
{
891891
"type": "string",
892-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
893892
"default": "${command:pickProcess}"
894893
},
895894
{
896895
"type": "integer",
897-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
898896
"default": 0
899897
}
900898
]
@@ -910,17 +908,16 @@
910908
"default": false
911909
},
912910
"sourceFileMap": {
911+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
913912
"anyOf": [
914913
{
915914
"type": "object",
916-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
917915
"default": {
918916
"<source-path>": "<target-path>"
919917
}
920918
},
921919
{
922-
"$ref": "#/definitions/SourceFileMapEntry",
923-
"description": "%c_cpp.debuggers.sourceFileMap.sourceFileMapEntry.description%"
920+
"$ref": "#/definitions/SourceFileMapEntry"
924921
}
925922
]
926923
},
@@ -1001,7 +998,7 @@
1001998
},
1002999
"stopAtEntry": {
10031000
"type": "boolean",
1004-
"description": "%c_cpp.debuggers.stopAtEntry.description%",
1001+
"markdownDescription": "%c_cpp.debuggers.stopAtEntry.markdownDescription%",
10051002
"default": false
10061003
},
10071004
"serverLaunchTimeout": {
@@ -1015,17 +1012,16 @@
10151012
"default": false
10161013
},
10171014
"sourceFileMap": {
1015+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
10181016
"anyOf": [
10191017
{
10201018
"type": "object",
1021-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
10221019
"default": {
10231020
"<source-path>": "<target-path>"
10241021
}
10251022
},
10261023
{
1027-
"$ref": "#/definitions/SourceFileMapEntry",
1028-
"description": "%c_cpp.debuggers.sourceFileMap.sourceFileMapEntry.description%"
1024+
"$ref": "#/definitions/SourceFileMapEntry"
10291025
}
10301026
]
10311027
},
@@ -1172,31 +1168,29 @@
11721168
"default": ""
11731169
},
11741170
"processId": {
1171+
"markdownDescription": "%c_cpp.debuggers.processId.anyOf.markdownDescription%",
11751172
"anyOf": [
11761173
{
11771174
"type": "string",
1178-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
11791175
"default": "${command:pickProcess}"
11801176
},
11811177
{
11821178
"type": "integer",
1183-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
11841179
"default": 0
11851180
}
11861181
]
11871182
},
11881183
"sourceFileMap": {
1184+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
11891185
"anyOf": [
11901186
{
11911187
"type": "object",
1192-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
11931188
"default": {
11941189
"<source-path>": "<target-path>"
11951190
}
11961191
},
11971192
{
1198-
"$ref": "#/definitions/SourceFileMapEntry",
1199-
"description": "%c_cpp.debuggers.sourceFileMap.sourceFileMapEntry.description%"
1193+
"$ref": "#/definitions/SourceFileMapEntry"
12001194
}
12011195
]
12021196
},
@@ -1393,7 +1387,7 @@
13931387
},
13941388
"stopAtEntry": {
13951389
"type": "boolean",
1396-
"description": "%c_cpp.debuggers.stopAtEntry.description%",
1390+
"markdownDescription": "%c_cpp.debuggers.stopAtEntry.markdownDescription%",
13971391
"default": false
13981392
},
13991393
"dumpPath": {
@@ -1430,7 +1424,7 @@
14301424
},
14311425
"sourceFileMap": {
14321426
"type": "object",
1433-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
1427+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
14341428
"default": {
14351429
"<source-path>": "<target-path>"
14361430
}
@@ -1510,15 +1504,14 @@
15101504
"default": ""
15111505
},
15121506
"processId": {
1507+
"markdownDescription": "%c_cpp.debuggers.processId.anyOf.markdownDescription%",
15131508
"anyOf": [
15141509
{
15151510
"type": "string",
1516-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
15171511
"default": "${command:pickProcess}"
15181512
},
15191513
{
15201514
"type": "integer",
1521-
"description": "%c_cpp.debuggers.processId.anyOf.description%",
15221515
"default": 0
15231516
}
15241517
]
@@ -1530,7 +1523,7 @@
15301523
},
15311524
"sourceFileMap": {
15321525
"type": "object",
1533-
"description": "%c_cpp.debuggers.sourceFileMap.description%",
1526+
"markdownDescription": "%c_cpp.debuggers.sourceFileMap.markdownDescription%",
15341527
"default": {
15351528
"<source-path>": "<target-path>"
15361529
}

0 commit comments

Comments
 (0)