@opensumi/ide-debug 2.24.2 → 2.24.3-next-1684292909.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 +30 -9
- package/lib/browser/view/breakpoints/debug-breakpoints.view.d.ts +1 -3
- package/lib/browser/view/breakpoints/debug-breakpoints.view.d.ts.map +1 -1
- package/lib/browser/view/breakpoints/debug-breakpoints.view.js +23 -26
- 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 +30 -9
- package/src/browser/view/breakpoints/debug-breakpoints.view.tsx +52 -52
|
@@ -3,6 +3,19 @@
|
|
|
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
|
+
}
|
|
6
19
|
}
|
|
7
20
|
|
|
8
21
|
.debug_breakpoints_disabled {
|
|
@@ -37,10 +50,21 @@
|
|
|
37
50
|
}
|
|
38
51
|
|
|
39
52
|
.debug_breakpoints_icon {
|
|
40
|
-
width:
|
|
41
|
-
height:
|
|
42
|
-
min-width:
|
|
43
|
-
|
|
53
|
+
width: 20px;
|
|
54
|
+
height: 20px;
|
|
55
|
+
min-width: 20px;
|
|
56
|
+
:global {
|
|
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;
|
|
44
68
|
}
|
|
45
69
|
|
|
46
70
|
.debug_breakpoints_badge {
|
|
@@ -63,10 +87,7 @@
|
|
|
63
87
|
overflow: hidden;
|
|
64
88
|
text-overflow: ellipsis;
|
|
65
89
|
white-space: nowrap;
|
|
66
|
-
margin-right:
|
|
90
|
+
margin-right: 4px;
|
|
91
|
+
margin-left: 4px;
|
|
67
92
|
flex: 1;
|
|
68
93
|
}
|
|
69
|
-
|
|
70
|
-
.debug_breakpoints_item_tree_node {
|
|
71
|
-
padding-left: 27px !important;
|
|
72
|
-
}
|
|
@@ -12,10 +12,8 @@ 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 }: {
|
|
16
16
|
data: BreakpointItem;
|
|
17
17
|
toggle: () => void;
|
|
18
|
-
isDebugMode: boolean;
|
|
19
|
-
breakpointEnabled: boolean;
|
|
20
18
|
}) => JSX.Element;
|
|
21
19
|
//# 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,KAAmD,MAAM,OAAO,CAAC;AAIxE,OAAO,EAOL,SAAS,EACT,KAAK,EACN,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,gBAAgB,EAA2C,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EACL,wBAAwB,EAKzB,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;EA8HxG,CAAC;AAEH,eAAO,MAAM,cAAc;UAA8B,cAAc;YAAU,MAAM,IAAI;iBAgG1F,CAAC"}
|
|
@@ -17,6 +17,18 @@ 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
|
+
};
|
|
20
32
|
const updateTreeData = (0, react_1.useCallback)((nodes) => {
|
|
21
33
|
const { roots } = debugBreakpointsService;
|
|
22
34
|
const breakpointTreeData = [];
|
|
@@ -29,7 +41,7 @@ exports.DebugBreakpointView = (0, mobx_react_lite_1.observer)(({ viewState }) =>
|
|
|
29
41
|
label: '',
|
|
30
42
|
expandable: false,
|
|
31
43
|
children: [],
|
|
32
|
-
description: (react_1.default.createElement(exports.BreakpointItem, { toggle: () => toggleBreakpointEnable(item.breakpoint),
|
|
44
|
+
description: (react_1.default.createElement(exports.BreakpointItem, { toggle: () => toggleBreakpointEnable(item.breakpoint), data: item.rawData })),
|
|
33
45
|
});
|
|
34
46
|
});
|
|
35
47
|
}
|
|
@@ -41,7 +53,11 @@ exports.DebugBreakpointView = (0, mobx_react_lite_1.observer)(({ viewState }) =>
|
|
|
41
53
|
expandable: true,
|
|
42
54
|
iconClassName: (0, ide_core_browser_1.getIcon)('file-text'),
|
|
43
55
|
expanded: true,
|
|
44
|
-
children: items.map((item) => (Object.assign(Object.assign({}, item), { label: '', expandable: false,
|
|
56
|
+
children: items.map((item) => (Object.assign(Object.assign({}, item), { label: '', expandable: false, twisterPlaceholderClassName: debug_breakpoints_module_less_1.default.tree_item_twister_placeholder, breakpoint: item.breakpoint, iconClassName: (0, classnames_1.default)(getBreakpointClsState({
|
|
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 })) }))),
|
|
45
61
|
});
|
|
46
62
|
}
|
|
47
63
|
});
|
|
@@ -67,15 +83,12 @@ exports.DebugBreakpointView = (0, mobx_react_lite_1.observer)(({ viewState }) =>
|
|
|
67
83
|
});
|
|
68
84
|
}
|
|
69
85
|
}, [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
|
-
}, []);
|
|
75
86
|
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) },
|
|
76
|
-
react_1.default.createElement(ide_components_1.BasicRecycleTree, {
|
|
87
|
+
react_1.default.createElement(ide_components_1.BasicRecycleTree, { onIconClick: (_, item) => {
|
|
88
|
+
toggleBreakpointEnable(item.raw.breakpoint);
|
|
89
|
+
}, indent: 20, baseIndent: 8, treeData: treeData, height: viewState.height })));
|
|
77
90
|
});
|
|
78
|
-
const BreakpointItem = ({ data, toggle
|
|
91
|
+
const BreakpointItem = ({ data, toggle }) => {
|
|
79
92
|
const defaultValue = (0, breakpoint_1.isDebugBreakpoint)(data.breakpoint) ? data.breakpoint.enabled : !!data.breakpoint.default;
|
|
80
93
|
const manager = (0, ide_core_browser_1.useInjectable)(common_1.IDebugSessionManager);
|
|
81
94
|
const commandService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandService);
|
|
@@ -128,28 +141,12 @@ const BreakpointItem = ({ data, toggle, isDebugMode, breakpointEnabled, }) => {
|
|
|
128
141
|
disposable.dispose();
|
|
129
142
|
};
|
|
130
143
|
}, []);
|
|
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
|
-
};
|
|
145
144
|
const removeBreakpoint = (event) => {
|
|
146
145
|
event.stopPropagation();
|
|
147
146
|
debugBreakpointsService.delBreakpoint(data.breakpoint);
|
|
148
147
|
};
|
|
149
|
-
const isExceptionBreakpoint = (0, react_1.useMemo)(() => (0, breakpoint_1.isDebugExceptionBreakpoint)(data.breakpoint), [data]);
|
|
150
148
|
return (react_1.default.createElement("div", { className: (0, classnames_1.default)(debug_breakpoints_module_less_1.default.debug_breakpoints_item) },
|
|
151
|
-
|
|
152
|
-
react_1.default.createElement(ide_components_1.CheckBox, { id: data.id, onChange: handleBreakpointChange, checked: enabled }),
|
|
149
|
+
react_1.default.createElement(ide_components_1.CheckBox, { className: debug_breakpoints_module_less_1.default.debug_breakpoints_icon, id: data.id, onChange: handleBreakpointChange, checked: enabled }),
|
|
153
150
|
react_1.default.createElement("div", { className: debug_breakpoints_module_less_1.default.debug_breakpoints_wrapper, onClick: handleBreakpointClick },
|
|
154
151
|
data.name && react_1.default.createElement("span", { className: debug_breakpoints_module_less_1.default.debug_breakpoints_name }, data.name),
|
|
155
152
|
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
|
+
"version": "2.24.3-next-1684292909.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.
|
|
21
|
-
"@opensumi/ide-core-common": "2.24.
|
|
22
|
-
"@opensumi/ide-core-node": "2.24.
|
|
23
|
-
"@opensumi/ide-file-service": "2.24.
|
|
24
|
-
"@opensumi/ide-task": "2.24.
|
|
25
|
-
"@opensumi/ide-terminal-next": "2.24.
|
|
20
|
+
"@opensumi/ide-connection": "2.24.3-next-1684292909.0",
|
|
21
|
+
"@opensumi/ide-core-common": "2.24.3-next-1684292909.0",
|
|
22
|
+
"@opensumi/ide-core-node": "2.24.3-next-1684292909.0",
|
|
23
|
+
"@opensumi/ide-file-service": "2.24.3-next-1684292909.0",
|
|
24
|
+
"@opensumi/ide-task": "2.24.3-next-1684292909.0",
|
|
25
|
+
"@opensumi/ide-terminal-next": "2.24.3-next-1684292909.0",
|
|
26
26
|
"anser": "^1.4.9",
|
|
27
27
|
"btoa": "^1.2.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@opensumi/ide-components": "2.24.
|
|
31
|
-
"@opensumi/ide-core-browser": "2.24.
|
|
30
|
+
"@opensumi/ide-components": "2.24.3-next-1684292909.0",
|
|
31
|
+
"@opensumi/ide-core-browser": "2.24.3-next-1684292909.0",
|
|
32
32
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
33
|
-
"@opensumi/ide-editor": "2.24.
|
|
34
|
-
"@opensumi/ide-main-layout": "2.24.
|
|
35
|
-
"@opensumi/ide-monaco": "2.24.
|
|
36
|
-
"@opensumi/ide-monaco-enhance": "2.24.
|
|
37
|
-
"@opensumi/ide-output": "2.24.
|
|
38
|
-
"@opensumi/ide-overlay": "2.24.
|
|
39
|
-
"@opensumi/ide-preferences": "2.24.
|
|
40
|
-
"@opensumi/ide-quick-open": "2.24.
|
|
41
|
-
"@opensumi/ide-storage": "2.24.
|
|
42
|
-
"@opensumi/ide-theme": "2.24.
|
|
43
|
-
"@opensumi/ide-variable": "2.24.
|
|
44
|
-
"@opensumi/ide-workspace": "2.24.
|
|
45
|
-
"@opensumi/ide-workspace-edit": "2.24.
|
|
33
|
+
"@opensumi/ide-editor": "2.24.3-next-1684292909.0",
|
|
34
|
+
"@opensumi/ide-main-layout": "2.24.3-next-1684292909.0",
|
|
35
|
+
"@opensumi/ide-monaco": "2.24.3-next-1684292909.0",
|
|
36
|
+
"@opensumi/ide-monaco-enhance": "2.24.3-next-1684292909.0",
|
|
37
|
+
"@opensumi/ide-output": "2.24.3-next-1684292909.0",
|
|
38
|
+
"@opensumi/ide-overlay": "2.24.3-next-1684292909.0",
|
|
39
|
+
"@opensumi/ide-preferences": "2.24.3-next-1684292909.0",
|
|
40
|
+
"@opensumi/ide-quick-open": "2.24.3-next-1684292909.0",
|
|
41
|
+
"@opensumi/ide-storage": "2.24.3-next-1684292909.0",
|
|
42
|
+
"@opensumi/ide-theme": "2.24.3-next-1684292909.0",
|
|
43
|
+
"@opensumi/ide-variable": "2.24.3-next-1684292909.0",
|
|
44
|
+
"@opensumi/ide-workspace": "2.24.3-next-1684292909.0",
|
|
45
|
+
"@opensumi/ide-workspace-edit": "2.24.3-next-1684292909.0",
|
|
46
46
|
"@types/btoa": "^1.2.3"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "4efae81f31ce805f8d9c672f181085ddf70cfbeb"
|
|
49
49
|
}
|
|
@@ -3,6 +3,19 @@
|
|
|
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
|
+
}
|
|
6
19
|
}
|
|
7
20
|
|
|
8
21
|
.debug_breakpoints_disabled {
|
|
@@ -37,10 +50,21 @@
|
|
|
37
50
|
}
|
|
38
51
|
|
|
39
52
|
.debug_breakpoints_icon {
|
|
40
|
-
width:
|
|
41
|
-
height:
|
|
42
|
-
min-width:
|
|
43
|
-
|
|
53
|
+
width: 20px;
|
|
54
|
+
height: 20px;
|
|
55
|
+
min-width: 20px;
|
|
56
|
+
:global {
|
|
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;
|
|
44
68
|
}
|
|
45
69
|
|
|
46
70
|
.debug_breakpoints_badge {
|
|
@@ -63,10 +87,7 @@
|
|
|
63
87
|
overflow: hidden;
|
|
64
88
|
text-overflow: ellipsis;
|
|
65
89
|
white-space: nowrap;
|
|
66
|
-
margin-right:
|
|
90
|
+
margin-right: 4px;
|
|
91
|
+
margin-left: 4px;
|
|
67
92
|
flex: 1;
|
|
68
93
|
}
|
|
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,
|
|
3
|
+
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
4
4
|
|
|
5
|
-
import { BasicRecycleTree, CheckBox, IBasicTreeData
|
|
5
|
+
import { BasicRecycleTree, CheckBox, IBasicTreeData } from '@opensumi/ide-components';
|
|
6
6
|
import { Badge } from '@opensumi/ide-components';
|
|
7
7
|
import {
|
|
8
8
|
useInjectable,
|
|
@@ -13,7 +13,6 @@ import {
|
|
|
13
13
|
Disposable,
|
|
14
14
|
ViewState,
|
|
15
15
|
Event,
|
|
16
|
-
isUndefined,
|
|
17
16
|
} from '@opensumi/ide-core-browser';
|
|
18
17
|
import { DebugProtocol } from '@opensumi/vscode-debugprotocol/lib/debugProtocol';
|
|
19
18
|
|
|
@@ -23,7 +22,6 @@ import {
|
|
|
23
22
|
isDebugBreakpoint,
|
|
24
23
|
isRuntimeBreakpoint,
|
|
25
24
|
getStatus,
|
|
26
|
-
isDebugExceptionBreakpoint,
|
|
27
25
|
EXCEPTION_BREAKPOINT_URI,
|
|
28
26
|
} from '../../breakpoint';
|
|
29
27
|
import { DebugSessionManager } from '../../debug-session-manager';
|
|
@@ -46,6 +44,30 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
|
|
|
46
44
|
const isDisposed = useRef<boolean>(false);
|
|
47
45
|
const [treeData, setTreeData] = useState<IBasicTreeData[]>([]);
|
|
48
46
|
|
|
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
|
+
|
|
49
71
|
const updateTreeData = useCallback(
|
|
50
72
|
(nodes: [string, BreakpointsTreeNode[]][]) => {
|
|
51
73
|
const { roots } = debugBreakpointsService;
|
|
@@ -61,9 +83,7 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
|
|
|
61
83
|
description: (
|
|
62
84
|
<BreakpointItem
|
|
63
85
|
toggle={() => toggleBreakpointEnable(item.breakpoint)}
|
|
64
|
-
breakpointEnabled={enable}
|
|
65
86
|
data={item.rawData}
|
|
66
|
-
isDebugMode={debugBreakpointsService.inDebugMode}
|
|
67
87
|
></BreakpointItem>
|
|
68
88
|
),
|
|
69
89
|
});
|
|
@@ -81,12 +101,20 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
|
|
|
81
101
|
...item,
|
|
82
102
|
label: '',
|
|
83
103
|
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
|
+
),
|
|
84
114
|
description: (
|
|
85
115
|
<BreakpointItem
|
|
86
116
|
toggle={() => toggleBreakpointEnable(item.breakpoint)}
|
|
87
|
-
breakpointEnabled={enable}
|
|
88
117
|
data={item.rawData}
|
|
89
|
-
isDebugMode={debugBreakpointsService.inDebugMode}
|
|
90
118
|
></BreakpointItem>
|
|
91
119
|
),
|
|
92
120
|
})),
|
|
@@ -123,29 +151,22 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
|
|
|
123
151
|
}
|
|
124
152
|
}, [treeData]);
|
|
125
153
|
|
|
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
|
-
}, []);
|
|
131
154
|
return (
|
|
132
155
|
<div className={cls(styles.debug_breakpoints, !enable && styles.debug_breakpoints_disabled)}>
|
|
133
|
-
<BasicRecycleTree
|
|
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
|
+
/>
|
|
134
165
|
</div>
|
|
135
166
|
);
|
|
136
167
|
});
|
|
137
168
|
|
|
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
|
-
}) => {
|
|
169
|
+
export const BreakpointItem = ({ data, toggle }: { data: BreakpointItem; toggle: () => void }) => {
|
|
149
170
|
const defaultValue = isDebugBreakpoint(data.breakpoint) ? data.breakpoint.enabled : !!data.breakpoint.default;
|
|
150
171
|
const manager = useInjectable<DebugSessionManager>(IDebugSessionManager);
|
|
151
172
|
const commandService = useInjectable<CommandService>(CommandService);
|
|
@@ -209,40 +230,19 @@ export const BreakpointItem = ({
|
|
|
209
230
|
};
|
|
210
231
|
}, []);
|
|
211
232
|
|
|
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
|
-
|
|
235
233
|
const removeBreakpoint = (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
|
|
236
234
|
event.stopPropagation();
|
|
237
235
|
debugBreakpointsService.delBreakpoint(data.breakpoint as IDebugBreakpoint);
|
|
238
236
|
};
|
|
239
237
|
|
|
240
|
-
const isExceptionBreakpoint = useMemo(() => isDebugExceptionBreakpoint(data.breakpoint), [data]);
|
|
241
|
-
|
|
242
238
|
return (
|
|
243
239
|
<div className={cls(styles.debug_breakpoints_item)}>
|
|
244
|
-
|
|
245
|
-
|
|
240
|
+
<CheckBox
|
|
241
|
+
className={styles.debug_breakpoints_icon}
|
|
242
|
+
id={data.id}
|
|
243
|
+
onChange={handleBreakpointChange}
|
|
244
|
+
checked={enabled}
|
|
245
|
+
></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>
|