Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed scope

Browse Source
This commit is contained in:
Joao Moreno
2019-10-25 15:14:59 +02:00
parent 94389f776f
commit a8b09d4711
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/git/src/repository.ts
View File

@@ -1447,6 +1447,7 @@ export class Repository implements Disposable {
private async updateModelState(): Promise<void> {
const { status, didHitLimit } = await this.repository.getStatus();
const config = workspace.getConfiguration('git');
const scopedConfig = workspace.getConfiguration('git', Uri.file(this.repository.root));
const shouldIgnore = config.get<boolean>('ignoreLimitWarning') === true;
const useIcons = !config.get<boolean>('decorations.enabled', true);
this.isRepositoryHuge = didHitLimit;
@@ -1507,9 +1508,7 @@ export class Repository implements Disposable {
this._submodules = submodules!;
this.rebaseCommit = rebaseCommit;
const handleUntracked =
config.get<'withchanges' | 'separate' | 'hide'>('handleUntracked') ||
'withchanges';
const handleUntracked = scopedConfig.get<'withchanges' | 'separate' | 'hide'>('handleUntracked');
const index: Resource[] = [];
const workingTree: Resource[] = [];
const merge: Resource[] = [];
@@ -1586,11 +1585,10 @@ export class Repository implements Disposable {
}
private setCountBadge(): void {
const config = workspace.getConfiguration('git');
const countBadge = config.get<string>('countBadge');
const handleUntracked =
config.get<'withchanges' | 'separate' | 'hide'>('handleUntracked') ||
'withchanges';
const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
const countBadge = config.get<'all' | 'tracked' | 'off'>('countBadge');
const handleUntracked = config.get<'withchanges' | 'separate' | 'hide'>('handleUntracked');
let count =
this.mergeGroup.resourceStates.length +
this.indexGroup.resourceStates.length +