PY-24540 Fix extra space mistakenly added by Fill paragraph action

Fix tests according to the changes

Merge-request: IJ-MR-98042
Merged-by: Daniil Kalinin <Daniil.Kalinin@jetbrains.com>

GitOrigin-RevId: fb28eb2b435eb71430beaa4c243644daf04e37a6

platform/lang-impl/src/com/intellij/codeInsight/editorActions/fillParagraph/ParagraphFillHandler.java

@@ -16,6 +16,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Defines general re-flow paragraph functionality.
@@ -39,13 +40,13 @@ public class ParagraphFillHandler {
     final StringBuilder stringBuilder = new StringBuilder();
     appendPrefix(element, text, stringBuilder);
 
-    for (String string : subStrings) {
-      final String startTrimmed = StringUtil.trimStart(string.trim(), prefix.trim());
-      final String str = StringUtil.trimEnd(startTrimmed, postfix.trim());
-      final String finalString = str.trim();
-      if (!StringUtil.isEmptyOrSpaces(finalString))
-        stringBuilder.append(finalString).append(" ");
-    }
+    stringBuilder.append(subStrings.stream()
+                           .map(string -> StringUtil.trimStart(string.trim(), prefix.trim()))
+                           .map(string -> StringUtil.trimEnd(string, postfix.trim()))
+                           .map(String::trim)
+                           .filter(finalString -> !StringUtil.isEmptyOrSpaces(finalString))
+                           .collect(Collectors.joining(" ")));
+
     appendPostfix(element, text, stringBuilder);
 
     final String replacementText = stringBuilder.toString();

python/testData/fillParagraph/fString_after.py

@@ -1,2 +1,2 @@
 s = f'foo ' \
-    f'{"bar" + "baz"} '
+    f'{"bar" + "baz"}'

python/testData/fillParagraph/prefixPostfix_after.py

@@ -3,4 +3,4 @@ __author__ = 'ktisha'
 def foo():
     """A Map from key to total # of views by that key. This can be expensive to the big fetch with blackjack and
     whores, so we generally want to fetch this only for keys that have a large absolute number of views,
-    a small number of days between views, etc. """
+    a small number of days between views, etc."""

python/testData/fillParagraph/string_after.py

@@ -1,2 +1,2 @@
 p = "my new string blah blah blah ;j;dsjv sd;fj;dsjf;ds js;djgf ;jsg s;dgj; sjd;gj sd;gj ;sjg;j asdl j;sjdg; jasdgl " \
-    "j;sldjg ;jsd;gj "
+    "j;sldjg ;jsd;gj"