Add Code Action Apex tests based on TS

abonie · Oct 8, 2026 · Jul 12, 2026 · Jul 15, 2026 · Jul 22, 2026 · Jul 23, 2026
commit 2ddb0377e9fa0b12358b9811b408a1984250214f
diff --git a/VisualFSharp.slnx b/VisualFSharp.slnx
@@ -176,6 +176,9 @@
     <Project Path="vsintegration/tests/FSharp.Editor.IntegrationTests/FSharp.Editor.IntegrationTests.csproj">
       <BuildType Solution="Proto|*" Project="Debug" />
     </Project>
+    <Project Path="vsintegration/tests/FSharp.Editor.Apex.IntegrationTests/FSharp.Editor.Apex.IntegrationTests.csproj">
+      <BuildType Solution="Proto|*" Project="Debug" />
+    </Project>
     <Project Path="vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj">
       <BuildType Solution="Proto|*" Project="Debug" />
     </Project>

@@ -130,6 +130,8 @@
     <MicrosoftVisualStudioPlatformVSEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioPlatformVSEditorVersion>
     <MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
     <NuGetVisualStudioVersion>17.14.0</NuGetVisualStudioVersion>
+    <MicrosoftTestApexVisualStudioVersion>18.10.0-preview-1-12005-078</MicrosoftTestApexVisualStudioVersion>
+    <MSTestVersion>3.6.4</MSTestVersion>
     <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
     <MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
 

@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+//
+// Apex counterparts of the xUnit/IdeFact tests in
+// vsintegration/tests/FSharp.Editor.IntegrationTests/CodeActionTests.cs. Each case sets up the same
+// triggering F# source, places the caret where that test does, and verifies the same code/error fix
+// is offered on the light bulb (asserting on the action's display text). The Apex light-bulb model
+// exposes a flat action list, so the CodeFix/ErrorFix category asserted by the source tests is not
+// mirrored here.
+
+using FSharp.Editor.Apex.IntegrationTests.TestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace FSharp.Editor.Apex.IntegrationTests
+{
+    [TestClass]
+    public class CodeActionTests : FSharpLanguageServiceApexTest
+    {
+        protected override bool AutomaticallyDismissMessageBoxes => false;
+
+        [RetryTestMethod]
+        [Timeout(ShortTimeoutMS)]
+        [Description("Verify the 'Remove unused open declarations' code fix is offered on an unused open.")]
+        [Owner("fsharptools")]
+        [TestCategory("nightly"), TestCategory("Walkthrough")]
+        public void UnusedOpenDeclarations()
+        {
+            var code = @"module Library
+
+open System
+
+let x = 42";
+
+            this.AssertCodeActionOffered(code, "open System", "Remove unused open declarations");
+        }
+
+        [RetryTestMethod]
+        [Timeout(ShortTimeoutMS)]
+        [Description("Verify the 'Add missing 'fun' keyword' error fix is offered on a lambda missing 'fun'.")]
+        [Owner("fsharptools")]
+        [TestCategory("nightly"), TestCategory("Walkthrough")]
+        public void AddMissingFunKeyword()
+        {
+            var code = @"module Library
+
+let original = []
+let transformed = original |> List.map (x -> x)";
+
+            this.AssertCodeActionOffered(code, "->", "Add missing 'fun' keyword");
+        }
+
+        [RetryTestMethod]
+        [Timeout(ShortTimeoutMS)]
+        [Description("Verify the 'Add 'new' keyword' code fix is offered when constructing a disposable.")]
+        [Owner("fsharptools")]
+        [TestCategory("nightly"), TestCategory("Walkthrough")]
+        public void AddNewKeywordToDisposables()
+        {
+            var code = @"module Library
+
+let sr = System.IO.StreamReader("""")";
+
+            this.AssertCodeActionOffered(code, "let sr", "Add 'new' keyword");
+        }
+    }
+}
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+//
+// Ported verbatim from the TypeScript-VS repository
+// (VS/LanguageService/Tests/Integration/CodeFixes/SuggestionCodeFix.cs) and then adjusted so that
+// the setup is tailored for the F# extension. A single test case is kept, exercising an F# code fix
+// (Wrap expression in parentheses, FS0597). The triggering code is taken from the F# code-fix unit
+// tests: vsintegration/tests/FSharp.Editor.Tests/CodeFixes/WrapExpressionInParenthesesTests.fs.
+
+using System;
+using System.Linq;
+using FSharp.Editor.Apex.IntegrationTests.TestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace FSharp.Editor.Apex.IntegrationTests
+{
+    [TestClass]
+    public class SuggestionCodeFix : FSharpLanguageServiceApexTest
+    {
+        #region Private members
+        protected override bool AutomaticallyDismissMessageBoxes => false;
+        private const string code = @"module Library
+
+let rng = System.Random()
+
+printfn ""Hello %d"" rng.Next(5)";
+        private const string expectedCode = @"module Library
+
+let rng = System.Random()
+
+printfn ""Hello %d"" (rng.Next(5))";
+        #endregion
+
+        [RetryTestMethod]
+        [Timeout(ShortTimeoutMS)]
+        [Description("Verify code-fix offers suggestion to wrap an expression in parentheses in an F# file.")]
+        [Owner("fsharptools")]
+        [TestCategory("nightly"), TestCategory("Walkthrough")]
+        public void SuggestionCodeFixInFSharpFile()
+        {
+            var document = this.OpenFSharpDocument(code, "rng.Next");
+
+            this.InvokeCodeFix(document, "rng.Next");
+            this.Library.Synchronization.WaitForSolutionCrawler();
+
+            this.Library.Synchronization.WaitFor(() => expectedCode == document.Contents, TimeSpan.FromSeconds(15));
+        }
+
+        #region Helps
+        public void InvokeCodeFix(TextDocumentView document, string expression)
+        {
+            var lightBulb = this.MoveToExpressionAndExpandLightBulb(document, expression);
+            var globalScopeAction = lightBulb.Actions.Single(action =>
+                action.Text.IndexOf("Wrap", StringComparison.OrdinalIgnoreCase) >= 0
+            );
+
+            globalScopeAction.Invoke();
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!--
+    Apex-based VS integration tests for the F# editor, ported from the TypeScript-VS repo.
+    These run out-of-process, driving a real Visual Studio instance via the Apex UI automation
+    framework (Microsoft.Test.Apex.VisualStudio) and MSTest, independently of the xUnit/IdeFact
+    integration tests in FSharp.Editor.IntegrationTests.
+  -->
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <LangVersion>preview</LangVersion>
+    <Nullable>disable</Nullable>
+    <OutputType>Library</OutputType>
+    <IsPackable>false</IsPackable>
+    <!-- Apex tests use MSTest, not the repo default xUnit3/MTP runner. -->
+    <ExcludeFromTestPackageReferences>true</ExcludeFromTestPackageReferences>
+    <NoWarn>$(NoWarn);CS1591;VSTHRD200</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- System.Web.Script.Serialization.JavaScriptSerializer, used to parse vswhere JSON output. -->
+    <Reference Include="System.Web.Extensions" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Test.Apex.VisualStudio" Version="$(MicrosoftTestApexVisualStudioVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
+    <!--
+      Resolves MSB3277: Microsoft.Test.Apex.VisualStudio references System.Diagnostics.DiagnosticSource
+      10.0.0.8, but the only copy in the package graph is 5.0.0 (pulled transitively via
+      MSTest -> Testing.Extensions.Telemetry -> ApplicationInsights). RAR cannot unify to a version
+      that is not present, so no binding redirect is generated and testhost would ship only v5.
+      Referencing 10.0.8 (assembly 10.0.0.8, matching Apex) makes it primary: the conflict is genuinely
+      resolved, a 5->10 redirect is generated, and the correct assembly is deployed. Version is pinned
+      explicitly (not the repo's 10.0.2) because it must match Apex's required 10.0.0.8.
+    -->
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.8" />
+  </ItemGroup>
+
+</Project>