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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
anna
2013-02-21 11:40:50 +01:00
parent 5c8e94689b bf977b5515
commit b5f00f34c8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java
+7 -5
View File
@@ -57,7 +57,7 @@ public class CodeFoldingManagerImpl extends CodeFoldingManager implements Projec
private final List<Document> myDocumentsWithFoldingInfo = new WeakList<Document>();
private final Key<DocumentFoldingInfo> FOLDING_INFO_IN_DOCUMENT_KEY = Key.create("FOLDING_INFO_IN_DOCUMENT_KEY");
private final Key<DocumentFoldingInfo> myFoldingInfoInDocumentKey = Key.create("FOLDING_INFO_IN_DOCUMENT_KEY");
private static final Key<Boolean> FOLDING_STATE_INFO_IN_DOCUMENT_KEY = Key.create("FOLDING_STATE_IN_DOCUMENT");
CodeFoldingManagerImpl(Project project) {
@@ -83,7 +83,7 @@ public class CodeFoldingManagerImpl extends CodeFoldingManager implements Projec
public void disposeComponent() {
for (Document document : myDocumentsWithFoldingInfo) {
if (document != null) {
document.putUserData(FOLDING_INFO_IN_DOCUMENT_KEY, null);
document.putUserData(myFoldingInfoInDocumentKey, null);
}
}
}
@@ -345,12 +345,14 @@ public class CodeFoldingManagerImpl extends CodeFoldingManager implements Projec
@NotNull
private DocumentFoldingInfo getDocumentFoldingInfo(@NotNull Document document) {
DocumentFoldingInfo info = document.getUserData(FOLDING_INFO_IN_DOCUMENT_KEY);
DocumentFoldingInfo info = document.getUserData(myFoldingInfoInDocumentKey);
if (info == null) {
info = new DocumentFoldingInfo(myProject, document);
DocumentFoldingInfo written = ((UserDataHolderEx)document).putUserDataIfAbsent(FOLDING_INFO_IN_DOCUMENT_KEY, info);
if (written != info) {
DocumentFoldingInfo written = ((UserDataHolderEx)document).putUserDataIfAbsent(myFoldingInfoInDocumentKey, info);
if (written == info) {
myDocumentsWithFoldingInfo.add(document);
}
else {
info = written;
}
}