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

Find a project for the document not having an active editor (fixes IDEA-156530)

Browse Source
This commit is contained in:
Rustam Vishnyakov
2016-05-31 14:53:05 +03:00
parent 62c4cdd25a
commit ef85dccac6
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/TrailingSpacesStripper.java
+14 -1
View File
@@ -25,6 +25,8 @@ import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileEditor.FileDocumentManagerAdapter;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectUtil;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.ShutDownTracker;
import com.intellij.openapi.vfs.VirtualFile;
@@ -33,6 +35,7 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.text.CharArrayUtil;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.awt.*;
import java.util.ArrayList;
@@ -180,7 +183,7 @@ public final class TrailingSpacesStripper extends FileDocumentManagerAdapter {
}
boolean markAsNeedsStrippingLater =
((DocumentImpl)document).stripTrailingSpaces(activeEditor == null ? null : activeEditor.getProject(),
((DocumentImpl)document).stripTrailingSpaces(getProject(document, activeEditor),
inChangedLinesOnly, isVirtualSpaceEnabled, caretOffsets);
if (activeEditor != null && !ShutDownTracker.isShutdownHookRunning()) {
@@ -196,6 +199,16 @@ public final class TrailingSpacesStripper extends FileDocumentManagerAdapter {
return !markAsNeedsStrippingLater;
}
@Nullable
private static Project getProject(@NotNull Document document, @Nullable Editor editor) {
if (editor != null) return editor.getProject();
VirtualFile file = FileDocumentManager.getInstance().getFile(document);
if (file != null) {
return ProjectUtil.guessProjectForFile(file);
}
return null;
}
public void documentDeleted(@NotNull Document doc) {
myDocumentsToStripLater.remove(doc);