Skip to content

Commit 626ba0c

Browse files
committed
split DSX to Debug Synthetic External columns
1 parent f8da9f1 commit 626ba0c

File tree

1 file changed

+37
-18
lines changed

1 file changed

+37
-18
lines changed

lldb/tools/lldb-dap/src-ts/webview/symbols-table-view.ts

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,73 @@ function get_tabulator_hexa_formatter(padding: number): (cell: CellComponent) =>
1313
}
1414

1515
const SYMBOL_TABLE_COLUMNS: ColumnDefinition[] = [
16-
{ title: "User ID", field: "userId", sorter: "number", widthGrow: 0.8 },
16+
{ title: "User ID", field: "userId", headerTooltip: true, sorter: "number", widthGrow: 0.8 },
1717
{
1818
title: "Name",
1919
field: "name",
20+
headerTooltip: true,
2021
sorter: "string",
21-
widthGrow: 3,
22+
widthGrow: 2.5,
2223
minWidth: 200,
2324
tooltip : (_event: MouseEvent, cell: CellComponent) => {
2425
const rowData = cell.getRow().getData();
2526
return rowData.name;
2627
}
2728
},
2829
{
29-
title: "DSX",
30+
title: "Debug",
31+
field: "isDebug",
32+
headerTooltip: true,
3033
hozAlign: "center",
3134
widthGrow: 0.8,
32-
headerTooltip : "Debug / Synthetic / External",
33-
formatter: (cell: CellComponent) => {
34-
const rowData = cell.getRow().getData();
35-
let label = "";
36-
label += rowData.isDebug ? "D" : "";
37-
label += rowData.isSynthetic ? "S" : "";
38-
label += rowData.isExternal ? "X" : "";
39-
return label;
40-
},
41-
sorter: (_a, _b, aRow, bRow) => {
42-
const valuesA = [aRow.getData().isDebug, aRow.getData().isSynthetic, aRow.getData().isExternal];
43-
const valuesB = [bRow.getData().isDebug, bRow.getData().isSynthetic, bRow.getData().isExternal];
44-
45-
return valuesA < valuesB ? -1 : valuesA > valuesB ? 1 : 0;
35+
formatter: "tickCross",
36+
formatterParams: {
37+
tickElement: "✔",
38+
crossElement: false,
39+
}
40+
},
41+
{
42+
title: "Synthetic",
43+
field: "isSynthetic",
44+
headerTooltip: true,
45+
hozAlign: "center",
46+
widthGrow: 0.8,
47+
formatter: "tickCross",
48+
formatterParams: {
49+
tickElement: "✔",
50+
crossElement: false,
51+
}
52+
},
53+
{
54+
title: "External",
55+
field: "isExternal",
56+
headerTooltip: true,
57+
hozAlign: "center",
58+
widthGrow: 0.8,
59+
formatter: "tickCross",
60+
formatterParams: {
61+
tickElement: "✔",
62+
crossElement: false,
4663
}
4764
},
4865
{ title: "Type", field: "type", sorter: "string" },
4966
{
5067
title: "File Address",
5168
field: "fileAddress",
69+
headerTooltip: true,
5270
sorter: "number",
5371
widthGrow : 1.25,
5472
formatter: get_tabulator_hexa_formatter(16),
5573
},
5674
{
5775
title: "Load Address",
5876
field: "loadAddress",
77+
headerTooltip: true,
5978
sorter: "number",
6079
widthGrow : 1.25,
6180
formatter: get_tabulator_hexa_formatter(16),
6281
},
63-
{ title: "Size", field: "size", sorter: "number", formatter: get_tabulator_hexa_formatter(8) },
82+
{ title: "Size", field: "size", headerTooltip: true, sorter: "number", formatter: get_tabulator_hexa_formatter(8) },
6483
];
6584

6685
const vscode = acquireVsCodeApi();

0 commit comments

Comments
 (0)