adjust and add integration test

Author: dibarbet

src/lsptoolshost/autoInsert/onAutoInsert.ts

@@ -56,10 +56,11 @@ export function registerOnAutoInsert(languageServer: RoslynLanguageServer, langu
 
         // Regular expression to match all whitespace characters except the newline character
         let changeTrimmed = change.text.replace(/[^\S\n]+/g, '');
+
         // When hitting enter between braces, we can end up with two new lines added (one to move the cursor down to an empty line,
-        // and another to move the close brace to a new line below that).  We still want to trigger on auto insert here, so remove
-        // duplicates before we check if the change matches a trigger character.
-        if (changeTrimmed.length > 1) {
+        // and another to move the close brace to a new line below that).  We still want to trigger on auto insert here, so if we
+        // have a whitespace only edit (meaning its new lines only) with multiple characters, we reduce it to a single newline.
+        if (changeTrimmed.length > 1 && changeTrimmed.trim() === '') {
             changeTrimmed = [...new Set(changeTrimmed)].join('');
         }
 

test/lsptoolshost/integrationTests/onAutoInsert.integration.test.ts

@@ -15,6 +15,7 @@ import {
     waitForExpectedResult,
 } from './integrationHelpers';
 import { describe, beforeAll, beforeEach, afterAll, test, expect, afterEach } from '@jest/globals';
+import { EOL } from 'os';
 
 describe(`OnAutoInsert Tests`, () => {
     beforeAll(async () => {
@@ -72,6 +73,43 @@ describe(`OnAutoInsert Tests`, () => {
             }
         );
     });
+
+    test('Enter inside braces fixes brace lines', async () => {
+        await vscode.window.activeTextEditor!.edit((editBuilder) => {
+            editBuilder.insert(new vscode.Position(11, 15), '\n');
+        });
+
+        // OnAutoInsert is triggered by the change event but completes asynchronously, so wait for the buffer to be updated.
+
+        const expectedLines = [
+            'class DocComments',
+            '{',
+            '    //',
+            '    string M(int param1, string param2)',
+            '    {',
+            '        return null;',
+            '    }',
+            '',
+            '    /// <summary>',
+            '',
+            '    /// </summary>',
+            '    void M2()',
+            '    {',
+            '        ',
+            '    }',
+            '}',
+            '',
+        ];
+
+        await waitForExpectedResult<string | undefined>(
+            async () => vscode.window.activeTextEditor?.document.getText(),
+            10000,
+            100,
+            (input) => {
+                expect(input).toBe(expectedLines.join(EOL));
+            }
+        );
+    });
 });
 
 function normalizeNewlines(text: string | undefined): string | undefined {