Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'newAutoRepositoryDetection' of https://github.com/BattleBas/vscode into BattleBas-newAutoRepositoryDetection

Browse Source
This commit is contained in:
Joao Moreno
2017-12-11 17:42:25 +01:00
parent 484cae0399 170161d67f
commit 7ae85acb65
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -904,9 +904,18 @@ export class Repository implements Disposable {
const index: Resource[] = [];
const workingTree: Resource[] = [];
const merge: Resource[] = [];
const repoDetection = config.get<boolean>('autoRepositoryDetection') === true;
status.forEach(raw => {
const uri = Uri.file(path.join(this.repository.root, raw.path));
const fullFilePath = path.join(this.repository.root, raw.path);
if (!repoDetection && workspace.workspaceFolders === undefined) {
if (!this.detectActiveFile(fullFilePath)) {
return;
}
}
const uri = Uri.file(fullFilePath);
const renameUri = raw.rename ? Uri.file(path.join(this.repository.root, raw.rename)) : undefined;
switch (raw.x + raw.y) {
@@ -964,6 +973,10 @@ export class Repository implements Disposable {
this._onDidChangeStatus.fire();
}
private detectActiveFile(fullFilePath: string): boolean | undefined {
return window.activeTextEditor && window.activeTextEditor.document.fileName === fullFilePath;
}
private onFSChange(uri: Uri): void {
const config = workspace.getConfiguration('git');
const autorefresh = config.get<boolean>('autorefresh');