From 2b6ac69f85b31b5dedd1d87e2908acdc53f6a92c Mon Sep 17 00:00:00 2001 From: Constantine Plotnikov Date: Tue, 27 Oct 2009 17:10:15 +0300 Subject: [PATCH] git4idea: IDEADEV-41015, IDEADEV-40952: added support for text files without new lines --- .../src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java | 2 +- plugins/git4idea/src/git4idea/checkin/GitConvertFilesDialog.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java index e5db282548..fd0fcb5493 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java @@ -319,7 +319,7 @@ public final class LoadTextUtil { } CharSequence cs = getTextByBinaryPresentation(file.contentsToByteArray(), file); lineSeparator = file.getUserData(DETECTED_LINE_SEPARATOR_KEY); - if (lineSeparator.equals(newLineSeparator)) { + if (lineSeparator == null || lineSeparator.equals(newLineSeparator)) { return; } if (!newLineSeparator.equals("\n")) { diff --git a/plugins/git4idea/src/git4idea/checkin/GitConvertFilesDialog.java b/plugins/git4idea/src/git4idea/checkin/GitConvertFilesDialog.java index 120335dc4e..0f68f3d832 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitConvertFilesDialog.java +++ b/plugins/git4idea/src/git4idea/checkin/GitConvertFilesDialog.java @@ -178,7 +178,8 @@ public class GitConvertFilesDialog extends DialogWrapper { Set fs = e.getValue(); for (Iterator j = fs.iterator(); j.hasNext();) { VirtualFile f = j.next(); - if (nl.equals(LoadTextUtil.detectLineSeparator(f, true))) { + String detectedLineSeparator = LoadTextUtil.detectLineSeparator(f, true); + if (detectedLineSeparator == null || nl.equals(detectedLineSeparator)) { j.remove(); } } -- 2.11.4.GIT