microsoft#14102 Fix to retain the state

sandy081 · sandy081 · commit e0a96252c6a6 · 2016-10-20T19:21:49.000+02:00
diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts
@@ -109,9 +109,10 @@ export class FoldingController implements IFoldingController {
 			return;
 		}
 
-		// Clean the state before restoring
+		// State should be applied on the clean state
+		// Clean the state
 		this.cleanState();
-		// restore
+		// apply state
 		this.applyRegions(<IFoldingRange[]>state.collapsedRegions);
 		// Start listening to the model
 		this.onModelChanged();
diff --git a/src/vs/workbench/browser/actions/openSettings.ts b/src/vs/workbench/browser/actions/openSettings.ts
@@ -321,7 +321,11 @@ export class DefaultSettingsEditor extends StringEditor {
 	}
 
 	private saveState() {
-		DefaultSettingsEditor.VIEW_STATE.set(this.getResource(), this.getControl().saveViewState());
+		const resource = this.getResource();
+		if (DefaultSettingsEditor.VIEW_STATE.has(resource)) {
+			DefaultSettingsEditor.VIEW_STATE.delete(resource);
+		}
+		DefaultSettingsEditor.VIEW_STATE.set(resource, this.getControl().saveViewState());
 	}
 
 	private getResource(): URI {

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,11 @@ export class DefaultSettingsEditor extends StringEditor {`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`private saveState() {`
`324`		`- DefaultSettingsEditor.VIEW_STATE.set(this.getResource(), this.getControl().saveViewState());`
	`324`	`+ const resource = this.getResource();`
	`325`	`+ if (DefaultSettingsEditor.VIEW_STATE.has(resource)) {`
	`326`	`+ DefaultSettingsEditor.VIEW_STATE.delete(resource);`
	`327`	`+ }`
	`328`	`+ DefaultSettingsEditor.VIEW_STATE.set(resource, this.getControl().saveViewState());`
`325`	`329`	`}`
`326`	`330`
`327`	`331`	`private getResource(): URI {`