From b1b845ffe254caf80c24780ddd8d26e2c9217ea2 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Wed, 6 Apr 2016 15:09:49 +0300 Subject: [PATCH] [patch]: IDEA-142061 Applying patch deletes blank lines * use StringUtil.join instead of manual appending; * fix empty sting appending: because when first element is empty string then stringBuilder.length remain 0 and line separator was not added; --- .../openapi/diff/impl/patch/apply/GenericPatchApplier.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java index ad2d9e7e60a3..d0f4e06484b3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java @@ -989,10 +989,10 @@ public class GenericPatchApplier { } private void linesToSb(final StringBuilder sb, final List list) { - for (String s : list) { - if (sb.length() > 0) sb.append('\n'); - sb.append(s); + if (sb.length() > 0 && !list.isEmpty()) { + sb.append("\n"); } + StringUtil.join(list, "\n", sb); } // indexes are passed inclusive