@opensumi/ide-debug 2.22.5 → 2.22.6-next-1677758651.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/configuration/debug-configuration.view.d.ts.map +1 -1
- package/lib/browser/view/configuration/debug-configuration.view.js +9 -8
- package/lib/browser/view/configuration/debug-configuration.view.js.map +1 -1
- package/package.json +23 -23
- package/src/browser/view/configuration/debug-configuration.view.tsx +11 -7
- package/lib/browser/view/console/debug-console-toolbar.view.d.ts +0 -3
- package/lib/browser/view/console/debug-console-toolbar.view.d.ts.map +0 -1
- package/lib/browser/view/console/debug-console-toolbar.view.js +0 -20
- package/lib/browser/view/console/debug-console-toolbar.view.js.map +0 -1
- package/src/browser/view/console/debug-console-toolbar.view.tsx +0 -28
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-configuration.view.d.ts","sourceRoot":"","sources":["../../../../src/browser/view/configuration/debug-configuration.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-configuration.view.d.ts","sourceRoot":"","sources":["../../../../src/browser/view/configuration/debug-configuration.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAyK1B,UAAU,mBAAmB;IAC3B,QAAQ,IAAI,IAAI,CAAC;IACjB,iBAAiB,IAAI,IAAI,CAAC;IAC1B,gBAAgB,IAAI,IAAI,CAAC;CAC1B;AAED,eAAO,MAAM,cAAc,gFAAkE,mBAAmB,iBAqB9G,CAAC;AAEH,eAAO,MAAM,sBAAsB,iCAuDjC,CAAC"}
|
|
@@ -13,18 +13,18 @@ const components_1 = require("../../components");
|
|
|
13
13
|
const debug_configuration_module_less_1 = tslib_1.__importDefault(require("./debug-configuration.module.less"));
|
|
14
14
|
const debug_configuration_service_1 = require("./debug-configuration.service");
|
|
15
15
|
const debug_toolbar_view_1 = require("./debug-toolbar.view");
|
|
16
|
-
const ConfigurationSelector = react_1.default.memo(({ currentValue, options, onChangeConfiguration, isMultiRootWorkspace, addConfigurationLabel, toValue, workspaceRoots, }) => {
|
|
16
|
+
const ConfigurationSelector = react_1.default.memo(({ currentValue, options, onChangeConfiguration, isMultiRootWorkspace, addConfigurationLabel, toValue, workspaceRoots, isElectronRenderer, }) => {
|
|
17
17
|
const renderConfigurationOptions = react_1.default.useCallback((options) => {
|
|
18
18
|
if (options && options.length) {
|
|
19
19
|
return options.map((option, index) => {
|
|
20
20
|
const label = isMultiRootWorkspace
|
|
21
21
|
? `${option.configuration.name} (${new ide_core_browser_1.URI(option.workspaceFolderUri).displayName})`
|
|
22
22
|
: option.configuration.name;
|
|
23
|
-
return
|
|
23
|
+
return isElectronRenderer ? (react_1.default.createElement("option", { key: index, value: toValue(option), label: label }, label)) : (react_1.default.createElement(ide_components_1.Option, { key: index, value: toValue(option), label: label }, label));
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
|
-
return
|
|
27
|
+
return isElectronRenderer
|
|
28
28
|
? [
|
|
29
29
|
react_1.default.createElement("option", { value: common_1.DEFAULT_NO_CONFIGURATION_KEY, key: common_1.DEFAULT_NO_CONFIGURATION_KEY, label: (0, ide_core_browser_1.localize)('debug.action.no.configuration') }, (0, ide_core_browser_1.localize)('debug.action.no.configuration')),
|
|
30
30
|
]
|
|
@@ -41,9 +41,9 @@ const ConfigurationSelector = react_1.default.memo(({ currentValue, options, onC
|
|
|
41
41
|
if (longName.length < label.length) {
|
|
42
42
|
longName = label;
|
|
43
43
|
}
|
|
44
|
-
return
|
|
44
|
+
return isElectronRenderer ? (react_1.default.createElement("option", { value: `${common_1.DEFAULT_ADD_CONFIGURATION_KEY}${index}`, key: `${common_1.DEFAULT_ADD_CONFIGURATION_KEY}${index}`, label: label }, label)) : (react_1.default.createElement(ide_components_1.Option, { value: `${common_1.DEFAULT_ADD_CONFIGURATION_KEY}${index}`, key: `${common_1.DEFAULT_ADD_CONFIGURATION_KEY}${index}`, label: label }, label));
|
|
45
45
|
});
|
|
46
|
-
const disabledOption =
|
|
46
|
+
const disabledOption = isElectronRenderer
|
|
47
47
|
? [
|
|
48
48
|
react_1.default.createElement("option", { disabled: true, key: '--', value: longName.replace(/./g, '-') }, longName.replace(/./g, '-')),
|
|
49
49
|
]
|
|
@@ -54,7 +54,7 @@ const ConfigurationSelector = react_1.default.memo(({ currentValue, options, onC
|
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
56
|
const label = addConfigurationLabel;
|
|
57
|
-
return
|
|
57
|
+
return isElectronRenderer
|
|
58
58
|
? [
|
|
59
59
|
react_1.default.createElement("option", { disabled: true, key: '--', value: label.replace(/./g, '-') }, label.replace(/./g, '-')),
|
|
60
60
|
react_1.default.createElement("option", { value: common_1.DEFAULT_ADD_CONFIGURATION_KEY, key: common_1.DEFAULT_ADD_CONFIGURATION_KEY, label: label }, label),
|
|
@@ -65,7 +65,7 @@ const ConfigurationSelector = react_1.default.memo(({ currentValue, options, onC
|
|
|
65
65
|
];
|
|
66
66
|
}
|
|
67
67
|
}, [isMultiRootWorkspace, addConfigurationLabel]);
|
|
68
|
-
if (
|
|
68
|
+
if (isElectronRenderer) {
|
|
69
69
|
return (react_1.default.createElement(select_1.Select, { value: currentValue, onChange: onChangeConfiguration, className: (0, classnames_1.default)(debug_configuration_module_less_1.default.debug_selection, debug_configuration_module_less_1.default.special_radius) },
|
|
70
70
|
renderConfigurationOptions(options),
|
|
71
71
|
renderAddConfigurationOptions()));
|
|
@@ -80,6 +80,7 @@ exports.DebugActionBar = react_1.default.memo(({ runDebug, openConfiguration, op
|
|
|
80
80
|
react_1.default.createElement(components_1.DebugAction, { id: 'debug.action.debug.console', icon: 'terminal', label: (0, ide_core_browser_1.localize)('debug.action.debug.console'), run: openDebugConsole }))));
|
|
81
81
|
exports.DebugConfigurationView = (0, mobx_react_lite_1.observer)((props) => {
|
|
82
82
|
const { configurationOptions, toValue, currentValue, openConfiguration, addConfiguration, openDebugConsole, updateConfiguration, start, float, isMultiRootWorkspace, workspaceRoots, } = (0, ide_core_browser_1.useInjectable)(debug_configuration_service_1.DebugConfigurationService);
|
|
83
|
+
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
83
84
|
const addConfigurationLabel = (0, ide_core_browser_1.localize)('debug.action.add.configuration');
|
|
84
85
|
const setCurrentConfiguration = react_1.default.useCallback((event) => {
|
|
85
86
|
let value;
|
|
@@ -106,7 +107,7 @@ exports.DebugConfigurationView = (0, mobx_react_lite_1.observer)((props) => {
|
|
|
106
107
|
}, []);
|
|
107
108
|
return (react_1.default.createElement("div", null,
|
|
108
109
|
react_1.default.createElement("div", { className: debug_configuration_module_less_1.default.debug_configuration_toolbar },
|
|
109
|
-
react_1.default.createElement(ConfigurationSelector, { currentValue: currentValue, options: configurationOptions, onChangeConfiguration: setCurrentConfiguration, isMultiRootWorkspace: isMultiRootWorkspace, addConfigurationLabel: addConfigurationLabel, toValue: toValue, workspaceRoots: workspaceRoots }),
|
|
110
|
+
react_1.default.createElement(ConfigurationSelector, { currentValue: currentValue, options: configurationOptions, onChangeConfiguration: setCurrentConfiguration, isMultiRootWorkspace: isMultiRootWorkspace, addConfigurationLabel: addConfigurationLabel, toValue: toValue, isElectronRenderer: appConfig.isElectronRenderer, workspaceRoots: workspaceRoots }),
|
|
110
111
|
react_1.default.createElement(exports.DebugActionBar, { runDebug: start, openConfiguration: openConfiguration, openDebugConsole: openDebugConsole })),
|
|
111
112
|
!float && react_1.default.createElement(debug_toolbar_view_1.DebugToolbarView, { float: false })));
|
|
112
113
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-configuration.view.js","sourceRoot":"","sources":["../../../../src/browser/view/configuration/debug-configuration.view.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,qDAA2C;AAC3C,0DAA0B;AAE1B,6DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"debug-configuration.view.js","sourceRoot":"","sources":["../../../../src/browser/view/configuration/debug-configuration.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.22.
|
|
3
|
+
"version": "2.22.6-next-1677758651.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.22.
|
|
21
|
-
"@opensumi/ide-core-common": "2.22.
|
|
22
|
-
"@opensumi/ide-core-node": "2.22.
|
|
23
|
-
"@opensumi/ide-file-service": "2.22.
|
|
24
|
-
"@opensumi/ide-task": "2.22.
|
|
25
|
-
"@opensumi/ide-terminal-next": "2.22.
|
|
20
|
+
"@opensumi/ide-connection": "2.22.6-next-1677758651.0",
|
|
21
|
+
"@opensumi/ide-core-common": "2.22.6-next-1677758651.0",
|
|
22
|
+
"@opensumi/ide-core-node": "2.22.6-next-1677758651.0",
|
|
23
|
+
"@opensumi/ide-file-service": "2.22.6-next-1677758651.0",
|
|
24
|
+
"@opensumi/ide-task": "2.22.6-next-1677758651.0",
|
|
25
|
+
"@opensumi/ide-terminal-next": "2.22.6-next-1677758651.0",
|
|
26
26
|
"anser": "^1.4.9",
|
|
27
27
|
"btoa": "^1.2.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@opensumi/ide-components": "2.22.
|
|
31
|
-
"@opensumi/ide-core-browser": "2.22.
|
|
30
|
+
"@opensumi/ide-components": "2.22.6-next-1677758651.0",
|
|
31
|
+
"@opensumi/ide-core-browser": "2.22.6-next-1677758651.0",
|
|
32
32
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
33
|
-
"@opensumi/ide-editor": "2.22.
|
|
34
|
-
"@opensumi/ide-main-layout": "2.22.
|
|
35
|
-
"@opensumi/ide-monaco": "2.22.
|
|
36
|
-
"@opensumi/ide-monaco-enhance": "2.22.
|
|
37
|
-
"@opensumi/ide-output": "2.22.
|
|
38
|
-
"@opensumi/ide-overlay": "2.22.
|
|
39
|
-
"@opensumi/ide-preferences": "2.22.
|
|
40
|
-
"@opensumi/ide-quick-open": "2.22.
|
|
41
|
-
"@opensumi/ide-storage": "2.22.
|
|
42
|
-
"@opensumi/ide-theme": "2.22.
|
|
43
|
-
"@opensumi/ide-variable": "2.22.
|
|
44
|
-
"@opensumi/ide-workspace": "2.22.
|
|
45
|
-
"@opensumi/ide-workspace-edit": "2.22.
|
|
33
|
+
"@opensumi/ide-editor": "2.22.6-next-1677758651.0",
|
|
34
|
+
"@opensumi/ide-main-layout": "2.22.6-next-1677758651.0",
|
|
35
|
+
"@opensumi/ide-monaco": "2.22.6-next-1677758651.0",
|
|
36
|
+
"@opensumi/ide-monaco-enhance": "2.22.6-next-1677758651.0",
|
|
37
|
+
"@opensumi/ide-output": "2.22.6-next-1677758651.0",
|
|
38
|
+
"@opensumi/ide-overlay": "2.22.6-next-1677758651.0",
|
|
39
|
+
"@opensumi/ide-preferences": "2.22.6-next-1677758651.0",
|
|
40
|
+
"@opensumi/ide-quick-open": "2.22.6-next-1677758651.0",
|
|
41
|
+
"@opensumi/ide-storage": "2.22.6-next-1677758651.0",
|
|
42
|
+
"@opensumi/ide-theme": "2.22.6-next-1677758651.0",
|
|
43
|
+
"@opensumi/ide-variable": "2.22.6-next-1677758651.0",
|
|
44
|
+
"@opensumi/ide-workspace": "2.22.6-next-1677758651.0",
|
|
45
|
+
"@opensumi/ide-workspace-edit": "2.22.6-next-1677758651.0",
|
|
46
46
|
"@types/btoa": "^1.2.3"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "68702af53012e4586d6ea7f8925c5bdb312ec0b6"
|
|
49
49
|
}
|
|
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react-lite';
|
|
|
3
3
|
import React from 'react';
|
|
4
4
|
|
|
5
5
|
import { Select, Option } from '@opensumi/ide-components';
|
|
6
|
-
import { useInjectable, localize,
|
|
6
|
+
import { useInjectable, localize, URI, AppConfig } from '@opensumi/ide-core-browser';
|
|
7
7
|
import { Select as NativeSelect } from '@opensumi/ide-core-browser/lib/components/select';
|
|
8
8
|
|
|
9
9
|
import {
|
|
@@ -25,6 +25,7 @@ interface ConfigurationSelectorProps {
|
|
|
25
25
|
isMultiRootWorkspace: boolean;
|
|
26
26
|
addConfigurationLabel: string;
|
|
27
27
|
workspaceRoots: string[];
|
|
28
|
+
isElectronRenderer: boolean;
|
|
28
29
|
toValue: (option: DebugSessionOptions) => string;
|
|
29
30
|
onChangeConfiguration(event: React.ChangeEvent<HTMLSelectElement> | string): void;
|
|
30
31
|
}
|
|
@@ -38,6 +39,7 @@ const ConfigurationSelector = React.memo(
|
|
|
38
39
|
addConfigurationLabel,
|
|
39
40
|
toValue,
|
|
40
41
|
workspaceRoots,
|
|
42
|
+
isElectronRenderer,
|
|
41
43
|
}: ConfigurationSelectorProps) => {
|
|
42
44
|
const renderConfigurationOptions = React.useCallback(
|
|
43
45
|
(options) => {
|
|
@@ -46,7 +48,7 @@ const ConfigurationSelector = React.memo(
|
|
|
46
48
|
const label = isMultiRootWorkspace
|
|
47
49
|
? `${option.configuration.name} (${new URI(option.workspaceFolderUri).displayName})`
|
|
48
50
|
: option.configuration.name;
|
|
49
|
-
return isElectronRenderer
|
|
51
|
+
return isElectronRenderer ? (
|
|
50
52
|
<option key={index} value={toValue(option)} label={label}>
|
|
51
53
|
{label}
|
|
52
54
|
</option>
|
|
@@ -57,7 +59,7 @@ const ConfigurationSelector = React.memo(
|
|
|
57
59
|
);
|
|
58
60
|
});
|
|
59
61
|
} else {
|
|
60
|
-
return isElectronRenderer
|
|
62
|
+
return isElectronRenderer
|
|
61
63
|
? [
|
|
62
64
|
<option
|
|
63
65
|
value={DEFAULT_NO_CONFIGURATION_KEY}
|
|
@@ -89,7 +91,7 @@ const ConfigurationSelector = React.memo(
|
|
|
89
91
|
if (longName.length < label.length) {
|
|
90
92
|
longName = label;
|
|
91
93
|
}
|
|
92
|
-
return isElectronRenderer
|
|
94
|
+
return isElectronRenderer ? (
|
|
93
95
|
<option
|
|
94
96
|
value={`${DEFAULT_ADD_CONFIGURATION_KEY}${index}`}
|
|
95
97
|
key={`${DEFAULT_ADD_CONFIGURATION_KEY}${index}`}
|
|
@@ -107,7 +109,7 @@ const ConfigurationSelector = React.memo(
|
|
|
107
109
|
</Option>
|
|
108
110
|
);
|
|
109
111
|
});
|
|
110
|
-
const disabledOption = isElectronRenderer
|
|
112
|
+
const disabledOption = isElectronRenderer
|
|
111
113
|
? [
|
|
112
114
|
<option disabled key={'--'} value={longName!.replace(/./g, '-')}>
|
|
113
115
|
{longName!.replace(/./g, '-')}
|
|
@@ -121,7 +123,7 @@ const ConfigurationSelector = React.memo(
|
|
|
121
123
|
return disabledOption.concat(addonOptions);
|
|
122
124
|
} else {
|
|
123
125
|
const label = addConfigurationLabel;
|
|
124
|
-
return isElectronRenderer
|
|
126
|
+
return isElectronRenderer
|
|
125
127
|
? [
|
|
126
128
|
<option disabled key={'--'} value={label!.replace(/./g, '-')}>
|
|
127
129
|
{label!.replace(/./g, '-')}
|
|
@@ -141,7 +143,7 @@ const ConfigurationSelector = React.memo(
|
|
|
141
143
|
}
|
|
142
144
|
}, [isMultiRootWorkspace, addConfigurationLabel]);
|
|
143
145
|
|
|
144
|
-
if (isElectronRenderer
|
|
146
|
+
if (isElectronRenderer) {
|
|
145
147
|
return (
|
|
146
148
|
<NativeSelect
|
|
147
149
|
value={currentValue}
|
|
@@ -210,6 +212,7 @@ export const DebugConfigurationView = observer((props) => {
|
|
|
210
212
|
isMultiRootWorkspace,
|
|
211
213
|
workspaceRoots,
|
|
212
214
|
} = useInjectable<DebugConfigurationService>(DebugConfigurationService);
|
|
215
|
+
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
213
216
|
const addConfigurationLabel = localize('debug.action.add.configuration');
|
|
214
217
|
const setCurrentConfiguration = React.useCallback((event: React.ChangeEvent<HTMLSelectElement> | string) => {
|
|
215
218
|
let value: React.ChangeEvent<HTMLSelectElement> | string;
|
|
@@ -242,6 +245,7 @@ export const DebugConfigurationView = observer((props) => {
|
|
|
242
245
|
isMultiRootWorkspace={isMultiRootWorkspace}
|
|
243
246
|
addConfigurationLabel={addConfigurationLabel}
|
|
244
247
|
toValue={toValue}
|
|
248
|
+
isElectronRenderer={appConfig.isElectronRenderer}
|
|
245
249
|
workspaceRoots={workspaceRoots}
|
|
246
250
|
/>
|
|
247
251
|
<DebugActionBar runDebug={start} openConfiguration={openConfiguration} openDebugConsole={openDebugConsole} />
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"debug-console-toolbar.view.d.ts","sourceRoot":"","sources":["../../../../src/browser/view/console/debug-console-toolbar.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,eAAO,MAAM,uBAAuB,iCAkBlC,CAAC"}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DebugConsoleToolbarView = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
6
|
-
const react_1 = tslib_1.__importDefault(require("react"));
|
|
7
|
-
const ide_components_1 = require("@opensumi/ide-components");
|
|
8
|
-
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
9
|
-
const select_1 = require("@opensumi/ide-core-browser/lib/components/select");
|
|
10
|
-
const debug_console_module_less_1 = tslib_1.__importDefault(require("./debug-console.module.less"));
|
|
11
|
-
exports.DebugConsoleToolbarView = (0, mobx_react_lite_1.observer)(() => {
|
|
12
|
-
if ((0, ide_core_browser_1.isElectronRenderer)()) {
|
|
13
|
-
return (react_1.default.createElement(select_1.Select, { value: 'default', className: debug_console_module_less_1.default.debug_console_select },
|
|
14
|
-
react_1.default.createElement("option", { value: 'default' }, (0, ide_core_browser_1.localize)('debug.console.panel.default'))));
|
|
15
|
-
}
|
|
16
|
-
return (react_1.default.createElement("div", { className: debug_console_module_less_1.default.debug_console_toolbar },
|
|
17
|
-
react_1.default.createElement(ide_components_1.Select, { size: 'small', value: 'default', className: debug_console_module_less_1.default.debug_console_select },
|
|
18
|
-
react_1.default.createElement(ide_components_1.Option, { value: 'default', label: (0, ide_core_browser_1.localize)('debug.console.panel.default') }, (0, ide_core_browser_1.localize)('debug.console.panel.default')))));
|
|
19
|
-
});
|
|
20
|
-
//# sourceMappingURL=debug-console-toolbar.view.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"debug-console-toolbar.view.js","sourceRoot":"","sources":["../../../../src/browser/view/console/debug-console-toolbar.view.tsx"],"names":[],"mappings":";;;;AAAA,qDAA2C;AAC3C,0DAA0B;AAE1B,6DAA0D;AAC1D,iEAA0E;AAC1E,6EAA0F;AAE1F,oGAAiD;AAEpC,QAAA,uBAAuB,GAAG,IAAA,0BAAQ,EAAC,GAAG,EAAE;IACnD,IAAI,IAAA,qCAAkB,GAAE,EAAE;QACxB,OAAO,CACL,8BAAC,eAAY,IAAC,KAAK,EAAC,SAAS,EAAC,SAAS,EAAE,mCAAM,CAAC,oBAAoB;YAClE,0CAAQ,KAAK,EAAC,SAAS,IAAE,IAAA,2BAAQ,EAAC,6BAA6B,CAAC,CAAU,CAC7D,CAChB,CAAC;KACH;IAED,OAAO,CACL,uCAAK,SAAS,EAAE,mCAAM,CAAC,qBAAqB;QAC1C,8BAAC,uBAAM,IAAC,IAAI,EAAC,OAAO,EAAC,KAAK,EAAC,SAAS,EAAC,SAAS,EAAE,mCAAM,CAAC,oBAAoB;YACzE,8BAAC,uBAAM,IAAC,KAAK,EAAC,SAAS,EAAC,KAAK,EAAE,IAAA,2BAAQ,EAAC,6BAA6B,CAAC,IACnE,IAAA,2BAAQ,EAAC,6BAA6B,CAAC,CACjC,CACF,CACL,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
import { observer } from 'mobx-react-lite';
|
|
2
|
-
import React from 'react';
|
|
3
|
-
|
|
4
|
-
import { Select, Option } from '@opensumi/ide-components';
|
|
5
|
-
import { localize, isElectronRenderer } from '@opensumi/ide-core-browser';
|
|
6
|
-
import { Select as NativeSelect } from '@opensumi/ide-core-browser/lib/components/select';
|
|
7
|
-
|
|
8
|
-
import styles from './debug-console.module.less';
|
|
9
|
-
|
|
10
|
-
export const DebugConsoleToolbarView = observer(() => {
|
|
11
|
-
if (isElectronRenderer()) {
|
|
12
|
-
return (
|
|
13
|
-
<NativeSelect value='default' className={styles.debug_console_select}>
|
|
14
|
-
<option value='default'>{localize('debug.console.panel.default')}</option>
|
|
15
|
-
</NativeSelect>
|
|
16
|
-
);
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
return (
|
|
20
|
-
<div className={styles.debug_console_toolbar}>
|
|
21
|
-
<Select size='small' value='default' className={styles.debug_console_select}>
|
|
22
|
-
<Option value='default' label={localize('debug.console.panel.default')}>
|
|
23
|
-
{localize('debug.console.panel.default')}
|
|
24
|
-
</Option>
|
|
25
|
-
</Select>
|
|
26
|
-
</div>
|
|
27
|
-
);
|
|
28
|
-
});
|