Commit f97f75c

authored

Restore original settings after disabling ISE mode (#4308)

We were previously setting them to `undefined` which mostly worked, unless the user had customized the setting. This was most apparent and commonly done with `colorTheme`. Now we save when we enable, and restore to that value. Note that will only work for the original session, but it does allow the user to test ISE mode out without repercussions. We could probably save the settings into the global storage context, but that might get hairy!

1 parent 00502b6 commit f97f75cCopy full SHA for f97f75c

File tree

1 file changed

-3

lines changed

src/features
- ISECompatibility.ts

1 file changed

-3

lines changed

`‎src/features/ISECompatibility.ts‎`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ export class ISECompatibilityFeature implements vscode.Disposable {`
`28`	`28`
`29`	`29`	`private _commandRegistrations: vscode.Disposable[] = [];`
`30`	`30`	`private _iseModeEnabled: boolean;`
	`31`	`+ private _originalSettings: Record<string, boolean \| string \| undefined> = {};`
`31`	`32`
`32`	`33`	`constructor() {`
`33`	`34`	`// TODO: This test isn't great.`
`@@ -50,7 +51,9 @@ export class ISECompatibilityFeature implements vscode.Disposable {`
`50`	`51`	`this._iseModeEnabled = true;`
`51`	`52`	`for (const iseSetting of ISECompatibilityFeature.settings) {`
`52`	`53`	`try {`
`53`		`- await vscode.workspace.getConfiguration(iseSetting.path).update(iseSetting.name, iseSetting.value, true);`
	`54`	`+ const config = vscode.workspace.getConfiguration(iseSetting.path);`
	`55`	`+ this._originalSettings[iseSetting.path + iseSetting.name] = config.get(iseSetting.name);`
	`56`	`+ await config.update(iseSetting.name, iseSetting.value, true);`
`54`	`57`	`} catch {`
`55`	`58`	// The `update` call can fail if the setting doesn't exist. This
`56`	`59`	`// happens when the extension runs in Azure Data Studio, which`
`@@ -72,9 +75,10 @@ export class ISECompatibilityFeature implements vscode.Disposable {`
`72`	`75`	`private async DisableISEMode() {`
`73`	`76`	`this._iseModeEnabled = false;`
`74`	`77`	`for (const iseSetting of ISECompatibilityFeature.settings) {`
`75`		`- const currently = vscode.workspace.getConfiguration(iseSetting.path).get<string \| boolean>(iseSetting.name);`
	`78`	`+ const config = vscode.workspace.getConfiguration(iseSetting.path);`
	`79`	`+ const currently = config.get(iseSetting.name);`
`76`	`80`	`if (currently === iseSetting.value) {`
`77`		`- await vscode.workspace.getConfiguration(iseSetting.path).update(iseSetting.name, undefined, true);`
	`81`	`+ await config.update(iseSetting.name, this._originalSettings[iseSetting.path+iseSetting.name], true);`
`78`	`82`	`}`
`79`	`83`	`}`
`80`	`84`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f97f75c

File tree

1 file changed

1 file changed

`‎src/features/ISECompatibility.ts‎`

0 commit comments