mirror of
https://github.com/ckaczor/vscode-gitlens.git
synced 2026-02-16 10:58:34 -05:00
Changes to undefined checks
This commit is contained in:
@@ -42,9 +42,7 @@ export class GitBlameParser {
|
|||||||
let position = -1;
|
let position = -1;
|
||||||
while (++position < lines.length) {
|
while (++position < lines.length) {
|
||||||
const lineParts = lines[position].split(' ');
|
const lineParts = lines[position].split(' ');
|
||||||
if (lineParts.length < 2) {
|
if (lineParts.length < 2) continue;
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (entry === undefined) {
|
if (entry === undefined) {
|
||||||
entry = {
|
entry = {
|
||||||
|
|||||||
@@ -287,18 +287,18 @@ export class GitService extends Disposable {
|
|||||||
if (sha === undefined) {
|
if (sha === undefined) {
|
||||||
// Get the most recent commit for this file name
|
// Get the most recent commit for this file name
|
||||||
const c = await this.getLogCommit(repoPath, fileName);
|
const c = await this.getLogCommit(repoPath, fileName);
|
||||||
if (!c) return undefined;
|
if (c === undefined) return undefined;
|
||||||
|
|
||||||
sha = c.sha;
|
sha = c.sha;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the full commit (so we can see if there are any matching renames in the file statuses)
|
// Get the full commit (so we can see if there are any matching renames in the file statuses)
|
||||||
const log = await this.getLogForRepo(repoPath, sha, 1);
|
const log = await this.getLogForRepo(repoPath, sha, 1);
|
||||||
if (!log) return undefined;
|
if (log === undefined) return undefined;
|
||||||
|
|
||||||
const c = Iterables.first(log.commits.values());
|
const c = Iterables.first(log.commits.values());
|
||||||
const status = c.fileStatuses.find(_ => _.originalFileName === fileName);
|
const status = c.fileStatuses.find(_ => _.originalFileName === fileName);
|
||||||
if (!status) return undefined;
|
if (status === undefined) return undefined;
|
||||||
|
|
||||||
return status.fileName;
|
return status.fileName;
|
||||||
}
|
}
|
||||||
@@ -444,7 +444,7 @@ export class GitService extends Disposable {
|
|||||||
try {
|
try {
|
||||||
const data = await Git.blame(uri.repoPath, fileName, uri.sha, line + 1, line + 1);
|
const data = await Git.blame(uri.repoPath, fileName, uri.sha, line + 1, line + 1);
|
||||||
const blame = GitBlameParser.parse(data, uri.repoPath, fileName);
|
const blame = GitBlameParser.parse(data, uri.repoPath, fileName);
|
||||||
if (!blame) return undefined;
|
if (blame === undefined) return undefined;
|
||||||
|
|
||||||
const commit = Iterables.first(blame.commits.values());
|
const commit = Iterables.first(blame.commits.values());
|
||||||
if (uri.repoPath) {
|
if (uri.repoPath) {
|
||||||
@@ -465,7 +465,7 @@ export class GitService extends Disposable {
|
|||||||
Logger.log(`getBlameForRange('${uri.repoPath}', '${uri.fsPath}', [${range.start.line}, ${range.end.line}], ${uri.sha})`);
|
Logger.log(`getBlameForRange('${uri.repoPath}', '${uri.fsPath}', [${range.start.line}, ${range.end.line}], ${uri.sha})`);
|
||||||
|
|
||||||
const blame = await this.getBlameForFile(uri);
|
const blame = await this.getBlameForFile(uri);
|
||||||
if (!blame) return undefined;
|
if (blame === undefined) return undefined;
|
||||||
|
|
||||||
return this.getBlameForRangeSync(blame, uri, range);
|
return this.getBlameForRangeSync(blame, uri, range);
|
||||||
}
|
}
|
||||||
@@ -473,7 +473,7 @@ export class GitService extends Disposable {
|
|||||||
getBlameForRangeSync(blame: IGitBlame, uri: GitUri, range: Range): IGitBlameLines | undefined {
|
getBlameForRangeSync(blame: IGitBlame, uri: GitUri, range: Range): IGitBlameLines | undefined {
|
||||||
Logger.log(`getBlameForRangeSync('${uri.repoPath}', '${uri.fsPath}', [${range.start.line}, ${range.end.line}], ${uri.sha})`);
|
Logger.log(`getBlameForRangeSync('${uri.repoPath}', '${uri.fsPath}', [${range.start.line}, ${range.end.line}], ${uri.sha})`);
|
||||||
|
|
||||||
if (!blame.lines.length) return Object.assign({ allLines: blame.lines }, blame);
|
if (blame.lines.length === 0) return Object.assign({ allLines: blame.lines }, blame);
|
||||||
|
|
||||||
if (range.start.line === 0 && range.end.line === blame.lines.length - 1) {
|
if (range.start.line === 0 && range.end.line === blame.lines.length - 1) {
|
||||||
return Object.assign({ allLines: blame.lines }, blame);
|
return Object.assign({ allLines: blame.lines }, blame);
|
||||||
@@ -521,7 +521,7 @@ export class GitService extends Disposable {
|
|||||||
Logger.log(`getBlameLocations('${uri.repoPath}', '${uri.fsPath}', [${range.start.line}, ${range.end.line}], ${uri.sha})`);
|
Logger.log(`getBlameLocations('${uri.repoPath}', '${uri.fsPath}', [${range.start.line}, ${range.end.line}], ${uri.sha})`);
|
||||||
|
|
||||||
const blame = await this.getBlameForRange(uri, range);
|
const blame = await this.getBlameForRange(uri, range);
|
||||||
if (!blame) return undefined;
|
if (blame === undefined) return undefined;
|
||||||
|
|
||||||
const commitCount = blame.commits.size;
|
const commitCount = blame.commits.size;
|
||||||
|
|
||||||
@@ -691,17 +691,17 @@ export class GitService extends Disposable {
|
|||||||
if (typeof shaOrOptions === 'string') {
|
if (typeof shaOrOptions === 'string') {
|
||||||
sha = shaOrOptions;
|
sha = shaOrOptions;
|
||||||
}
|
}
|
||||||
else if (!options) {
|
else if (options === undefined) {
|
||||||
options = shaOrOptions;
|
options = shaOrOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
options = options || {};
|
options = options || {};
|
||||||
|
|
||||||
const log = await this.getLogForFile(repoPath, fileName, sha, options.previous ? 2 : 1);
|
const log = await this.getLogForFile(repoPath, fileName, sha, options.previous ? 2 : 1);
|
||||||
if (!log) return undefined;
|
if (log === undefined) return undefined;
|
||||||
|
|
||||||
const commit = sha && log.commits.get(sha);
|
const commit = sha && log.commits.get(sha);
|
||||||
if (!commit && sha && !options.firstIfMissing) return undefined;
|
if (commit === undefined && sha && !options.firstIfMissing) return undefined;
|
||||||
|
|
||||||
return commit || Iterables.first(log.commits.values());
|
return commit || Iterables.first(log.commits.values());
|
||||||
}
|
}
|
||||||
@@ -854,7 +854,7 @@ export class GitService extends Disposable {
|
|||||||
Logger.log(`getLogLocations('${uri.repoPath}', '${uri.fsPath}', ${uri.sha}, ${selectedSha}, ${line})`);
|
Logger.log(`getLogLocations('${uri.repoPath}', '${uri.fsPath}', ${uri.sha}, ${selectedSha}, ${line})`);
|
||||||
|
|
||||||
const log = await this.getLogForFile(uri.repoPath, uri.fsPath, uri.sha);
|
const log = await this.getLogForFile(uri.repoPath, uri.fsPath, uri.sha);
|
||||||
if (!log) return undefined;
|
if (log === undefined) return undefined;
|
||||||
|
|
||||||
const commitCount = log.commits.size;
|
const commitCount = log.commits.size;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user