@opensumi/ide-debug 2.24.3-next-1684292909.0 → 2.24.3-next-1684294186.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/view/breakpoints/debug-breakpoints.module.less +9 -30
- package/lib/browser/view/breakpoints/debug-breakpoints.view.d.ts +3 -1
- package/lib/browser/view/breakpoints/debug-breakpoints.view.d.ts.map +1 -1
- package/lib/browser/view/breakpoints/debug-breakpoints.view.js +26 -23
- package/lib/browser/view/breakpoints/debug-breakpoints.view.js.map +1 -1
- package/package.json +23 -23
- package/src/browser/view/breakpoints/debug-breakpoints.module.less +9 -30
- package/src/browser/view/breakpoints/debug-breakpoints.view.tsx +52 -52
|
@@ -3,19 +3,6 @@
|
|
|
3
3
|
height: 100%;
|
|
4
4
|
display: flex;
|
|
5
5
|
flex-direction: column;
|
|
6
|
-
:global {
|
|
7
|
-
span.kt-icon.icon.kaitian-icon {
|
|
8
|
-
min-width: 20px;
|
|
9
|
-
width: 20px;
|
|
10
|
-
}
|
|
11
|
-
.basic_tree .icon:before {
|
|
12
|
-
font-size: 14px;
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
.tree_item_twister_placeholder {
|
|
17
|
-
display: none;
|
|
18
|
-
}
|
|
19
6
|
}
|
|
20
7
|
|
|
21
8
|
.debug_breakpoints_disabled {
|
|
@@ -50,21 +37,10 @@
|
|
|
50
37
|
}
|
|
51
38
|
|
|
52
39
|
.debug_breakpoints_icon {
|
|
53
|
-
width:
|
|
54
|
-
height:
|
|
55
|
-
min-width:
|
|
56
|
-
:
|
|
57
|
-
.kt-checkbox-lump {
|
|
58
|
-
margin: auto;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
.debug_breakpoints_checkbox {
|
|
64
|
-
width: 16px;
|
|
65
|
-
min-width: 16px;
|
|
66
|
-
font-size: 16px;
|
|
67
|
-
// height: 20px;
|
|
40
|
+
width: 19px;
|
|
41
|
+
height: 19px;
|
|
42
|
+
min-width: 19px;
|
|
43
|
+
margin-right: 3px;
|
|
68
44
|
}
|
|
69
45
|
|
|
70
46
|
.debug_breakpoints_badge {
|
|
@@ -87,7 +63,10 @@
|
|
|
87
63
|
overflow: hidden;
|
|
88
64
|
text-overflow: ellipsis;
|
|
89
65
|
white-space: nowrap;
|
|
90
|
-
margin-right:
|
|
91
|
-
margin-left: 4px;
|
|
66
|
+
margin-right: 5px;
|
|
92
67
|
flex: 1;
|
|
93
68
|
}
|
|
69
|
+
|
|
70
|
+
.debug_breakpoints_item_tree_node {
|
|
71
|
+
padding-left: 27px !important;
|
|
72
|
+
}
|
|
@@ -12,8 +12,10 @@ export interface BreakpointItem {
|
|
|
12
12
|
export declare const DebugBreakpointView: React.FunctionComponent<{
|
|
13
13
|
viewState: ViewState;
|
|
14
14
|
}>;
|
|
15
|
-
export declare const BreakpointItem: ({ data, toggle }: {
|
|
15
|
+
export declare const BreakpointItem: ({ data, toggle, isDebugMode, breakpointEnabled, }: {
|
|
16
16
|
data: BreakpointItem;
|
|
17
17
|
toggle: () => void;
|
|
18
|
+
isDebugMode: boolean;
|
|
19
|
+
breakpointEnabled: boolean;
|
|
18
20
|
}) => JSX.Element;
|
|
19
21
|
//# sourceMappingURL=debug-breakpoints.view.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-breakpoints.view.d.ts","sourceRoot":"","sources":["../../../../src/browser/view/breakpoints/debug-breakpoints.view.tsx"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"debug-breakpoints.view.d.ts","sourceRoot":"","sources":["../../../../src/browser/view/breakpoints/debug-breakpoints.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA4D,MAAM,OAAO,CAAC;AAIjF,OAAO,EAOL,SAAS,EACT,KAAK,EAEN,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,gBAAgB,EAA2C,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EACL,wBAAwB,EAMzB,MAAM,kBAAkB,CAAC;AAO1B,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,UAAU,EAAE,gBAAgB,GAAG,wBAAwB,CAAC;CACzD;AAED,eAAO,MAAM,mBAAmB;eAAiE,SAAS;EA6FxG,CAAC;AAEH,eAAO,MAAM,cAAc;UAMnB,cAAc;YACZ,MAAM,IAAI;iBACL,OAAO;uBACD,OAAO;iBAsH3B,CAAC"}
|
|
@@ -17,18 +17,6 @@ exports.DebugBreakpointView = (0, mobx_react_lite_1.observer)(({ viewState }) =>
|
|
|
17
17
|
const { enable, toggleBreakpointEnable } = debugBreakpointsService;
|
|
18
18
|
const isDisposed = (0, react_1.useRef)(false);
|
|
19
19
|
const [treeData, setTreeData] = (0, react_1.useState)([]);
|
|
20
|
-
const getBreakpointClsState = (options) => {
|
|
21
|
-
const { data, inDebugMode, breakpointEnabled } = options;
|
|
22
|
-
if ((0, breakpoint_1.isDebugBreakpoint)(data.breakpoint)) {
|
|
23
|
-
const verified = !inDebugMode ? true : (0, breakpoint_1.isDebugBreakpoint)(data.breakpoint) && (0, breakpoint_1.isRuntimeBreakpoint)(data.breakpoint);
|
|
24
|
-
if (!verified) {
|
|
25
|
-
return 'sumi-debug-breakpoint-unverified';
|
|
26
|
-
}
|
|
27
|
-
const { className } = debugBreakpointsService.getBreakpointDecoration(data.breakpoint, inDebugMode, breakpointEnabled);
|
|
28
|
-
return className;
|
|
29
|
-
}
|
|
30
|
-
return '';
|
|
31
|
-
};
|
|
32
20
|
const updateTreeData = (0, react_1.useCallback)((nodes) => {
|
|
33
21
|
const { roots } = debugBreakpointsService;
|
|
34
22
|
const breakpointTreeData = [];
|
|
@@ -41,7 +29,7 @@ exports.DebugBreakpointView = (0, mobx_react_lite_1.observer)(({ viewState }) =>
|
|
|
41
29
|
label: '',
|
|
42
30
|
expandable: false,
|
|
43
31
|
children: [],
|
|
44
|
-
description: (react_1.default.createElement(exports.BreakpointItem, { toggle: () => toggleBreakpointEnable(item.breakpoint), data: item.rawData })),
|
|
32
|
+
description: (react_1.default.createElement(exports.BreakpointItem, { toggle: () => toggleBreakpointEnable(item.breakpoint), breakpointEnabled: enable, data: item.rawData, isDebugMode: debugBreakpointsService.inDebugMode })),
|
|
45
33
|
});
|
|
46
34
|
});
|
|
47
35
|
}
|
|
@@ -53,11 +41,7 @@ exports.DebugBreakpointView = (0, mobx_react_lite_1.observer)(({ viewState }) =>
|
|
|
53
41
|
expandable: true,
|
|
54
42
|
iconClassName: (0, ide_core_browser_1.getIcon)('file-text'),
|
|
55
43
|
expanded: true,
|
|
56
|
-
children: items.map((item) => (Object.assign(Object.assign({}, item), { label: '', expandable: false,
|
|
57
|
-
data: item.rawData,
|
|
58
|
-
inDebugMode: debugBreakpointsService.inDebugMode,
|
|
59
|
-
breakpointEnabled: enable,
|
|
60
|
-
}), debug_breakpoints_module_less_1.default.debug_breakpoints_icon), description: (react_1.default.createElement(exports.BreakpointItem, { toggle: () => toggleBreakpointEnable(item.breakpoint), data: item.rawData })) }))),
|
|
44
|
+
children: items.map((item) => (Object.assign(Object.assign({}, item), { label: '', expandable: false, description: (react_1.default.createElement(exports.BreakpointItem, { toggle: () => toggleBreakpointEnable(item.breakpoint), breakpointEnabled: enable, data: item.rawData, isDebugMode: debugBreakpointsService.inDebugMode })) }))),
|
|
61
45
|
});
|
|
62
46
|
}
|
|
63
47
|
});
|
|
@@ -83,12 +67,15 @@ exports.DebugBreakpointView = (0, mobx_react_lite_1.observer)(({ viewState }) =>
|
|
|
83
67
|
});
|
|
84
68
|
}
|
|
85
69
|
}, [treeData]);
|
|
70
|
+
const getItemClassName = (0, react_1.useCallback)((item) => {
|
|
71
|
+
if (!item.children && (0, ide_core_browser_1.isUndefined)(item.expandable)) {
|
|
72
|
+
return debug_breakpoints_module_less_1.default.debug_breakpoints_item_tree_node;
|
|
73
|
+
}
|
|
74
|
+
}, []);
|
|
86
75
|
return (react_1.default.createElement("div", { className: (0, classnames_1.default)(debug_breakpoints_module_less_1.default.debug_breakpoints, !enable && debug_breakpoints_module_less_1.default.debug_breakpoints_disabled) },
|
|
87
|
-
react_1.default.createElement(ide_components_1.BasicRecycleTree, {
|
|
88
|
-
toggleBreakpointEnable(item.raw.breakpoint);
|
|
89
|
-
}, indent: 20, baseIndent: 8, treeData: treeData, height: viewState.height })));
|
|
76
|
+
react_1.default.createElement(ide_components_1.BasicRecycleTree, { treeData: treeData, height: viewState.height, getItemClassName: getItemClassName })));
|
|
90
77
|
});
|
|
91
|
-
const BreakpointItem = ({ data, toggle }) => {
|
|
78
|
+
const BreakpointItem = ({ data, toggle, isDebugMode, breakpointEnabled, }) => {
|
|
92
79
|
const defaultValue = (0, breakpoint_1.isDebugBreakpoint)(data.breakpoint) ? data.breakpoint.enabled : !!data.breakpoint.default;
|
|
93
80
|
const manager = (0, ide_core_browser_1.useInjectable)(common_1.IDebugSessionManager);
|
|
94
81
|
const commandService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandService);
|
|
@@ -141,12 +128,28 @@ const BreakpointItem = ({ data, toggle }) => {
|
|
|
141
128
|
disposable.dispose();
|
|
142
129
|
};
|
|
143
130
|
}, []);
|
|
131
|
+
const verified = !isDebugMode ? true : (0, breakpoint_1.isDebugBreakpoint)(data.breakpoint) && (0, breakpoint_1.isRuntimeBreakpoint)(data.breakpoint);
|
|
132
|
+
const getBreakpointIcon = () => {
|
|
133
|
+
const { className } = debugBreakpointsService.getBreakpointDecoration(data.breakpoint, isDebugMode, breakpointEnabled && enabled);
|
|
134
|
+
return className;
|
|
135
|
+
};
|
|
136
|
+
const converBreakpointClsState = () => {
|
|
137
|
+
if ((0, breakpoint_1.isDebugBreakpoint)(data.breakpoint)) {
|
|
138
|
+
if (!verified) {
|
|
139
|
+
return 'sumi-debug-breakpoint-unverified';
|
|
140
|
+
}
|
|
141
|
+
return getBreakpointIcon();
|
|
142
|
+
}
|
|
143
|
+
return '';
|
|
144
|
+
};
|
|
144
145
|
const removeBreakpoint = (event) => {
|
|
145
146
|
event.stopPropagation();
|
|
146
147
|
debugBreakpointsService.delBreakpoint(data.breakpoint);
|
|
147
148
|
};
|
|
149
|
+
const isExceptionBreakpoint = (0, react_1.useMemo)(() => (0, breakpoint_1.isDebugExceptionBreakpoint)(data.breakpoint), [data]);
|
|
148
150
|
return (react_1.default.createElement("div", { className: (0, classnames_1.default)(debug_breakpoints_module_less_1.default.debug_breakpoints_item) },
|
|
149
|
-
react_1.default.createElement(
|
|
151
|
+
!isExceptionBreakpoint && react_1.default.createElement("div", { className: (0, classnames_1.default)(converBreakpointClsState(), debug_breakpoints_module_less_1.default.debug_breakpoints_icon) }),
|
|
152
|
+
react_1.default.createElement(ide_components_1.CheckBox, { id: data.id, onChange: handleBreakpointChange, checked: enabled }),
|
|
150
153
|
react_1.default.createElement("div", { className: debug_breakpoints_module_less_1.default.debug_breakpoints_wrapper, onClick: handleBreakpointClick },
|
|
151
154
|
data.name && react_1.default.createElement("span", { className: debug_breakpoints_module_less_1.default.debug_breakpoints_name }, data.name),
|
|
152
155
|
react_1.default.createElement("span", { className: debug_breakpoints_module_less_1.default.debug_breakpoints_description }, description)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-breakpoints.view.js","sourceRoot":"","sources":["../../../../src/browser/view/breakpoints/debug-breakpoints.view.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,qDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"debug-breakpoints.view.js","sourceRoot":"","sources":["../../../../src/browser/view/breakpoints/debug-breakpoints.view.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-debug",
|
|
3
|
-
"version": "2.24.3-next-
|
|
3
|
+
"version": "2.24.3-next-1684294186.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,33 +17,33 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "2.24.3-next-
|
|
21
|
-
"@opensumi/ide-core-common": "2.24.3-next-
|
|
22
|
-
"@opensumi/ide-core-node": "2.24.3-next-
|
|
23
|
-
"@opensumi/ide-file-service": "2.24.3-next-
|
|
24
|
-
"@opensumi/ide-task": "2.24.3-next-
|
|
25
|
-
"@opensumi/ide-terminal-next": "2.24.3-next-
|
|
20
|
+
"@opensumi/ide-connection": "2.24.3-next-1684294186.0",
|
|
21
|
+
"@opensumi/ide-core-common": "2.24.3-next-1684294186.0",
|
|
22
|
+
"@opensumi/ide-core-node": "2.24.3-next-1684294186.0",
|
|
23
|
+
"@opensumi/ide-file-service": "2.24.3-next-1684294186.0",
|
|
24
|
+
"@opensumi/ide-task": "2.24.3-next-1684294186.0",
|
|
25
|
+
"@opensumi/ide-terminal-next": "2.24.3-next-1684294186.0",
|
|
26
26
|
"anser": "^1.4.9",
|
|
27
27
|
"btoa": "^1.2.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@opensumi/ide-components": "2.24.3-next-
|
|
31
|
-
"@opensumi/ide-core-browser": "2.24.3-next-
|
|
30
|
+
"@opensumi/ide-components": "2.24.3-next-1684294186.0",
|
|
31
|
+
"@opensumi/ide-core-browser": "2.24.3-next-1684294186.0",
|
|
32
32
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
33
|
-
"@opensumi/ide-editor": "2.24.3-next-
|
|
34
|
-
"@opensumi/ide-main-layout": "2.24.3-next-
|
|
35
|
-
"@opensumi/ide-monaco": "2.24.3-next-
|
|
36
|
-
"@opensumi/ide-monaco-enhance": "2.24.3-next-
|
|
37
|
-
"@opensumi/ide-output": "2.24.3-next-
|
|
38
|
-
"@opensumi/ide-overlay": "2.24.3-next-
|
|
39
|
-
"@opensumi/ide-preferences": "2.24.3-next-
|
|
40
|
-
"@opensumi/ide-quick-open": "2.24.3-next-
|
|
41
|
-
"@opensumi/ide-storage": "2.24.3-next-
|
|
42
|
-
"@opensumi/ide-theme": "2.24.3-next-
|
|
43
|
-
"@opensumi/ide-variable": "2.24.3-next-
|
|
44
|
-
"@opensumi/ide-workspace": "2.24.3-next-
|
|
45
|
-
"@opensumi/ide-workspace-edit": "2.24.3-next-
|
|
33
|
+
"@opensumi/ide-editor": "2.24.3-next-1684294186.0",
|
|
34
|
+
"@opensumi/ide-main-layout": "2.24.3-next-1684294186.0",
|
|
35
|
+
"@opensumi/ide-monaco": "2.24.3-next-1684294186.0",
|
|
36
|
+
"@opensumi/ide-monaco-enhance": "2.24.3-next-1684294186.0",
|
|
37
|
+
"@opensumi/ide-output": "2.24.3-next-1684294186.0",
|
|
38
|
+
"@opensumi/ide-overlay": "2.24.3-next-1684294186.0",
|
|
39
|
+
"@opensumi/ide-preferences": "2.24.3-next-1684294186.0",
|
|
40
|
+
"@opensumi/ide-quick-open": "2.24.3-next-1684294186.0",
|
|
41
|
+
"@opensumi/ide-storage": "2.24.3-next-1684294186.0",
|
|
42
|
+
"@opensumi/ide-theme": "2.24.3-next-1684294186.0",
|
|
43
|
+
"@opensumi/ide-variable": "2.24.3-next-1684294186.0",
|
|
44
|
+
"@opensumi/ide-workspace": "2.24.3-next-1684294186.0",
|
|
45
|
+
"@opensumi/ide-workspace-edit": "2.24.3-next-1684294186.0",
|
|
46
46
|
"@types/btoa": "^1.2.3"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "22218ecd5705439d639f3663862be12691d342ea"
|
|
49
49
|
}
|
|
@@ -3,19 +3,6 @@
|
|
|
3
3
|
height: 100%;
|
|
4
4
|
display: flex;
|
|
5
5
|
flex-direction: column;
|
|
6
|
-
:global {
|
|
7
|
-
span.kt-icon.icon.kaitian-icon {
|
|
8
|
-
min-width: 20px;
|
|
9
|
-
width: 20px;
|
|
10
|
-
}
|
|
11
|
-
.basic_tree .icon:before {
|
|
12
|
-
font-size: 14px;
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
.tree_item_twister_placeholder {
|
|
17
|
-
display: none;
|
|
18
|
-
}
|
|
19
6
|
}
|
|
20
7
|
|
|
21
8
|
.debug_breakpoints_disabled {
|
|
@@ -50,21 +37,10 @@
|
|
|
50
37
|
}
|
|
51
38
|
|
|
52
39
|
.debug_breakpoints_icon {
|
|
53
|
-
width:
|
|
54
|
-
height:
|
|
55
|
-
min-width:
|
|
56
|
-
:
|
|
57
|
-
.kt-checkbox-lump {
|
|
58
|
-
margin: auto;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
.debug_breakpoints_checkbox {
|
|
64
|
-
width: 16px;
|
|
65
|
-
min-width: 16px;
|
|
66
|
-
font-size: 16px;
|
|
67
|
-
// height: 20px;
|
|
40
|
+
width: 19px;
|
|
41
|
+
height: 19px;
|
|
42
|
+
min-width: 19px;
|
|
43
|
+
margin-right: 3px;
|
|
68
44
|
}
|
|
69
45
|
|
|
70
46
|
.debug_breakpoints_badge {
|
|
@@ -87,7 +63,10 @@
|
|
|
87
63
|
overflow: hidden;
|
|
88
64
|
text-overflow: ellipsis;
|
|
89
65
|
white-space: nowrap;
|
|
90
|
-
margin-right:
|
|
91
|
-
margin-left: 4px;
|
|
66
|
+
margin-right: 5px;
|
|
92
67
|
flex: 1;
|
|
93
68
|
}
|
|
69
|
+
|
|
70
|
+
.debug_breakpoints_item_tree_node {
|
|
71
|
+
padding-left: 27px !important;
|
|
72
|
+
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import cls from 'classnames';
|
|
2
2
|
import { observer } from 'mobx-react-lite';
|
|
3
|
-
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
3
|
+
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
4
4
|
|
|
5
|
-
import { BasicRecycleTree, CheckBox, IBasicTreeData } from '@opensumi/ide-components';
|
|
5
|
+
import { BasicRecycleTree, CheckBox, IBasicTreeData, ICompositeTreeNode } from '@opensumi/ide-components';
|
|
6
6
|
import { Badge } from '@opensumi/ide-components';
|
|
7
7
|
import {
|
|
8
8
|
useInjectable,
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
Disposable,
|
|
14
14
|
ViewState,
|
|
15
15
|
Event,
|
|
16
|
+
isUndefined,
|
|
16
17
|
} from '@opensumi/ide-core-browser';
|
|
17
18
|
import { DebugProtocol } from '@opensumi/vscode-debugprotocol/lib/debugProtocol';
|
|
18
19
|
|
|
@@ -22,6 +23,7 @@ import {
|
|
|
22
23
|
isDebugBreakpoint,
|
|
23
24
|
isRuntimeBreakpoint,
|
|
24
25
|
getStatus,
|
|
26
|
+
isDebugExceptionBreakpoint,
|
|
25
27
|
EXCEPTION_BREAKPOINT_URI,
|
|
26
28
|
} from '../../breakpoint';
|
|
27
29
|
import { DebugSessionManager } from '../../debug-session-manager';
|
|
@@ -44,30 +46,6 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
|
|
|
44
46
|
const isDisposed = useRef<boolean>(false);
|
|
45
47
|
const [treeData, setTreeData] = useState<IBasicTreeData[]>([]);
|
|
46
48
|
|
|
47
|
-
const getBreakpointClsState = (options: {
|
|
48
|
-
data: BreakpointItem;
|
|
49
|
-
inDebugMode: boolean;
|
|
50
|
-
breakpointEnabled: boolean;
|
|
51
|
-
}) => {
|
|
52
|
-
const { data, inDebugMode, breakpointEnabled } = options;
|
|
53
|
-
if (isDebugBreakpoint(data.breakpoint)) {
|
|
54
|
-
const verified = !inDebugMode ? true : isDebugBreakpoint(data.breakpoint) && isRuntimeBreakpoint(data.breakpoint);
|
|
55
|
-
|
|
56
|
-
if (!verified) {
|
|
57
|
-
return 'sumi-debug-breakpoint-unverified';
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
const { className } = debugBreakpointsService.getBreakpointDecoration(
|
|
61
|
-
data.breakpoint as IDebugBreakpoint,
|
|
62
|
-
inDebugMode,
|
|
63
|
-
breakpointEnabled,
|
|
64
|
-
);
|
|
65
|
-
return className;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
return '';
|
|
69
|
-
};
|
|
70
|
-
|
|
71
49
|
const updateTreeData = useCallback(
|
|
72
50
|
(nodes: [string, BreakpointsTreeNode[]][]) => {
|
|
73
51
|
const { roots } = debugBreakpointsService;
|
|
@@ -83,7 +61,9 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
|
|
|
83
61
|
description: (
|
|
84
62
|
<BreakpointItem
|
|
85
63
|
toggle={() => toggleBreakpointEnable(item.breakpoint)}
|
|
64
|
+
breakpointEnabled={enable}
|
|
86
65
|
data={item.rawData}
|
|
66
|
+
isDebugMode={debugBreakpointsService.inDebugMode}
|
|
87
67
|
></BreakpointItem>
|
|
88
68
|
),
|
|
89
69
|
});
|
|
@@ -101,20 +81,12 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
|
|
|
101
81
|
...item,
|
|
102
82
|
label: '',
|
|
103
83
|
expandable: false,
|
|
104
|
-
twisterPlaceholderClassName: styles.tree_item_twister_placeholder,
|
|
105
|
-
breakpoint: item.breakpoint,
|
|
106
|
-
iconClassName: cls(
|
|
107
|
-
getBreakpointClsState({
|
|
108
|
-
data: item.rawData,
|
|
109
|
-
inDebugMode: debugBreakpointsService.inDebugMode,
|
|
110
|
-
breakpointEnabled: enable,
|
|
111
|
-
}),
|
|
112
|
-
styles.debug_breakpoints_icon,
|
|
113
|
-
),
|
|
114
84
|
description: (
|
|
115
85
|
<BreakpointItem
|
|
116
86
|
toggle={() => toggleBreakpointEnable(item.breakpoint)}
|
|
87
|
+
breakpointEnabled={enable}
|
|
117
88
|
data={item.rawData}
|
|
89
|
+
isDebugMode={debugBreakpointsService.inDebugMode}
|
|
118
90
|
></BreakpointItem>
|
|
119
91
|
),
|
|
120
92
|
})),
|
|
@@ -151,22 +123,29 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
|
|
|
151
123
|
}
|
|
152
124
|
}, [treeData]);
|
|
153
125
|
|
|
126
|
+
const getItemClassName = useCallback((item: ICompositeTreeNode) => {
|
|
127
|
+
if (!item.children && isUndefined((item as any).expandable)) {
|
|
128
|
+
return styles.debug_breakpoints_item_tree_node;
|
|
129
|
+
}
|
|
130
|
+
}, []);
|
|
154
131
|
return (
|
|
155
132
|
<div className={cls(styles.debug_breakpoints, !enable && styles.debug_breakpoints_disabled)}>
|
|
156
|
-
<BasicRecycleTree
|
|
157
|
-
onIconClick={(_, item) => {
|
|
158
|
-
toggleBreakpointEnable(item.raw.breakpoint);
|
|
159
|
-
}}
|
|
160
|
-
indent={20}
|
|
161
|
-
baseIndent={8}
|
|
162
|
-
treeData={treeData}
|
|
163
|
-
height={viewState.height}
|
|
164
|
-
/>
|
|
133
|
+
<BasicRecycleTree treeData={treeData} height={viewState.height} getItemClassName={getItemClassName} />
|
|
165
134
|
</div>
|
|
166
135
|
);
|
|
167
136
|
});
|
|
168
137
|
|
|
169
|
-
export const BreakpointItem = ({
|
|
138
|
+
export const BreakpointItem = ({
|
|
139
|
+
data,
|
|
140
|
+
toggle,
|
|
141
|
+
isDebugMode,
|
|
142
|
+
breakpointEnabled,
|
|
143
|
+
}: {
|
|
144
|
+
data: BreakpointItem;
|
|
145
|
+
toggle: () => void;
|
|
146
|
+
isDebugMode: boolean;
|
|
147
|
+
breakpointEnabled: boolean;
|
|
148
|
+
}) => {
|
|
170
149
|
const defaultValue = isDebugBreakpoint(data.breakpoint) ? data.breakpoint.enabled : !!data.breakpoint.default;
|
|
171
150
|
const manager = useInjectable<DebugSessionManager>(IDebugSessionManager);
|
|
172
151
|
const commandService = useInjectable<CommandService>(CommandService);
|
|
@@ -230,19 +209,40 @@ export const BreakpointItem = ({ data, toggle }: { data: BreakpointItem; toggle:
|
|
|
230
209
|
};
|
|
231
210
|
}, []);
|
|
232
211
|
|
|
212
|
+
const verified = !isDebugMode ? true : isDebugBreakpoint(data.breakpoint) && isRuntimeBreakpoint(data.breakpoint);
|
|
213
|
+
|
|
214
|
+
const getBreakpointIcon = () => {
|
|
215
|
+
const { className } = debugBreakpointsService.getBreakpointDecoration(
|
|
216
|
+
data.breakpoint as IDebugBreakpoint,
|
|
217
|
+
isDebugMode,
|
|
218
|
+
breakpointEnabled && enabled,
|
|
219
|
+
);
|
|
220
|
+
return className;
|
|
221
|
+
};
|
|
222
|
+
|
|
223
|
+
const converBreakpointClsState = () => {
|
|
224
|
+
if (isDebugBreakpoint(data.breakpoint)) {
|
|
225
|
+
if (!verified) {
|
|
226
|
+
return 'sumi-debug-breakpoint-unverified';
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
return getBreakpointIcon();
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
return '';
|
|
233
|
+
};
|
|
234
|
+
|
|
233
235
|
const removeBreakpoint = (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
|
|
234
236
|
event.stopPropagation();
|
|
235
237
|
debugBreakpointsService.delBreakpoint(data.breakpoint as IDebugBreakpoint);
|
|
236
238
|
};
|
|
237
239
|
|
|
240
|
+
const isExceptionBreakpoint = useMemo(() => isDebugExceptionBreakpoint(data.breakpoint), [data]);
|
|
241
|
+
|
|
238
242
|
return (
|
|
239
243
|
<div className={cls(styles.debug_breakpoints_item)}>
|
|
240
|
-
<
|
|
241
|
-
|
|
242
|
-
id={data.id}
|
|
243
|
-
onChange={handleBreakpointChange}
|
|
244
|
-
checked={enabled}
|
|
245
|
-
></CheckBox>
|
|
244
|
+
{!isExceptionBreakpoint && <div className={cls(converBreakpointClsState(), styles.debug_breakpoints_icon)}></div>}
|
|
245
|
+
<CheckBox id={data.id} onChange={handleBreakpointChange} checked={enabled}></CheckBox>
|
|
246
246
|
<div className={styles.debug_breakpoints_wrapper} onClick={handleBreakpointClick}>
|
|
247
247
|
{data.name && <span className={styles.debug_breakpoints_name}>{data.name}</span>}
|
|
248
248
|
<span className={styles.debug_breakpoints_description}>{description}</span>
|