Rename "inline hints" to "inlay hints"

docs/release-notes/.VisualStudio/18.vNext.md

@@ -1,3 +1,5 @@
 ### Fixed
 
 ### Changed
+
+* Rename "inline hints" to "inlay hints" in VS options for consistency with industry terminology. ([PR #19318](https://github.com/dotnet/fsharp/pull/19318))

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

@@ -147,13 +147,13 @@
     <Compile Include="AutomaticCompletion\BraceCompletionSessionProvider.fsi" />
     <Compile Include="AutomaticCompletion\BraceCompletionSessionProvider.fs" />
     <Compile Include="Hints\Hints.fs" />
-    <Compile Include="Hints\InlineTypeHints.fs" />
-    <Compile Include="hints\InlineReturnTypeHints.fs" />
-    <Compile Include="Hints\InlineParameterNameHints.fs" />
+    <Compile Include="Hints\InlayTypeHints.fs" />
+    <Compile Include="Hints\InlayReturnTypeHints.fs" />
+    <Compile Include="Hints\InlayParameterNameHints.fs" />
     <Compile Include="Hints\HintService.fs" />
     <Compile Include="Hints\NativeToRoslynHintConverter.fs" />
     <Compile Include="Hints\OptionParser.fs" />
-    <Compile Include="Hints\FSharpInlineHintsService.fs" />
+    <Compile Include="Hints\FSharpInlayHintsService.fs" />
   </ItemGroup>
 
   <ItemGroup>

vsintegration/src/FSharp.Editor/FSharp.Editor.resx

@@ -222,10 +222,10 @@ Enable fast find references &amp; rename (restart required)</value>
 Show structure guidelines for F# code;
 Outlining;
 Show outlining and collapsible nodes for F# code;
-Inline hints;
-Display inline type hints (preview);
+Inlay hints;
+Display inlay type hints (preview);
 Display return type hints (preview);
-Display inline parameter name hints (preview);
+Display inlay parameter name hints (preview);
 Use Transparent Compiler (experimental);
 Live Buffers;
 Use live (unsaved) buffers for analysis</value>

vsintegration/src/FSharp.Editor/Hints/FSharpInlineHintsService.fs → vsintegration/src/FSharp.Editor/Hints/FSharpInlayHintsService.fs

@@ -12,11 +12,11 @@ open System.Threading.Tasks
 
 // So the Roslyn interface is called IFSharpInlineHintsService
 // but our implementation is called just HintsService.
-// That's because we'll likely use this API for things other than inline hints,
+// That's because we'll likely use this API for things other than inlay hints,
 // e.g. signature hints above the line, pipeline hints on the side and so on.
 
 [<Export(typeof<IFSharpInlineHintsService>)>]
-type internal FSharpInlineHintsService [<ImportingConstructor>] (settings: EditorOptions) =
+type internal FSharpInlayHintsService [<ImportingConstructor>] (settings: EditorOptions) =
 
     static let userOpName = "Hints"
 

vsintegration/src/FSharp.Editor/Hints/HintService.fs

@@ -22,15 +22,15 @@ module HintService =
         let getHintsPerKind hintKind =
             match hintKind, symbol with
             | HintKind.TypeHint, (:? FSharpMemberOrFunctionOrValue as symbol) ->
-                symbolUses |> Seq.collect (InlineTypeHints(parseResults, symbol)).GetHints
+                symbolUses |> Seq.collect (InlayTypeHints(parseResults, symbol)).GetHints
             | HintKind.ReturnTypeHint, (:? FSharpMemberOrFunctionOrValue as symbol) ->
-                symbolUses |> Seq.collect (InlineReturnTypeHints(parseResults, symbol).GetHints)
+                symbolUses |> Seq.collect (InlayReturnTypeHints(parseResults, symbol).GetHints)
             | HintKind.ParameterNameHint, (:? FSharpMemberOrFunctionOrValue as symbol) ->
                 symbolUses
-                |> Seq.collect (InlineParameterNameHints(parseResults).GetHintsForMemberOrFunctionOrValue sourceText symbol)
+                |> Seq.collect (InlayParameterNameHints(parseResults).GetHintsForMemberOrFunctionOrValue sourceText symbol)
             | HintKind.ParameterNameHint, (:? FSharpUnionCase as symbol) ->
                 symbolUses
-                |> Seq.collect (InlineParameterNameHints(parseResults).GetHintsForUnionCase sourceText symbol)
+                |> Seq.collect (InlayParameterNameHints(parseResults).GetHintsForUnionCase sourceText symbol)
             | _ -> []
 
         hintKinds |> Set.toList |> List.map getHintsPerKind

vsintegration/src/FSharp.Editor/Hints/InlineParameterNameHints.fs → vsintegration/src/FSharp.Editor/Hints/InlayParameterNameHints.fs

@@ -11,7 +11,7 @@ open FSharp.Compiler.Text
 open Hints
 open CancellableTasks
 
-type InlineParameterNameHints(parseResults: FSharpParseFileResults) =
+type InlayParameterNameHints(parseResults: FSharpParseFileResults) =
 
     let getTooltip (symbol: FSharpSymbol) _ =
         cancellableTask {

vsintegration/src/FSharp.Editor/Hints/InlineReturnTypeHints.fs → vsintegration/src/FSharp.Editor/Hints/InlayReturnTypeHints.fs

@@ -9,7 +9,7 @@ open FSharp.Compiler.Text
 open Hints
 open CancellableTasks
 
-type InlineReturnTypeHints(parseFileResults: FSharpParseFileResults, symbol: FSharpMemberOrFunctionOrValue) =
+type InlayReturnTypeHints(parseFileResults: FSharpParseFileResults, symbol: FSharpMemberOrFunctionOrValue) =
 
     let getHintParts (symbolUse: FSharpSymbolUse) =
         symbol.GetReturnTypeLayout symbolUse.DisplayContext

vsintegration/src/FSharp.Editor/Hints/InlineTypeHints.fs → vsintegration/src/FSharp.Editor/Hints/InlayTypeHints.fs

@@ -10,7 +10,7 @@ open FSharp.Compiler.Text.Position
 open Hints
 open CancellableTasks
 
-type InlineTypeHints(parseResults: FSharpParseFileResults, symbol: FSharpMemberOrFunctionOrValue) =
+type InlayTypeHints(parseResults: FSharpParseFileResults, symbol: FSharpMemberOrFunctionOrValue) =
 
     let getHintParts (symbol: FSharpMemberOrFunctionOrValue) (symbolUse: FSharpSymbolUse) =
 

vsintegration/src/FSharp.Editor/Hints/OptionParser.fs

@@ -10,12 +10,12 @@ module OptionParser =
     let inline getHintKinds options =
         Set
             [
-                if options.IsInlineTypeHintsEnabled then
+                if options.IsInlayTypeHintsEnabled then
                     HintKind.TypeHint
 
-                if options.IsInlineParameterNameHintsEnabled then
+                if options.IsInlayParameterNameHintsEnabled then
                     HintKind.ParameterNameHint
 
-                if options.IsInlineReturnTypeHintsEnabled then
+                if options.IsInlayReturnTypeHintsEnabled then
                     HintKind.ReturnTypeHint
             ]

vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs

@@ -101,13 +101,13 @@ type internal FSharpWorkspaceServiceFactory
     let enableFastFindReferences =
         editorOptions.LanguageServicePerformance.EnableFastFindReferencesAndRename
 
-    let isInlineParameterNameHintsEnabled =
-        editorOptions.Advanced.IsInlineParameterNameHintsEnabled
+    let isInlayParameterNameHintsEnabled =
+        editorOptions.Advanced.IsInlayParameterNameHintsEnabled
 
-    let isInlineTypeHintsEnabled = editorOptions.Advanced.IsInlineTypeHintsEnabled
+    let isInlayTypeHintsEnabled = editorOptions.Advanced.IsInlayTypeHintsEnabled
 
-    let isInlineReturnTypeHintsEnabled =
-        editorOptions.Advanced.IsInlineReturnTypeHintsEnabled
+    let isInlayReturnTypeHintsEnabled =
+        editorOptions.Advanced.IsInlayReturnTypeHintsEnabled
 
     let enablePartialTypeChecking =
         editorOptions.LanguageServicePerformance.EnablePartialTypeChecking
@@ -139,9 +139,9 @@ type internal FSharpWorkspaceServiceFactory
                     nameof enableParallelReferenceResolution, enableParallelReferenceResolution
                     nameof enableInMemoryCrossProjectReferences, enableInMemoryCrossProjectReferences
                     nameof enableFastFindReferences, enableFastFindReferences
-                    nameof isInlineParameterNameHintsEnabled, isInlineParameterNameHintsEnabled
-                    nameof isInlineTypeHintsEnabled, isInlineTypeHintsEnabled
-                    nameof isInlineReturnTypeHintsEnabled, isInlineReturnTypeHintsEnabled
+                    nameof isInlayParameterNameHintsEnabled, isInlayParameterNameHintsEnabled
+                    nameof isInlayTypeHintsEnabled, isInlayTypeHintsEnabled
+                    nameof isInlayReturnTypeHintsEnabled, isInlayReturnTypeHintsEnabled
                     nameof enablePartialTypeChecking, enablePartialTypeChecking
                     nameof keepAllBackgroundResolutions, keepAllBackgroundResolutions
                     nameof keepAllBackgroundSymbolUses, keepAllBackgroundSymbolUses

vsintegration/src/FSharp.Editor/Options/EditorOptions.fs

@@ -115,9 +115,9 @@ type AdvancedOptions =
     {
         IsBlockStructureEnabled: bool
         IsOutliningEnabled: bool
-        IsInlineTypeHintsEnabled: bool
-        IsInlineParameterNameHintsEnabled: bool
-        IsInlineReturnTypeHintsEnabled: bool
+        IsInlayTypeHintsEnabled: bool
+        IsInlayParameterNameHintsEnabled: bool
+        IsInlayReturnTypeHintsEnabled: bool
         IsUseLiveBuffersEnabled: bool
         UseTransparentCompiler: bool
         TransparentCompilerSnapshotReuse: bool
@@ -129,9 +129,9 @@ type AdvancedOptions =
         {
             IsBlockStructureEnabled = true
             IsOutliningEnabled = true
-            IsInlineTypeHintsEnabled = false
-            IsInlineParameterNameHintsEnabled = false
-            IsInlineReturnTypeHintsEnabled = false
+            IsInlayTypeHintsEnabled = false
+            IsInlayParameterNameHintsEnabled = false
+            IsInlayReturnTypeHintsEnabled = false
             UseTransparentCompiler = false
             TransparentCompilerSnapshotReuse = false
             IsUseLiveBuffersEnabled = true

vsintegration/src/FSharp.UIResources/AdvancedOptionsControl.xaml

@@ -24,14 +24,14 @@
                     <CheckBox x:Name="toggleOutlining" IsChecked="{Binding IsOutliningEnabled}"
                               Content="{x:Static local:Strings.Show_Outlining}"/>
                 </GroupBox>
-                <GroupBox Header="{x:Static local:Strings.Inline_Hints}">
+                <GroupBox Header="{x:Static local:Strings.Inlay_Hints}">
                     <StackPanel>
-                        <CheckBox x:Name="toggleInlineTypeHints" IsChecked="{Binding IsInlineTypeHintsEnabled}"
-                                  Content="{x:Static local:Strings.Show_Inline_Type_Hints}"/>
-                        <CheckBox x:Name="toggleReturnTypeHints" IsChecked="{Binding IsInlineReturnTypeHintsEnabled}"
+                        <CheckBox x:Name="toggleInlayTypeHints" IsChecked="{Binding IsInlayTypeHintsEnabled}"
+                                  Content="{x:Static local:Strings.Show_Inlay_Type_Hints}"/>
+                        <CheckBox x:Name="toggleReturnTypeHints" IsChecked="{Binding IsInlayReturnTypeHintsEnabled}"
                                   Content="{x:Static local:Strings.Show_Return_Type_Hints}"/>
-                        <CheckBox x:Name="toggleParameterNameHints" IsChecked="{Binding IsInlineParameterNameHintsEnabled}"
-                                  Content="{x:Static local:Strings.Show_Inline_Parameter_Name_Hints}"/>
+                        <CheckBox x:Name="toggleParameterNameHints" IsChecked="{Binding IsInlayParameterNameHintsEnabled}"
+                                  Content="{x:Static local:Strings.Show_Inlay_Parameter_Name_Hints}"/>
                     </StackPanel>
                 </GroupBox>
                 <GroupBox Header="{x:Static local:Strings.LiveBuffers}">