Skip to content

Move data summary setting from "positron" to "dataExplorer" #7263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Move data summary setting from "positron" to "dataExplorer" #7263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1011689
Fix data summary setting names
kv9898 Apr 15, 2025
b25f4a8
Revert localized entries to original
kv9898 Apr 22, 2025
793e700
Switch to dataExplorer
kv9898 Apr 22, 2025
d9f609a
Updates to Data Explorer settings
softwarenerd Apr 22, 2025
7c588a4
Move Data Explorer to be after Explorer in TOC
softwarenerd Apr 22, 2025
27a3d47
Merge branch 'posit-dev:main' into patch-1
kv9898 Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,13 @@ export const tocData: ITOCEntry<string> = {
label: localize('fileExplorer', "Explorer"),
settings: ['explorer.*', 'outline.*']
},
// --- Start Positron ---
{
id: 'features/dataExplorer',
label: localize('dataExplorer', "Data Explorer"),
settings: ['dataExplorer.*']
},
// --- End Positron ---
{
id: 'features/search',
label: localize('search', "Search"),
Expand Down
18 changes: 9 additions & 9 deletions src/vs/workbench/services/positronDataExplorer/browser/positronDataExplorerSummary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@ import { positronConfigurationNodeBase } from '../../languageRuntime/common/lang
import { PositronDataExplorerLayout } from './interfaces/positronDataExplorerService.js';

// Key for the configuration setting
export const USE_POSITRON_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY =
'positron.dataExplorerSummaryCollapsed';
export const USE_POSITRON_DATA_EXPLORER_SUMMARY_LAYOUT_KEY =
'positron.dataExplorerSummaryLayout';
export const USE_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY =
'dataExplorer.summaryCollapsed';
export const USE_DATA_EXPLORER_SUMMARY_LAYOUT_KEY =
'dataExplorer.summaryLayout';

export function DataExplorerSummaryCollapseEnabled(
configurationService: IConfigurationService
) {
return Boolean(
configurationService.getValue(USE_POSITRON_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY)
configurationService.getValue(USE_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY)
);
}

export function DefaultDataExplorerSummaryLayout(
configurationService: IConfigurationService
) {
if (String(
configurationService.getValue(USE_POSITRON_DATA_EXPLORER_SUMMARY_LAYOUT_KEY)
configurationService.getValue(USE_DATA_EXPLORER_SUMMARY_LAYOUT_KEY)
) === 'left') {
return PositronDataExplorerLayout.SummaryOnLeft;
} else {
Expand All @@ -48,11 +48,11 @@ configurationRegistry.registerConfiguration({ // for summary collapse
...positronConfigurationNodeBase,
scope: ConfigurationScope.MACHINE_OVERRIDABLE,
properties: {
[USE_POSITRON_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY]: {
[USE_DATA_EXPLORER_SUMMARY_COLLAPSED_KEY]: {
type: 'boolean',
default: false,
markdownDescription: localize(
'positron.enablePositronDataExplorerSummaryCollapse',
'positron.dataExplorerSummaryCollapsed',
'Collapse Data Explorer Summary Panel by default.'
),
},
Expand All @@ -62,7 +62,7 @@ configurationRegistry.registerConfiguration({ // for summary layout
...positronConfigurationNodeBase,
scope: ConfigurationScope.MACHINE_OVERRIDABLE,
properties: {
[USE_POSITRON_DATA_EXPLORER_SUMMARY_LAYOUT_KEY]: {
[USE_DATA_EXPLORER_SUMMARY_LAYOUT_KEY]: {
type: 'string',
default: 'left', // Default value (can be "left" or "right")
enum: ['left', 'right'], // Define possible values
Expand Down
12 changes: 6 additions & 6 deletions .../workbench/services/positronDataExplorer/common/positronDataExplorerExperimentalConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import { positronConfigurationNodeBase } from '../../languageRuntime/common/lang
import { SupportStatus } from '../../languageRuntime/common/positronDataExplorerComm.js';

// Key for the configuration setting
export const USE_POSITRON_DATA_EXPLORER_EXPERIMENTAL_KEY =
'positron.dataExplorerExperimental';
export const USE_DATA_EXPLORER_EXPERIMENTAL_KEY =
'dataExplorer.Experimental';

/**
* Retrieves the value of the configuration setting that determines whether to enable
Expand All @@ -28,7 +28,7 @@ export function checkDataExplorerExperimentalFeaturesEnabled(
configurationService: IConfigurationService
) {
return Boolean(
configurationService.getValue(USE_POSITRON_DATA_EXPLORER_EXPERIMENTAL_KEY)
configurationService.getValue(USE_DATA_EXPLORER_EXPERIMENTAL_KEY)
);
}

Expand All @@ -55,12 +55,12 @@ configurationRegistry.registerConfiguration({
...positronConfigurationNodeBase,
scope: ConfigurationScope.MACHINE_OVERRIDABLE,
properties: {
[USE_POSITRON_DATA_EXPLORER_EXPERIMENTAL_KEY]: {
[USE_DATA_EXPLORER_EXPERIMENTAL_KEY]: {
type: 'boolean',
default: false,
markdownDescription: localize(
'positron.enablePositronDataExplorerExperimentalFeatures',
'**CAUTION**: Enable experimental Positron Data Explorer features which may result in unexpected behaviour.'
'positron.enableDataExplorerExperimentalFeatures',
'**CAUTION**: Enable experimental Data Explorer features which may result in unexpected behavior.'
),
},
},
Expand Down
Loading