Skip to content

Conversation

@alexdima
Copy link
Member

Reverts #1717

Copilot AI review requested due to automatic review settings November 14, 2025 21:48
@alexdima alexdima enabled auto-merge November 14, 2025 21:48
@vs-code-engineering vs-code-engineering bot added this to the November 2025 milestone Nov 14, 2025
Copilot finished reviewing on behalf of alexdima November 14, 2025 21:51
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR reverts a previous change (#1717) that migrated internal configuration settings from the AdvancedExperimental and AdvancedExperimentalExperiments namespaces to the Internal namespace and removed the "advanced" configuration section from package.json.

Key changes:

  • Moves configuration definitions back from ConfigKey.Internal to ConfigKey.AdvancedExperimental and ConfigKey.AdvancedExperimentalExperiments namespaces
  • Restores the "advanced" configuration section in package.json with all previously migrated settings
  • Updates all usage sites across the codebase to reference the original configuration key locations
  • Reverts configuration service implementation changes related to old key migration support

Reviewed Changes

Copilot reviewed 59 out of 59 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
src/platform/configuration/common/configurationService.ts Restores AdvancedExperimental namespaces, removes Internal namespace consolidation, adds back migration support
src/platform/configuration/vscode/configurationServiceImpl.ts Removes unused imports, restores old key fallback logic in configuration resolution
src/platform/configuration/test/common/configurationService.spec.ts Updates test assertions to verify settings under AdvancedExperimental namespaces instead of Internal
src/extension/configuration/vscode-node/configurationMigration.ts Moves ConfigurationMigrationRegistry definition from common to here
package.json Restores "advanced" configuration section with 50+ settings
package.nls.json Removes localization strings for migrated settings (no longer public)
src/extension/test/node/configurations.spec.ts Updates tests to handle AdvancedExperimental settings and validate against package.json
Multiple extension files Updates all ConfigKey references from Internal back to AdvancedExperimental/AdvancedExperimentalExperiments

Comment on lines +38 to +58
export type ConfigurationValue = { value: any | undefined /* Remove */ };
export type ConfigurationKeyValuePairs = [string, ConfigurationValue][];
export type ConfigurationMigrationFn = (value: any) => ConfigurationValue | ConfigurationKeyValuePairs | Promise<ConfigurationValue | ConfigurationKeyValuePairs>;
export type ConfigurationMigration = { key: string; migrateFn: ConfigurationMigrationFn };

export interface IConfigurationMigrationRegistry {
registerConfigurationMigrations(configurationMigrations: ConfigurationMigration[]): void;
}

class ConfigurationMigrationRegistryImpl implements IConfigurationMigrationRegistry {
readonly migrations: ConfigurationMigration[] = [];

private readonly _onDidRegisterConfigurationMigrations = new Emitter<ConfigurationMigration[]>();
readonly onDidRegisterConfigurationMigration = this._onDidRegisterConfigurationMigrations.event;

registerConfigurationMigrations(configurationMigrations: ConfigurationMigration[]): void {
this.migrations.push(...configurationMigrations);
}
}

export const ConfigurationMigrationRegistry = new ConfigurationMigrationRegistryImpl();
Copy link

Copilot AI Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The event firing logic is missing in the registerConfigurationMigrations method. The original implementation (being removed from configurationService.ts) included this._onDidRegisterConfigurationMigrations.fire(configurationMigrations); after pushing migrations, but the new implementation in this file omits this line. This could cause listeners to not be notified when configuration migrations are registered.

Copilot uses AI. Check for mistakes.
import { CodeBlockFormattingRules, EXISTING_CODE_MARKER } from '../panel/codeBlockFormattingRules';
import { MathIntegrationRules } from '../panel/editorIntegrationRules';
import { KeepGoingReminder } from './agentPrompt';
import { isHiddenModelB, isHiddenModelC, isHiddenModelD } from '../../../../platform/endpoint/common/chatModelCapabilities';
Copy link

Copilot AI Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Unnecessary import reordering. The import statement for isHiddenModelB, isHiddenModelC, isHiddenModelD is being moved from line 8 to line 19 without any functional reason. This adds unnecessary diff noise. Consider keeping imports in their original position during a revert to minimize changes.

Copilot uses AI. Check for mistakes.
Comment on lines 37 to +41
import { AnyDiagnosticCompletionItem, AnyDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/anyDiagnosticsCompletionProvider';
import { AsyncDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/asyncDiagnosticsCompletionProvider';
import { Diagnostic, DiagnosticCompletionItem, DiagnosticInlineEditRequestLogContext, distanceToClosestDiagnostic, IDiagnosticCompletionProvider, log, logList, sortDiagnosticsByDistance } from './diagnosticsBasedCompletions/diagnosticsCompletions';
import { ImportDiagnosticCompletionItem, ImportDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/importDiagnosticsCompletionProvider';
import { toInternalPosition } from '../utils/translations';
Copy link

Copilot AI Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Unnecessary import reordering. The import statement for toInternalPosition is being moved from line 36 to line 41 without any functional reason. This adds unnecessary diff noise. Consider keeping imports in their original position during a revert to minimize changes.

Suggested change
import { AnyDiagnosticCompletionItem, AnyDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/anyDiagnosticsCompletionProvider';
import { AsyncDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/asyncDiagnosticsCompletionProvider';
import { Diagnostic, DiagnosticCompletionItem, DiagnosticInlineEditRequestLogContext, distanceToClosestDiagnostic, IDiagnosticCompletionProvider, log, logList, sortDiagnosticsByDistance } from './diagnosticsBasedCompletions/diagnosticsCompletions';
import { ImportDiagnosticCompletionItem, ImportDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/importDiagnosticsCompletionProvider';
import { toInternalPosition } from '../utils/translations';
import { toInternalPosition } from '../utils/translations';
import { AnyDiagnosticCompletionItem, AnyDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/anyDiagnosticsCompletionProvider';
import { AsyncDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/asyncDiagnosticsCompletionProvider';
import { Diagnostic, DiagnosticCompletionItem, DiagnosticInlineEditRequestLogContext, distanceToClosestDiagnostic, IDiagnosticCompletionProvider, log, logList, sortDiagnosticsByDistance } from './diagnosticsBasedCompletions/diagnosticsCompletions';
import { ImportDiagnosticCompletionItem, ImportDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/importDiagnosticsCompletionProvider';

Copilot uses AI. Check for mistakes.
@alexdima alexdima added this pull request to the merge queue Nov 14, 2025
Merged via the queue into main with commit d34ffb2 Nov 14, 2025
22 checks passed
@alexdima alexdima deleted the revert-1717-sandy081/alternative-bug branch November 14, 2025 22:10
sandy081 added a commit that referenced this pull request Nov 15, 2025
github-merge-queue bot pushed a commit that referenced this pull request Nov 15, 2025
* Reapply "first cut - migrate settings marked with INTERNAL and adopt to advanc…" (#2021)

This reverts commit d34ffb2.

* fix default values of migrated settings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants