MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: scroll to line for annotate-from-annotate

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-01-20 16:49:26 +03:00
parent faac404fdc
commit e84e27c432
6 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/diff/Diff.java
+12 -7
View File
@@ -119,11 +119,13 @@ public class Diff {
* @return translated line if the processing is ok; negative value otherwise
*/
public static int translateLine(@NotNull CharSequence before, @NotNull CharSequence after, int line) throws FilesTooBigForDiffException {
return translateLine(before, after, line, false);
}
public static int translateLine(@NotNull CharSequence before, @NotNull CharSequence after, int line, boolean approximate)
throws FilesTooBigForDiffException {
Change change = buildChanges(before, after);
if (change == null) {
return -1;
}
return translateLine(change, line);
return translateLine(change, line, approximate);
}
/**
@@ -133,17 +135,20 @@ public class Diff {
* @param line target line before change
* @return translated line if the processing is ok; negative value otherwise
*/
public static int translateLine(@NotNull Change change, int line) {
public static int translateLine(@Nullable Change change, int line) {
return translateLine(change, line, false);
}
public static int translateLine(@Nullable Change change, int line, boolean approximate) {
int result = line;
Change currentChange = change;
while (currentChange != null) {
if (line < currentChange.line0) break;
if (line >= currentChange.line0 + currentChange.deleted) {
result += currentChange.inserted - currentChange.deleted;
} else {
return -1;
if (approximate) return currentChange.line1;
}
currentChange = currentChange.link;
platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
+2
View File
@@ -71,6 +71,8 @@ public abstract class AbstractVcsHelper {
public abstract void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs);
public abstract void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs, int line);
public abstract void showDifferences(final VcsFileRevision cvsVersionOn, final VcsFileRevision cvsVersionOn1, final File file);
public abstract void showChangesListBrowser(CommittedChangeList changelist, @Nls String title);
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateRevisionActionBase.java
+25 -3
View File
@@ -2,6 +2,8 @@ package com.intellij.openapi.vcs.actions;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
@@ -15,6 +17,8 @@ import com.intellij.openapi.vcs.impl.BackgroundableActionEnabledHandler;
import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
import com.intellij.openapi.vcs.impl.VcsBackgroundableActions;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.diff.Diff;
import com.intellij.util.diff.FilesTooBigForDiffException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -60,7 +64,7 @@ public abstract class AnnotateRevisionActionBase extends AnAction {
}
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
public void actionPerformed(@NotNull final AnActionEvent e) {
final VcsFileRevision fileRevision = getFileRevision(e);
final VirtualFile file = getFile(e);
final AbstractVcs vcs = getVcs(e);
@@ -68,10 +72,15 @@ public abstract class AnnotateRevisionActionBase extends AnAction {
assert file != null;
assert fileRevision != null;
final Editor editor = e.getData(CommonDataKeys.EDITOR);
final CharSequence oldContent = editor == null ? null : editor.getDocument().getImmutableCharSequence();
final int oldLine = editor == null ? 0 : editor.getCaretModel().getLogicalPosition().line;
final AnnotationProvider annotationProvider = vcs.getCachingAnnotationProvider();
assert annotationProvider != null;
final Ref<FileAnnotation> fileAnnotationRef = new Ref<FileAnnotation>();
final Ref<Integer> newLineRef = new Ref<Integer>();
final Ref<VcsException> exceptionRef = new Ref<VcsException>();
final ProjectLevelVcsManagerImpl plVcsManager = (ProjectLevelVcsManagerImpl)ProjectLevelVcsManager.getInstance(vcs.getProject());
@@ -82,7 +91,20 @@ public abstract class AnnotateRevisionActionBase extends AnAction {
BackgroundFromStartOption.getInstance()) {
public void run(@NotNull ProgressIndicator indicator) {
try {
fileAnnotationRef.set(annotationProvider.annotate(file, fileRevision));
FileAnnotation fileAnnotation = annotationProvider.annotate(file, fileRevision);
int newLine = oldLine;
if (oldContent != null) {
String content = fileAnnotation.getAnnotatedContent();
try {
newLine = Diff.translateLine(oldContent, content, oldLine);
}
catch (FilesTooBigForDiffException ignore) {
}
}
fileAnnotationRef.set(fileAnnotation);
newLineRef.set(newLine);
}
catch (VcsException e) {
exceptionRef.set(e);
@@ -103,7 +125,7 @@ public abstract class AnnotateRevisionActionBase extends AnAction {
}
if (fileAnnotationRef.isNull()) return;
AbstractVcsHelper.getInstance(myProject).showAnnotation(fileAnnotationRef.get(), file, vcs);
AbstractVcsHelper.getInstance(myProject).showAnnotation(fileAnnotationRef.get(), file, vcs, newLineRef.get());
}
});
}
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
+5 -1
View File
@@ -375,7 +375,11 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper {
}
public void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs) {
OpenFileDescriptor openFileDescriptor = new OpenFileDescriptor(myProject, file);
showAnnotation(annotation, file, vcs, 0);
}
public void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs, int line) {
OpenFileDescriptor openFileDescriptor = new OpenFileDescriptor(myProject, file, line, 0);
Editor editor = FileEditorManager.getInstance(myProject).openTextEditor(openFileDescriptor, true);
if (editor == null) {
Messages.showMessageDialog(VcsBundle.message("message.text.cannot.open.editor", file.getPresentableUrl()),
plugins/git4idea/tests/git4idea/test/MockVcsHelper.java
+5
View File
@@ -67,6 +67,11 @@ public class MockVcsHelper extends AbstractVcsHelper {
throw new UnsupportedOperationException();
}
@Override
public void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs, int line) {
throw new UnsupportedOperationException();
}
@Override
public void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs) {
throw new UnsupportedOperationException();
plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java
+4
View File
@@ -68,6 +68,10 @@ public class HgMockVcsHelper extends AbstractVcsHelper {
return null;
}
@Override
public void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs, int line) {
}
@Override
public void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs) {
}