Skip to content

Commit 8b5365a

Browse files
juliasilgejmcpherskv9898softwarenerd
authored
Move data summary setting from "positron" to "dataExplorer" (#7390)
This is an internal, non-fork PR applying the commits from #7263, because of the problems outlined in #6628 Looking good! ![Screenshot 2025-04-25 at 9 32 32 AM](https://github.com/user-attachments/assets/e49459da-c234-43d1-b840-6eaba45aa982) ### Release Notes #### New Features - N/A #### Bug Fixes - Improved discoverability of Data Explorer settings, thanks to @kv9898 --------- Signed-off-by: Dianyi Yang <[email protected]> Co-authored-by: Jonathan McPherson <[email protected]> Co-authored-by: Dianyi Yang <[email protected]> Co-authored-by: Dianyi Yang <[email protected]> Co-authored-by: Brian Lambert <[email protected]>
1 parent b34006b commit 8b5365a

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

src/vs/workbench/contrib/preferences/browser/settingsLayout.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ export const tocData: ITOCEntry<string> = {
170170
label: localize('fileExplorer', "Explorer"),
171171
settings: ['explorer.*', 'outline.*']
172172
},
173+
// --- Start Positron ---
174+
{
175+
id: 'features/dataExplorer',
176+
label: localize('positron.dataExplorer', "Data Explorer"),
177+
settings: ['dataExplorer.*']
178+
},
179+
// --- End Positron ---
173180
{
174181
id: 'features/search',
175182
label: localize('search', "Search"),

src/vs/workbench/services/positronDataExplorer/browser/positronDataExplorerSummary.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ import { positronConfigurationNodeBase } from '../../languageRuntime/common/lang
1515
import { PositronDataExplorerLayout } from './interfaces/positronDataExplorerService.js';
1616

1717
// Key for the configuration setting
18-
export const USE_POSITRON_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY =
19-
'positron.dataExplorerSummaryCollapsed';
20-
export const USE_POSITRON_DATA_EXPLORER_SUMMARY_LAYOUT_KEY =
21-
'positron.dataExplorerSummaryLayout';
18+
export const USE_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY =
19+
'dataExplorer.summaryCollapsed';
20+
export const USE_DATA_EXPLORER_SUMMARY_LAYOUT_KEY =
21+
'dataExplorer.summaryLayout';
2222

2323
export function DataExplorerSummaryCollapseEnabled(
2424
configurationService: IConfigurationService
2525
) {
2626
return Boolean(
27-
configurationService.getValue(USE_POSITRON_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY)
27+
configurationService.getValue(USE_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY)
2828
);
2929
}
3030

3131
export function DefaultDataExplorerSummaryLayout(
3232
configurationService: IConfigurationService
3333
) {
3434
if (String(
35-
configurationService.getValue(USE_POSITRON_DATA_EXPLORER_SUMMARY_LAYOUT_KEY)
35+
configurationService.getValue(USE_DATA_EXPLORER_SUMMARY_LAYOUT_KEY)
3636
) === 'left') {
3737
return PositronDataExplorerLayout.SummaryOnLeft;
3838
} else {
@@ -48,11 +48,11 @@ configurationRegistry.registerConfiguration({ // for summary collapse
4848
...positronConfigurationNodeBase,
4949
scope: ConfigurationScope.MACHINE_OVERRIDABLE,
5050
properties: {
51-
[USE_POSITRON_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY]: {
51+
[USE_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY]: {
5252
type: 'boolean',
5353
default: false,
5454
markdownDescription: localize(
55-
'positron.enablePositronDataExplorerSummaryCollapse',
55+
'positron.dataExplorerSummaryCollapsed',
5656
'Collapse Data Explorer Summary Panel by default.'
5757
),
5858
},
@@ -62,7 +62,7 @@ configurationRegistry.registerConfiguration({ // for summary layout
6262
...positronConfigurationNodeBase,
6363
scope: ConfigurationScope.MACHINE_OVERRIDABLE,
6464
properties: {
65-
[USE_POSITRON_DATA_EXPLORER_SUMMARY_LAYOUT_KEY]: {
65+
[USE_DATA_EXPLORER_SUMMARY_LAYOUT_KEY]: {
6666
type: 'string',
6767
default: 'left', // Default value (can be "left" or "right")
6868
enum: ['left', 'right'], // Define possible values

src/vs/workbench/services/positronDataExplorer/common/positronDataExplorerExperimentalConfig.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import { positronConfigurationNodeBase } from '../../languageRuntime/common/lang
1515
import { SupportStatus } from '../../languageRuntime/common/positronDataExplorerComm.js';
1616

1717
// Key for the configuration setting
18-
export const USE_POSITRON_DATA_EXPLORER_EXPERIMENTAL_KEY =
19-
'positron.dataExplorerExperimental';
18+
export const USE_DATA_EXPLORER_EXPERIMENTAL_KEY =
19+
'dataExplorer.Experimental';
2020

2121
/**
2222
* Retrieves the value of the configuration setting that determines whether to enable
@@ -28,7 +28,7 @@ export function checkDataExplorerExperimentalFeaturesEnabled(
2828
configurationService: IConfigurationService
2929
) {
3030
return Boolean(
31-
configurationService.getValue(USE_POSITRON_DATA_EXPLORER_EXPERIMENTAL_KEY)
31+
configurationService.getValue(USE_DATA_EXPLORER_EXPERIMENTAL_KEY)
3232
);
3333
}
3434

@@ -55,12 +55,12 @@ configurationRegistry.registerConfiguration({
5555
...positronConfigurationNodeBase,
5656
scope: ConfigurationScope.MACHINE_OVERRIDABLE,
5757
properties: {
58-
[USE_POSITRON_DATA_EXPLORER_EXPERIMENTAL_KEY]: {
58+
[USE_DATA_EXPLORER_EXPERIMENTAL_KEY]: {
5959
type: 'boolean',
6060
default: false,
6161
markdownDescription: localize(
62-
'positron.enablePositronDataExplorerExperimentalFeatures',
63-
'**CAUTION**: Enable experimental Positron Data Explorer features which may result in unexpected behaviour.'
62+
'positron.enableDataExplorerExperimentalFeatures',
63+
'**CAUTION**: Enable experimental Data Explorer features which may result in unexpected behavior.'
6464
),
6565
},
6666
},

0 commit comments

Comments
 (0)