Fix extra lines on organize imports command

Author: armanio123

src/compiler/emitter.ts

@@ -879,7 +879,7 @@ namespace ts {
         let containerEnd = -1;
         let declarationListContainerEnd = -1;
         let currentLineMap: readonly number[] | undefined;
-        let detachedCommentsInfo: { nodePos: number, detachedCommentEndPos: number}[] | undefined;
+        let detachedCommentsInfo: { nodePos: number, detachedCommentEndPos: number }[] | undefined;
         let hasWrittenComment = false;
         let commentsDisabled = !!printerOptions.removeComments;
         let lastNode: Node | undefined;
@@ -902,6 +902,11 @@ namespace ts {
             bundleFileInfo
         };
 
+        function getPreserveSourceNewlines(node: Node) {
+            // Ignore preserveSourceNewlines if it has enabled the flag.
+            return preserveSourceNewlines && !(getEmitFlags(node) & EmitFlags.IgnoreSourceNewlines);
+        }
+
         function printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): string {
             switch (hint) {
                 case EmitHint.SourceFile:
@@ -1205,25 +1210,25 @@ namespace ts {
                     if (onEmitNode !== noEmitNotification && (!isEmitNotificationEnabled || isEmitNotificationEnabled(node))) {
                         return pipelineEmitWithNotification;
                     }
-                    // falls through
+                // falls through
 
                 case PipelinePhase.Substitution:
                     if (substituteNode !== noEmitSubstitution && (lastSubstitution = substituteNode(emitHint, node)) !== node) {
                         return pipelineEmitWithSubstitution;
                     }
-                    // falls through
+                // falls through
 
                 case PipelinePhase.Comments:
                     if (!commentsDisabled && node.kind !== SyntaxKind.SourceFile) {
                         return pipelineEmitWithComments;
                     }
-                    // falls through
+                // falls through
 
                 case PipelinePhase.SourceMaps:
                     if (!sourceMapsDisabled && node.kind !== SyntaxKind.SourceFile && !isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
-                    // falls through
+                // falls through
 
                 case PipelinePhase.Emit:
                     return pipelineEmitWithHint;
@@ -4421,7 +4426,7 @@ namespace ts {
                     return 0;
                 }
                 else if (!nodeIsSynthesized(previousNode) && !nodeIsSynthesized(nextNode) && previousNode.parent === nextNode.parent) {
-                    if (preserveSourceNewlines) {
+                    if (getPreserveSourceNewlines(nextNode)) {
                         return getEffectiveLines(
                             includeComments => getLinesBetweenRangeEndAndRangeStart(
                                 previousNode,
@@ -4591,7 +4596,7 @@ namespace ts {
                     const text = isNumericLiteral(textSourceNode) ? textSourceNode.text : getTextOfNode(textSourceNode);
                     return jsxAttributeEscape ? `"${escapeJsxAttributeString(text)}"` :
                         neverAsciiEscape || (getEmitFlags(node) & EmitFlags.NoAsciiEscaping) ? `"${escapeString(text)}"` :
-                        `"${escapeNonAsciiString(text)}"`;
+                            `"${escapeNonAsciiString(text)}"`;
                 }
                 else {
                     return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);

src/services/organizeImports.ts

@@ -395,14 +395,21 @@ namespace ts.OrganizeImports {
             factory.updateImportClause(importDeclaration.importClause!, importDeclaration.importClause!.isTypeOnly, name, namedBindings), // TODO: GH#18217
             importDeclaration.moduleSpecifier);
     }
-
+    
     function sortSpecifiers<T extends ImportOrExportSpecifier>(specifiers: readonly T[]) {
         return stableSort(specifiers, compareImportOrExportSpecifiers);
     }
 
     export function compareImportOrExportSpecifiers<T extends ImportOrExportSpecifier>(s1: T, s2: T) {
-        return compareIdentifiers(s1.propertyName || s1.name, s2.propertyName || s2.name)
+        const comparison = compareIdentifiers(s1.propertyName || s1.name, s2.propertyName || s2.name)
             || compareIdentifiers(s1.name, s2.name);
+
+        if (comparison === Comparison.LessThan) {
+            // Ignore new lines if the node is going to get rearranged.
+            ignoreSourceNewlines(s1);
+        }
+
+        return comparison;
     }
 
     /* internal */ // Exported for testing

tests/cases/fourslash/organizeImports1.ts

@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+// Regression test for bug #41417
+
+/// import {
+///     a, b as B,
+///     c,
+///     d as D,
+///     c as C, b, d
+/// } from './foo';
+/// console.log(a, B, b, c, C, d, D);
+
+verify.organizeImports(
+`import {
+    a, b as B,
+    b, c,
+    c as C, d as D,
+    d
+} from './foo';
+console.log(a, B, b, c, C, d, D);`
+);