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

Stops trying to set the line if we don't have one

Browse Source
This commit is contained in:
Eric Amodio
2017-06-14 02:01:24 -04:00
parent 1cdd94cb46
commit a306ba2b98
5 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/diffLineWithPrevious.ts
View File

@@ -79,6 +79,8 @@ export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
`${path.basename(args.commit.uri.fsPath)} (${args.commit.shortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(gitUri.fsPath)} (${gitUri.shortSha})`,
args.showOptions);
if (args.line === undefined || args.line === 0) return undefined;
// TODO: Figure out how to focus the left pane
return await commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: args.line, at: 'center' });
}

2
src/commands/diffWithBranch.ts
View File

@@ -48,6 +48,8 @@ export class DiffWithBranchCommand extends ActiveEditorCommand {
`${path.basename(gitUri.fsPath)} (${branch}) ${GlyphChars.ArrowLeftRight} ${path.basename(gitUri.fsPath)}`,
args.showOptions);
if (args.line === undefined || args.line === 0) return undefined;
// TODO: Figure out how to focus the left pane
return await commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: args.line, at: 'center' });
}

2
src/commands/diffWithNext.ts
View File

@@ -63,6 +63,8 @@ export class DiffWithNextCommand extends ActiveEditorCommand {
`${path.basename(args.commit.uri.fsPath)} (${args.commit.shortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(args.commit.nextUri.fsPath)} (${args.commit.nextShortSha})`,
args.showOptions);
if (args.line === undefined || args.line === 0) return undefined;
// TODO: Figure out how to focus the left pane
return await commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: args.line, at: 'center' });
}

11
src/commands/diffWithPrevious.ts
View File

@@ -26,9 +26,14 @@ export class DiffWithPreviousCommand extends ActiveEditorCommand {
uri = getCommandUri(uri, editor);
if (uri === undefined) return undefined;
args.line = args.line || (editor === undefined ? 0 : editor.selection.active.line);
if (args.commit !== undefined && args.commit.type !== 'file') {
args.line = 0;
}
else {
args.line = args.line || (editor === undefined ? 0 : editor.selection.active.line);
}
if (args.commit === undefined || (args.commit.type !== 'file') || args.range !== undefined) {
if (args.commit === undefined || args.commit.type !== 'file' || args.range !== undefined) {
const gitUri = await GitUri.fromUri(uri, this.git);
try {
@@ -62,6 +67,8 @@ export class DiffWithPreviousCommand extends ActiveEditorCommand {
`${path.basename(args.commit.previousUri.fsPath)} (${args.commit.previousShortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(args.commit.uri.fsPath)} (${args.commit.shortSha})`,
args.showOptions);
if (args.line === undefined || args.line === 0) return undefined;
// TODO: Figure out how to focus the left pane
return await commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: args.line, at: 'center' });
}

2
src/commands/diffWithWorking.ts
View File

@@ -54,6 +54,8 @@ export class DiffWithWorkingCommand extends ActiveEditorCommand {
`${path.basename(args.commit.uri.fsPath)} (${args.commit.shortSha}) ${GlyphChars.ArrowLeftRight} ${path.basename(workingFileName)}`,
args.showOptions);
if (args.line === undefined || args.line === 0) return undefined;
// TODO: Figure out how to focus the left pane
return await commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: args.line, at: 'center' });
}