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

use async/await in git: main

Browse Source
This commit is contained in:
Joao Moreno
2016-11-28 18:10:48 +01:00
parent eb494b4c63
commit e174df6ee1
1 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
extensions/git/src/main.ts
View File

@@ -34,42 +34,54 @@ class TextDocumentContentProvider {
constructor(private git: Git, private rootPath: string) { }
provideTextDocumentContent(uri: Uri) {
async provideTextDocumentContent(uri: Uri): Promise<string> {
const relativePath = path.relative(this.rootPath, uri.fsPath);
return this.git.exec(this.rootPath, ['show', `HEAD:${relativePath}`]).then(result => {
try {
const result = await this.git.exec(this.rootPath, ['show', `HEAD:${relativePath}`]);
if (result.exitCode !== 0) {
return null;
return '';
}
return result.stdout;
});
} catch (err) {
return '';
}
}
}
async function init(disposables: Disposable[]): Promise<void> {
const rootPath = workspace.rootPath;
if (!rootPath) {
return;
}
const pathHint = workspace.getConfiguration('git').get<string>('path');
const info = await findGit(pathHint);
const git = new Git({ gitPath: info.path, version: info.version });
const outputChannel = window.createOutputChannel('git');
outputChannel.appendLine(`Using git ${info.version} from ${info.path}`);
git.onOutput(str => outputChannel.append(str), null, disposables);
disposables.push(
registerCommands(),
scm.registerSCMProvider('git', new GitSCMProvider()),
workspace.registerTextDocumentContentProvider('git-index', new TextDocumentContentProvider(git, rootPath)),
outputChannel
);
}
export function activate(context: ExtensionContext): any {
if (!workspace.rootPath) {
return;
}
const rootPath = workspace.rootPath;
const pathHint = workspace.getConfiguration('git').get<string>('path');
const disposables: Disposable[] = [];
context.subscriptions.push(new Disposable(() => Disposable.from(...disposables).dispose()));
findGit(pathHint).then(info => {
const git = new Git({ gitPath: info.path, version: info.version });
const disposables: Disposable[] = [];
const outputChannel = window.createOutputChannel('git');
outputChannel.appendLine(`Using git ${info.version} from ${info.path}`);
git.onOutput(str => outputChannel.append(str), null, disposables);
disposables.push(
registerCommands(),
scm.registerSCMProvider('git', new GitSCMProvider()),
workspace.registerTextDocumentContentProvider('git-index', new TextDocumentContentProvider(git, rootPath)),
outputChannel
);
context.subscriptions.push(...disposables);
});
init(disposables)
.catch(err => console.error(err));
}