diff: restore binary compatibility

GitOrigin-RevId: 38b9d68efc61b50fd5264aa4ccb7622b8742d01f
This commit is contained in:
Aleksey Pivovarov
2020-04-14 11:31:07 +00:00
committed by intellij-monorepo-bot
parent 02411f8758
commit 08e9fb2414
@@ -18,14 +18,23 @@ package com.intellij.diff.contents;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.LineSeparator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.nio.charset.Charset;
/**
* Allows to compare some text associated with document.
*/
public class DocumentContentImpl extends DocumentContentBase {
@Nullable private final FileType myType;
@Nullable private final VirtualFile myHighlightFile;
@Nullable private final LineSeparator mySeparator;
@Nullable private final Charset myCharset;
@Nullable private final Boolean myBOM;
public DocumentContentImpl(@NotNull Document document) {
this(null, document, null);
@@ -34,8 +43,40 @@ public class DocumentContentImpl extends DocumentContentBase {
public DocumentContentImpl(@Nullable Project project,
@NotNull Document document,
@Nullable FileType type) {
this(project, document, type, null, null, null, null);
}
public DocumentContentImpl(@Nullable Project project,
@NotNull Document document,
@Nullable FileType type,
@Nullable VirtualFile highlightFile,
@Nullable LineSeparator separator,
@Nullable Charset charset,
@Nullable Boolean bom) {
super(project, document);
myType = type;
myHighlightFile = highlightFile;
mySeparator = separator;
myCharset = charset;
myBOM = bom;
}
@Nullable
@Override
public VirtualFile getHighlightFile() {
return myHighlightFile;
}
@Nullable
@Override
public LineSeparator getLineSeparator() {
return mySeparator;
}
@Override
@Nullable
public Boolean hasBom() {
return myBOM;
}
@Nullable
@@ -43,4 +84,10 @@ public class DocumentContentImpl extends DocumentContentBase {
public FileType getContentType() {
return myType;
}
@Nullable
@Override
public Charset getCharset() {
return myCharset;
}
}