Skip to content

Commit

Permalink
Retire Options Moved notification (#4145)
Browse files Browse the repository at this point in the history
  • Loading branch information
gcampbell-msft authored Nov 6, 2024
1 parent 0388e47 commit 781a5a6
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 26 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Improvements:
- Fix "Unable to resolve configuration with compilerPath" issue for Swift. [#4097](https://github.com/microsoft/vscode-cmake-tools/issues/4097)
- Ensure that any uses of `proc.spawn` work, especially for .bat and .cmd files, due to VS Code updating to Node 20. [#4037](https://github.com/microsoft/vscode-cmake-tools/issues/4037)
- Ensure that stopping tests actually forces the tests to stop running. [#2095](https://github.com/microsoft/vscode-cmake-tools/issues/2095)
- Retire the Show Options Moved Notification [#4039](https://github.com/microsoft/vscode-cmake-tools/issues/4039)

Bug Fixes:

Expand Down
6 changes: 0 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2747,12 +2747,6 @@
}
}
},
"cmake.showOptionsMovedNotification": {
"type": "boolean",
"default": true,
"description": "%cmake-tools.configuration.cmake.showOptionsMovedNotification%",
"scope": "application"
},
"cmake.showConfigureWithDebuggerNotification": {
"type": "boolean",
"default": true,
Expand Down
1 change: 0 additions & 1 deletion package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@
"cmake-tools.configuration.cmake.touchbar.visibility.description": "Configures how the extension displays the buttons on a MacBook Touch Bar.",
"cmake-tools.configuration.cmake.touchbar.visibility.default.description": "Show Touch Bar buttons on supported systems.",
"cmake-tools.configuration.cmake.touchbar.visibility.hidden.description": "Do not show Touch Bar buttons.",
"cmake-tools.configuration.cmake.showOptionsMovedNotification": "Enables the notification regarding the status bar options moving to the Project Status View to show when the extension starts.",
"cmake-tools.configuration.cmake.showConfigureWithDebuggerNotification": "Enables the pop-up that asks the user if, upon a failed configure, they want to configure with the CMake Debugger.",
"cmake-tools.configuration.cmake.showNotAllDocumentsSavedQuestion": "Enables the pop-up that asks the user if they want to continue the build despite some files possibly not being saved. If not enabled, the build will be continued.",
"cmake-tools.configuration.cmake.options.advanced.statusBarVisibility.visible.description": "Show the status bar option at full size.",
Expand Down
2 changes: 0 additions & 2 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ export interface ExtensionConfigurationSettings {
loggingLevel: LogLevelKey;
additionalKits: string[];
touchbar: TouchBarConfig;
showOptionsMovedNotification: boolean;
options: OptionConfig;
useCMakePresets: UseCMakePresets;
useVsDeveloperEnvironment: UseVsDeveloperEnvironment;
Expand Down Expand Up @@ -621,7 +620,6 @@ export class ConfigurationReader implements vscode.Disposable {
loggingLevel: new vscode.EventEmitter<LogLevelKey>(),
additionalKits: new vscode.EventEmitter<string[]>(),
touchbar: new vscode.EventEmitter<TouchBarConfig>(),
showOptionsMovedNotification: new vscode.EventEmitter<boolean>(),
options: new vscode.EventEmitter<OptionConfig>(),
useCMakePresets: new vscode.EventEmitter<UseCMakePresets>(),
useVsDeveloperEnvironment: new vscode.EventEmitter<UseVsDeveloperEnvironment>(),
Expand Down
16 changes: 0 additions & 16 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2357,22 +2357,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<api.CM
await vscode.window.showWarningMessage(localize('uninstall.old.cmaketools', 'Please uninstall any older versions of the CMake Tools extension. It is now published by Microsoft starting with version 1.2.0.'));
}

if (vscode.workspace.getConfiguration('cmake').get('showOptionsMovedNotification')) {
void vscode.window.showInformationMessage(
localize('options.moved.notification.body', "Some status bar options in CMake Tools have now moved to the Project Status View in the CMake Tools sidebar. You can customize your view with the 'cmake.options' property in settings."),
localize('options.moved.notification.configure.cmake.options', 'Configure CMake Options Visibility'),
localize('options.moved.notification.do.not.show', "Do Not Show Again")
).then(async (selection) => {
if (selection !== undefined) {
if (selection === localize('options.moved.notification.configure.cmake.options', 'Configure CMake Options Visibility')) {
await vscode.commands.executeCommand('workbench.action.openSettings', 'cmake.options');
} else if (selection === localize('options.moved.notification.do.not.show', "Do Not Show Again")) {
await vscode.workspace.getConfiguration('cmake').update('showOptionsMovedNotification', false, vscode.ConfigurationTarget.Global);
}
}
});
}

// Start with a partial feature set view. The first valid CMake project will cause a switch to full feature set.
await enableFullFeatureSet(false);

Expand Down
1 change: 0 additions & 1 deletion test/unit-tests/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ function createConfig(conf: Partial<ExtensionConfigurationSettings>): Configurat
touchbar: {
visibility: "default"
},
showOptionsMovedNotification: true,
options: {
advanced: {},
statusBarVisibility: "visible"
Expand Down

0 comments on commit 781a5a6

Please sign in to comment.