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

Splits GitUri into its own file

Browse Source
This commit is contained in:
Eric Amodio
2017-01-16 14:29:27 -05:00
parent 6fefab6d64
commit ca7f39629d
2 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/git/gitUri.ts Normal file
View File

@@ -0,0 +1,67 @@
'use strict';
import { Uri } from 'vscode';
import { DocumentSchemes } from '../constants';
import GitProvider from '../gitProvider';
export class GitUri extends Uri {
offset: number;
repoPath?: string | undefined;
sha?: string | undefined;
constructor(uri?: Uri, commit?: IGitCommitInfo) {
super();
if (!uri) return;
const base = this as any;
base._scheme = uri.scheme;
base._authority = uri.authority;
base._path = uri.path;
base._query = uri.query;
base._fragment = uri.fragment;
this.offset = 0;
if (uri.scheme === DocumentSchemes.Git) {
const data = GitProvider.fromGitUri(uri);
base._fsPath = data.originalFileName || data.fileName;
this.offset = (data.decoration && data.decoration.split('\n').length) || 0;
this.repoPath = data.repoPath;
this.sha = data.sha;
}
else if (commit) {
base._fsPath = commit.originalFileName || commit.fileName;
this.repoPath = commit.repoPath;
this.sha = commit.sha;
}
}
fileUri() {
return Uri.file(this.fsPath);
}
static fromUri(uri: Uri, git?: GitProvider) {
if (git) {
const gitUri = git.getGitUriForFile(uri.fsPath);
if (gitUri) return gitUri;
}
return new GitUri(uri);
}
}
export interface IGitCommitInfo {
sha: string;
repoPath: string;
fileName: string;
originalFileName?: string;
}
export interface IGitUriData {
repoPath: string;
fileName: string;
originalFileName?: string;
sha: string;
index: number;
decoration?: string;
}

66
src/gitProvider.ts
View File

@@ -4,6 +4,7 @@ import { Disposable, ExtensionContext, languages, Location, Position, Range, Tex
import { CodeLensVisibility, IConfig } from './configuration';
import { DocumentSchemes, WorkspaceState } from './constants';
import Git, { GitBlameParserEnricher, GitBlameFormat, GitCommit, GitLogParserEnricher, IGitAuthor, IGitBlame, IGitBlameLine, IGitBlameLines, IGitLog } from './git/git';
import { IGitUriData, GitUri } from './git/gitUri';
import GitCodeLensProvider from './gitCodeLensProvider';
import { Logger } from './logger';
import * as fs from 'fs';
@@ -11,7 +12,7 @@ import * as ignore from 'ignore';
import * as moment from 'moment';
import * as path from 'path';
export { Git };
export { Git, GitUri };
export * from './git/git';
class UriCacheEntry {
@@ -575,67 +576,4 @@ export default class GitProvider extends Disposable {
}
return data;
}
}
export interface IGitCommitInfo {
sha: string;
repoPath: string;
fileName: string;
originalFileName?: string;
}
export class GitUri extends Uri {
offset: number;
repoPath?: string | undefined;
sha?: string | undefined;
constructor(uri?: Uri, commit?: IGitCommitInfo) {
super();
if (!uri) return;
const base = this as any;
base._scheme = uri.scheme;
base._authority = uri.authority;
base._path = uri.path;
base._query = uri.query;
base._fragment = uri.fragment;
this.offset = 0;
if (uri.scheme === DocumentSchemes.Git) {
const data = GitProvider.fromGitUri(uri);
base._fsPath = data.originalFileName || data.fileName;
this.offset = (data.decoration && data.decoration.split('\n').length) || 0;
this.repoPath = data.repoPath;
this.sha = data.sha;
}
else if (commit) {
base._fsPath = commit.originalFileName || commit.fileName;
this.repoPath = commit.repoPath;
this.sha = commit.sha;
}
}
fileUri() {
return Uri.file(this.fsPath);
}
static fromUri(uri: Uri, git?: GitProvider) {
if (git) {
const gitUri = git.getGitUriForFile(uri.fsPath);
if (gitUri) return gitUri;
}
return new GitUri(uri);
}
}
export interface IGitUriData {
repoPath: string;
fileName: string;
originalFileName?: string;
sha: string;
index: number;
decoration?: string;
}