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

IDEA-115693 Exception on Show Bookmarks

Browse Source
This commit is contained in:
Vassiliy
2013-11-04 13:41:08 +04:00
parent 757a12c7d6
commit 32a0e7c560
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/ui/popup/util/DetailView.java
+2 -1
View File
@@ -89,6 +89,7 @@ public interface DetailView extends UserDataHolder {
return myFile;
}
@Nullable
public LogicalPosition getNavigate() {
return myNavigate;
}
@@ -101,7 +102,7 @@ public interface DetailView extends UserDataHolder {
private final LogicalPosition myNavigate;
private final TextAttributes myAttributes;
public PreviewEditorState(VirtualFile file, LogicalPosition navigate, TextAttributes attributes) {
public PreviewEditorState(VirtualFile file, @Nullable LogicalPosition navigate, TextAttributes attributes) {
myFile = file;
myNavigate = navigate;
platform/lang-impl/src/com/intellij/ui/popup/util/DetailViewImpl.java
+6 -4
View File
@@ -156,14 +156,16 @@ public class DetailViewImpl extends JPanel implements DetailView, UserDataHolder
add(getEditor().getComponent(), BorderLayout.CENTER);
}
getEditor().getCaretModel().moveToLogicalPosition(positionToNavigate);
validate();
getEditor().getScrollingModel().scrollToCaret(ScrollType.CENTER);
if (positionToNavigate != null) {
getEditor().getCaretModel().moveToLogicalPosition(positionToNavigate);
validate();
getEditor().getScrollingModel().scrollToCaret(ScrollType.CENTER);
}
getEditor().setBorder(IdeBorderFactory.createBorder(SideBorder.TOP));
clearHightlighting();
if (lineAttributes != null) {
if (lineAttributes != null && positionToNavigate != null) {
myHighlighter = getEditor().getMarkupModel().addLineHighlighter(positionToNavigate.line, HighlighterLayer.SELECTION - 1,
lineAttributes);
}