Skip to content

Commit 525980f

Browse files
committed
Do not open settings on press of x
1 parent 09d6ad1 commit 525980f

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/extension.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,20 @@ function detectDeprecatedOptions() {
9090
if (config.get('provideHover')) oldArgs.push('fortran.provideHover');
9191
if (config.get('provideCompletion')) oldArgs.push('fortran.provideCompletion');
9292

93+
// only captures config options set to true but the package.json deprecation
94+
// descriptions should take care of the rest
9395
if (oldArgs.length !== 0) {
94-
const err = vscode.window.showErrorMessage(
95-
`Deprecated settings have been detected in your settings.
96+
vscode.window
97+
.showErrorMessage(
98+
`Deprecated settings have been detected in your settings.
9699
Please update your settings to make use of the new names. The old names will not work.`,
97-
'Open Settings'
98-
);
99-
err.then(() => vscode.commands.executeCommand('workbench.action.openGlobalSettings'));
100-
loggingService.logError(`The following deprecated options have been detected:\n${oldArgs}`);
100+
'Open Settings'
101+
)
102+
.then(selected => {
103+
if (selected === 'Open Settings') {
104+
vscode.commands.executeCommand('workbench.action.openGlobalSettings');
105+
}
106+
loggingService.logError(`The following deprecated options have been detected:\n${oldArgs}`);
107+
});
101108
}
102109
}

0 commit comments

Comments
 (0)