From 08f79dc3cd4d77c1d59e82d777afda2aae0e3217 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 18 Feb 2014 11:48:30 +0400 Subject: [PATCH] diff: do not try to create empty LineFragment fix assertion --- .../diff/impl/processing/DummyDiffFragmentsProcessor.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/diff/impl/processing/DummyDiffFragmentsProcessor.java b/platform/util/src/com/intellij/openapi/diff/impl/processing/DummyDiffFragmentsProcessor.java index 10753bbec21e..8da7510145b8 100644 --- a/platform/util/src/com/intellij/openapi/diff/impl/processing/DummyDiffFragmentsProcessor.java +++ b/platform/util/src/com/intellij/openapi/diff/impl/processing/DummyDiffFragmentsProcessor.java @@ -26,11 +26,12 @@ public class DummyDiffFragmentsProcessor { public ArrayList process(String text1, String text2) { ArrayList lineFragments = new ArrayList(); - TextDiffTypeEnum type; if (text1.isEmpty() && text2.isEmpty()) { - type = TextDiffTypeEnum.NONE; + return lineFragments; } - else if (text1.isEmpty()) { + + TextDiffTypeEnum type; + if (text1.isEmpty()) { type = TextDiffTypeEnum.INSERT; } else if (text2.isEmpty()) {