move checkoutType out of git service

joaomoreno · joaomoreno · commit 770fc01c7b27 · 2016-12-13T09:44:52.000+01:00
diff --git a/src/vs/workbench/parts/git/browser/gitQuickOpen.ts b/src/vs/workbench/parts/git/browser/gitQuickOpen.ts
@@ -8,12 +8,13 @@ import { localize } from 'vs/nls';
 import { matchesContiguousSubString } from 'vs/base/common/filters';
 import { TPromise } from 'vs/base/common/winjs.base';
 import Severity from 'vs/base/common/severity';
-import { IGitService, RefType, IRef } from 'vs/workbench/parts/git/common/git';
+import { IGitService, RefType, IRef, IGitConfiguration } from 'vs/workbench/parts/git/common/git';
 import { ICommand, CommandQuickOpenHandler } from 'vs/workbench/browser/quickopen';
 import { Mode } from 'vs/base/parts/quickopen/common/quickOpen';
 import { QuickOpenEntry, IHighlight, IContext, QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IMessageService } from 'vs/platform/message/common/message';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 class AbstractRefEntry extends QuickOpenEntry {
 
@@ -130,14 +131,15 @@ class CheckoutCommand implements ICommand {
 	aliases = ['checkout', 'co'];
 	icon = 'git';
 
-	constructor(private gitService: IGitService, private messageService: IMessageService) {
+	constructor(private gitService: IGitService, private messageService: IMessageService, private configurationService: IConfigurationService) {
 		// noop
 	}
 
 	getResults(input: string): TPromise<QuickOpenEntry[]> {
 		input = input.trim();
 
-		const checkoutType = this.gitService.checkoutType;
+		const config = this.configurationService.getConfiguration<IGitConfiguration>('git');
+		const checkoutType = config.checkoutType;
 		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
 		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';
 
@@ -252,11 +254,16 @@ class BranchCommand implements ICommand {
 
 export class GitCommandQuickOpenHandler extends CommandQuickOpenHandler {
 
-	constructor( @IQuickOpenService quickOpenService: IQuickOpenService, @IGitService gitService: IGitService, @IMessageService messageService: IMessageService) {
+	constructor(
+		@IQuickOpenService quickOpenService: IQuickOpenService,
+		@IGitService gitService: IGitService,
+		@IMessageService messageService: IMessageService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
 		super(quickOpenService, {
 			prefix: 'git',
 			commands: [
-				new CheckoutCommand(gitService, messageService),
+				new CheckoutCommand(gitService, messageService, configurationService),
 				new BranchCommand(gitService, messageService)
 			]
 		});
diff --git a/src/vs/workbench/parts/git/browser/gitServices.ts b/src/vs/workbench/parts/git/browser/gitServices.ts
@@ -418,10 +418,6 @@ export class GitService extends EventEmitter
 			this.transition(ServiceState.OK);
 		}
 	}
-	get checkoutType(): string {
-		const { checkoutType } = this.configurationService.getConfiguration<IGitConfiguration>('git');
-		return checkoutType;
-	}
 
 	get onOutput(): Event<string> { return this.raw.onOutput; }
 
diff --git a/src/vs/workbench/parts/git/common/git.ts b/src/vs/workbench/parts/git/common/git.ts
@@ -306,7 +306,6 @@ export const IGitService = createDecorator<IGitService>(GIT_SERVICE_ID);
 export interface IGitService extends IEventEmitter {
 	_serviceBrand: any;
 	allowHugeRepositories: boolean;
-	checkoutType: string;
 	onOutput: Event<string>;
 	status(): TPromise<IModel>;
 	init(): TPromise<IModel>;

Original file line number	Diff line number	Diff line change
`@@ -418,10 +418,6 @@ export class GitService extends EventEmitter`
`418`	`418`	`this.transition(ServiceState.OK);`
`419`	`419`	`}`
`420`	`420`	`}`
`421`		`- get checkoutType(): string {`
`422`		`- const { checkoutType } = this.configurationService.getConfiguration<IGitConfiguration>('git');`
`423`		`- return checkoutType;`
`424`		`- }`
`425`	`421`
`426`	`422`	`get onOutput(): Event<string> { return this.raw.onOutput; }`
`427`	`423`