MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-07-19 19:16:30 +04:00
parent 309b166025
commit 347e561806
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
platform/core-impl/src/com/intellij/psi/impl/smartPointers/SelfElementInfo.java
View File

@@ -115,29 +115,29 @@ public class SelfElementInfo implements SmartPointerElementInfo {
Document document = myVirtualFile == null ? null : FileDocumentManager.getInstance().getDocument(myVirtualFile);
if (document == null) {
mySyncMarkerIsValid = false;
return;
}
int start = Math.min(getSyncStartOffset(), document.getTextLength());
int end = Math.min(Math.max(getSyncEndOffset(), start), document.getTextLength());
// use supplied cached markers if available
if (cachedRangeMarkers != null) {
for (RangeMarker cachedRangeMarker : cachedRangeMarkers) {
if (cachedRangeMarker.isValid() &&
cachedRangeMarker.getStartOffset() == start &&
cachedRangeMarker.getEndOffset() == end) {
marker = cachedRangeMarker;
break;
}
}
}
else {
marker = document.createRangeMarker(start, end, true);
int start = Math.min(getSyncStartOffset(), document.getTextLength());
int end = Math.min(Math.max(getSyncEndOffset(), start), document.getTextLength());
// use supplied cached markers if available
if (cachedRangeMarkers != null) {
for (RangeMarker cachedRangeMarker : cachedRangeMarkers) {
if (cachedRangeMarker.isValid() &&
cachedRangeMarker.getStartOffset() == start &&
cachedRangeMarker.getEndOffset() == end) {
marker = cachedRangeMarker;
break;
}
}
}
else {
marker = document.createRangeMarker(start, end, true);
}
}
setMarker(marker);
}
else if (!marker.isValid()) {
mySyncMarkerIsValid = false;
marker.dispose();
setMarker(null);
marker = null;
}
@@ -200,7 +200,7 @@ public class SelfElementInfo implements SmartPointerElementInfo {
return null;
}
RangeMarker getMarker() {
private RangeMarker getMarker() {
Reference<RangeMarker> ref = myMarkerRef;
return ref == null ? null : ref.get();
}
@@ -235,7 +235,7 @@ public class SelfElementInfo implements SmartPointerElementInfo {
if (file != null && language != null) {
return file.getViewProvider().getPsi(language);
}
return file;
}
});