ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-29 01:25:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adds content uri from GitUri

Browse Source
This commit is contained in:
Eric Amodio
2017-07-03 01:59:02 -04:00
parent 71edb1b99a
commit 52275215fe
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gitService.ts
View File

@@ -1104,20 +1104,30 @@ export class GitService extends Disposable {
static toGitContentUri(sha: string, shortSha: string, fileName: string, repoPath: string, originalFileName?: string): Uri; static toGitContentUri(sha: string, shortSha: string, fileName: string, repoPath: string, originalFileName?: string): Uri;
static toGitContentUri(commit: GitCommit): Uri; static toGitContentUri(commit: GitCommit): Uri;
static toGitContentUri(shaOrcommit: string | GitCommit, shortSha?: string, fileName?: string, repoPath?: string, originalFileName?: string): Uri { static toGitContentUri(uri: GitUri): Uri;
static toGitContentUri(shaOrcommitOrUri: string | GitCommit | GitUri, shortSha?: string, fileName?: string, repoPath?: string, originalFileName?: string): Uri {
let data: IGitUriData; let data: IGitUriData;
if (typeof shaOrcommit === 'string') { if (typeof shaOrcommitOrUri === 'string') {
data = GitService._toGitUriData({ data = GitService._toGitUriData({
sha: shaOrcommit, sha: shaOrcommitOrUri,
fileName: fileName!, fileName: fileName!,
repoPath: repoPath!, repoPath: repoPath!,
originalFileName: originalFileName originalFileName: originalFileName
}); });
} }
else if (shaOrcommitOrUri instanceof GitCommit) {
data = GitService._toGitUriData(shaOrcommitOrUri, undefined, shaOrcommitOrUri.originalFileName);
fileName = shaOrcommitOrUri.fileName;
shortSha = shaOrcommitOrUri.shortSha;
}
else { else {
data = GitService._toGitUriData(shaOrcommit, undefined, shaOrcommit.originalFileName); data = GitService._toGitUriData({
fileName = shaOrcommit.fileName; sha: shaOrcommitOrUri.sha!,
shortSha = shaOrcommit.shortSha; fileName: shaOrcommitOrUri.fsPath!,
repoPath: shaOrcommitOrUri.repoPath!
});
fileName = shaOrcommitOrUri.fsPath;
shortSha = shaOrcommitOrUri.shortSha;
} }
const extension = path.extname(fileName!); const extension = path.extname(fileName!);