Add integration tests for organize import on format

Author: JoeRobich

test/lsptoolshost/integrationTests/formatting.integration.test.ts

@@ -21,10 +21,12 @@ describe(`Formatting Tests`, () => {
     });
 
     beforeEach(async () => {
+        await setOrganizeImportsOnFormat(undefined);
         await openFileInWorkspaceAsync(path.join('src', 'app', 'Formatting.cs'));
     });
 
     afterAll(async () => {
+        await setOrganizeImportsOnFormat(undefined);
         await testAssetWorkspace.cleanupWorkspace();
     });
 
@@ -36,6 +38,8 @@ describe(`Formatting Tests`, () => {
         await formatDocumentAsync();
 
         const expectedText = [
+            'using Options;',
+            'using System;',
             'namespace Formatting;',
             'class DocumentFormatting',
             '{',
@@ -54,9 +58,11 @@ describe(`Formatting Tests`, () => {
     });
 
     test('Document range formatting formats only the range', async () => {
-        await formatRangeAsync(new vscode.Range(3, 0, 5, 0));
+        await formatRangeAsync(new vscode.Range(5, 0, 7, 0));
 
         const expectedText = [
+            'using Options;',
+            'using System;',
             'namespace Formatting;',
             'class DocumentFormatting',
             '{',
@@ -75,9 +81,11 @@ describe(`Formatting Tests`, () => {
 
     test('Document on type formatting formats the typed location', async () => {
         // The server expects the position to be the position after the inserted character `;`
-        await formatOnTypeAsync(new vscode.Position(7, 37), ';');
+        await formatOnTypeAsync(new vscode.Position(9, 37), ';');
 
         const expectedText = [
+            'using Options;',
+            'using System;',
             'namespace Formatting;',
             'class DocumentFormatting',
             '{',
@@ -91,4 +99,60 @@ describe(`Formatting Tests`, () => {
         ];
         await expectText(vscode.window.activeTextEditor!.document, expectedText);
     });
+
+    test('Document formatting can organize imports', async () => {
+        await setOrganizeImportsOnFormat(true);
+        await activateCSharpExtension();
+
+        await formatDocumentAsync();
+
+        const expectedText = [
+            'using System;',
+            'using Options;',
+            'namespace Formatting;',
+            'class DocumentFormatting',
+            '{',
+            '    public int Property1',
+            '    {',
+            '        get; set;',
+            '    }',
+            '',
+            '    public void Method1()',
+            '    {',
+            '        System.Console.Write("");',
+            '    }',
+            '}',
+        ];
+        await expectText(vscode.window.activeTextEditor!.document, expectedText);
+    });
+
+    test('Document range formatting does not organize imports', async () => {
+        await setOrganizeImportsOnFormat(true);
+        await activateCSharpExtension();
+
+        await formatRangeAsync(new vscode.Range(0, 0, 7, 0));
+
+        const expectedText = [
+            'using Options;',
+            'using System;',
+            'namespace Formatting;',
+            'class DocumentFormatting',
+            '{',
+            '    public int Property1',
+            '    {',
+            '        get; set;',
+            '    }',
+            '',
+            '    public void Method1() {',
+            '            System.Console.Write("");',
+            '    }',
+            '}',
+        ];
+        await expectText(vscode.window.activeTextEditor!.document, expectedText);
+    });
+
+    async function setOrganizeImportsOnFormat(value: boolean | undefined) {
+        const dotnetConfig = vscode.workspace.getConfiguration('dotnet');
+        await dotnetConfig.update('formatting.organizeImportsOnFormat', value, true);
+    }
 });

test/lsptoolshost/integrationTests/testAssets/slnWithCsproj/src/app/Formatting.cs

@@ -1,3 +1,5 @@
+using Options;
+using System;
 namespace Formatting;
 class DocumentFormatting
 {