fix: freeze Resource#command (microsoft#158579)

joaomoreno · web-flow · commit 6dbddd8b91b5 · 2022-08-19T14:24:36.000+02:00
Fixes: microsoft#157904
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -87,6 +87,7 @@ export class Resource implements SourceControlResourceState {
 		return this.resources[1];
 	}
 
+	@memoize
 	get command(): Command {
 		return this._commandResolver.resolveDefaultCommand(this);
 	}
@@ -938,8 +939,7 @@ export class Repository implements Disposable {
 
 		workspace.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('git.mergeEditor')) {
-				// this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
-				this.status();
+				this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
 			}
 		}, undefined, this.disposables);
 

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ export class Resource implements SourceControlResourceState {`
`87`	`87`	`return this.resources[1];`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ @memoize`
`90`	`91`	`get command(): Command {`
`91`	`92`	`return this._commandResolver.resolveDefaultCommand(this);`
`92`	`93`	`}`
`@@ -938,8 +939,7 @@ export class Repository implements Disposable {`
`938`	`939`
`939`	`940`	`workspace.onDidChangeConfiguration(e => {`
`940`	`941`	`if (e.affectsConfiguration('git.mergeEditor')) {`
`941`		`- // this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());`
`942`		`- this.status();`
	`942`	`+ this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());`
`943`	`943`	`}`
`944`	`944`	`}, undefined, this.disposables);`
`945`	`945`