diff --git a/docs/release-notes/.VisualStudio/18.vNext.md b/docs/release-notes/.VisualStudio/18.vNext.md index 587f3e8bad0..19bc4c264fb 100644 --- a/docs/release-notes/.VisualStudio/18.vNext.md +++ b/docs/release-notes/.VisualStudio/18.vNext.md @@ -5,3 +5,5 @@ * Find All References for external DLL symbols now only searches projects that reference the specific assembly. ([Issue #10227](https://github.com/dotnet/fsharp/issues/10227), [PR #19252](https://github.com/dotnet/fsharp/pull/19252)) ### Changed + +* Rename "inline hints" to "inlay hints" in VS options for consistency with industry terminology. ([PR #19318](https://github.com/dotnet/fsharp/pull/19318)) diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 62dc457c28d..955b82bf998 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -148,13 +148,13 @@ - - - + + + - + diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx index fac57e8b469..1f1f632d770 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx @@ -222,10 +222,10 @@ Enable fast find references & rename (restart required) 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 diff --git a/vsintegration/src/FSharp.Editor/Hints/FSharpInlineHintsService.fs b/vsintegration/src/FSharp.Editor/Hints/FSharpInlayHintsService.fs similarity index 94% rename from vsintegration/src/FSharp.Editor/Hints/FSharpInlineHintsService.fs rename to vsintegration/src/FSharp.Editor/Hints/FSharpInlayHintsService.fs index acdd0fdc97d..678e903ff99 100644 --- a/vsintegration/src/FSharp.Editor/Hints/FSharpInlineHintsService.fs +++ b/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. [)>] -type internal FSharpInlineHintsService [] (settings: EditorOptions) = +type internal FSharpInlayHintsService [] (settings: EditorOptions) = static let userOpName = "Hints" diff --git a/vsintegration/src/FSharp.Editor/Hints/HintService.fs b/vsintegration/src/FSharp.Editor/Hints/HintService.fs index 1eb4c4fa373..34871bcbb66 100644 --- a/vsintegration/src/FSharp.Editor/Hints/HintService.fs +++ b/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 diff --git a/vsintegration/src/FSharp.Editor/Hints/InlineParameterNameHints.fs b/vsintegration/src/FSharp.Editor/Hints/InlayParameterNameHints.fs similarity index 99% rename from vsintegration/src/FSharp.Editor/Hints/InlineParameterNameHints.fs rename to vsintegration/src/FSharp.Editor/Hints/InlayParameterNameHints.fs index f0712cb8e21..14219a0f2cf 100644 --- a/vsintegration/src/FSharp.Editor/Hints/InlineParameterNameHints.fs +++ b/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 { diff --git a/vsintegration/src/FSharp.Editor/Hints/InlineReturnTypeHints.fs b/vsintegration/src/FSharp.Editor/Hints/InlayReturnTypeHints.fs similarity index 93% rename from vsintegration/src/FSharp.Editor/Hints/InlineReturnTypeHints.fs rename to vsintegration/src/FSharp.Editor/Hints/InlayReturnTypeHints.fs index 1a984df33c7..c7f36eec3a7 100644 --- a/vsintegration/src/FSharp.Editor/Hints/InlineReturnTypeHints.fs +++ b/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 diff --git a/vsintegration/src/FSharp.Editor/Hints/InlineTypeHints.fs b/vsintegration/src/FSharp.Editor/Hints/InlayTypeHints.fs similarity index 96% rename from vsintegration/src/FSharp.Editor/Hints/InlineTypeHints.fs rename to vsintegration/src/FSharp.Editor/Hints/InlayTypeHints.fs index 38c6bda6a2d..c5504ef104a 100644 --- a/vsintegration/src/FSharp.Editor/Hints/InlineTypeHints.fs +++ b/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) = diff --git a/vsintegration/src/FSharp.Editor/Hints/OptionParser.fs b/vsintegration/src/FSharp.Editor/Hints/OptionParser.fs index 437298b35db..78f88dd44de 100644 --- a/vsintegration/src/FSharp.Editor/Hints/OptionParser.fs +++ b/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 ] diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs index 1dfa6fe4517..427baf0c6ab 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs +++ b/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 diff --git a/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs b/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs index efc068386ca..4b0f885e892 100644 --- a/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs +++ b/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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf index de561145762..8ab01796cb1 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf index b1a944907cb..9badb66a732 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf index 378b15d5caa..c99ada98ac9 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf index fca6f0634a1..763bf0fe94e 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf index 76f54d265cc..30633ce2227 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf index 07b7b16c2c7..998948fcc40 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf index 47a4a151aa8..aeda963364b 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf index 650e9143558..74a630c5edb 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf index 30e0090d2ad..c2646cb2d88 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf index 35cab0833cc..6151daf221b 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf index a10f29ad727..14b276fe457 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf index abb77c3f5f4..2093b099a4e 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf index b85e7646ec3..4006a6f5a61 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf @@ -42,10 +42,10 @@ 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 diff --git a/vsintegration/src/FSharp.UIResources/AdvancedOptionsControl.xaml b/vsintegration/src/FSharp.UIResources/AdvancedOptionsControl.xaml index 9ca2756d7d9..219348fa172 100644 --- a/vsintegration/src/FSharp.UIResources/AdvancedOptionsControl.xaml +++ b/vsintegration/src/FSharp.UIResources/AdvancedOptionsControl.xaml @@ -24,14 +24,14 @@ - + - - + - + diff --git a/vsintegration/src/FSharp.UIResources/Strings.Designer.cs b/vsintegration/src/FSharp.UIResources/Strings.Designer.cs index b6087aa8952..e47f10e1045 100644 --- a/vsintegration/src/FSharp.UIResources/Strings.Designer.cs +++ b/vsintegration/src/FSharp.UIResources/Strings.Designer.cs @@ -286,11 +286,11 @@ public static string Generate_Body_For_Overridden_Method { } /// - /// 查找类似 Inline Hints 的本地化字符串。 + /// 查找类似 Inlay Hints 的本地化字符串。 /// - public static string Inline_Hints { + public static string Inlay_Hints { get { - return ResourceManager.GetString("Inline_Hints", resourceCulture); + return ResourceManager.GetString("Inlay_Hints", resourceCulture); } } @@ -448,20 +448,20 @@ public static string Show_guides { } /// - /// 查找类似 Display inline parameter name hints (preview) 的本地化字符串。 + /// 查找类似 Display inlay parameter name hints (preview) 的本地化字符串。 /// - public static string Show_Inline_Parameter_Name_Hints { + public static string Show_Inlay_Parameter_Name_Hints { get { - return ResourceManager.GetString("Show_Inline_Parameter_Name_Hints", resourceCulture); + return ResourceManager.GetString("Show_Inlay_Parameter_Name_Hints", resourceCulture); } } /// - /// 查找类似 Display inline type hints (preview) 的本地化字符串。 + /// 查找类似 Display inlay type hints (preview) 的本地化字符串。 /// - public static string Show_Inline_Type_Hints { + public static string Show_Inlay_Type_Hints { get { - return ResourceManager.GetString("Show_Inline_Type_Hints", resourceCulture); + return ResourceManager.GetString("Show_Inlay_Type_Hints", resourceCulture); } } diff --git a/vsintegration/src/FSharp.UIResources/Strings.resx b/vsintegration/src/FSharp.UIResources/Strings.resx index 00c8cb82360..12e5b87aae8 100644 --- a/vsintegration/src/FSharp.UIResources/Strings.resx +++ b/vsintegration/src/FSharp.UIResources/Strings.resx @@ -177,11 +177,11 @@ Show outlining and collapsible nodes for F# code - - Inline Hints + + Inlay Hints - - Display inline type hints (preview) + + Display inlay type hints (preview) Time until stale results are used (in milliseconds) @@ -228,8 +228,8 @@ Enable parallel reference resolution - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Enable fast find references & rename (experimental) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf index 9d7aae398d5..be4eb3a9aaa 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Vložené nápovědy @@ -142,13 +142,13 @@ Odeslat další telemetrii výkonu - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Zobrazit nápovědy k názvům vložených parametrů (preview) - - Display inline type hints (preview) + + Display inlay type hints (preview) Zobrazovat vložené nápovědy k typům (preview) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf index fc8fa182849..9d59baa4334 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Inlinehinweise @@ -142,13 +142,13 @@ Zusätzliche Leistungstelemetriedaten senden - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Hinweise zu Inlineparameternamen anzeigen (Vorschau) - - Display inline type hints (preview) + + Display inlay type hints (preview) Inlinetyphinweise anzeigen (Vorschau) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf index 2d0d091cfad..9f5de601b9d 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Sugerencias insertadas @@ -142,13 +142,13 @@ Enviar telemetría de rendimiento adicional - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Mostrar sugerencias de nombres de parámetros en línea (vista previa) - - Display inline type hints (preview) + + Display inlay type hints (preview) Mostrar sugerencias de tipo en línea (vista previa) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf index e1f1ecca5c1..902b1cd34ff 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Indicateurs inline @@ -142,13 +142,13 @@ Envoyer une télémétrie de performances supplémentaire - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Afficher les conseils de nom de paramètre en ligne (préversion) - - Display inline type hints (preview) + + Display inlay type hints (preview) Afficher les conseils de type en ligne (aperçu) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf index 816c3395e06..3799e0ce7b0 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Suggerimenti inline @@ -142,13 +142,13 @@ Invia dati di telemetria aggiuntivi per le prestazioni - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Visualizza suggerimenti per i nomi di parametro inline (anteprima) - - Display inline type hints (preview) + + Display inlay type hints (preview) Visualizza suggerimenti di tipo inline (anteprima) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf index 5247c0cc870..51d7a51d42c 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints インラインのヒント @@ -142,13 +142,13 @@ 追加のパフォーマンス テレメトリを送信する - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) インライン パラメーター名のヒントを表示する (プレビュー) - - Display inline type hints (preview) + + Display inlay type hints (preview) インライン型のヒントを表示する (プレビュー) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf index 421c91f4c38..5b24dc01dc3 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints 인라인 힌트 @@ -142,13 +142,13 @@ 추가 성능 원격 분석 보내기 - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) 인라인 매개 변수 이름 힌트 표시(미리 보기) - - Display inline type hints (preview) + + Display inlay type hints (preview) 인라인 형식 힌트 표시(미리 보기) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf index 9e31b9d72e6..12631b75a18 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Wskazówki w tekście @@ -142,13 +142,13 @@ Wysyłanie dodatkowych danych telemetrycznych dotyczących wydajności - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Wyświetl wskazówki w tekście dotyczące nazw parametrów (wersja zapoznawcza) - - Display inline type hints (preview) + + Display inlay type hints (preview) Wyświetl wskazówki w tekście dla typów (wersja zapoznawcza) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf index 28c59366359..16048d74b13 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Dicas Embutidas @@ -142,13 +142,13 @@ Enviar telemetria de desempenho adicional - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Exibir dicas de nome de parâmetro embutido (versão prévia) - - Display inline type hints (preview) + + Display inlay type hints (preview) Exibir dicas de tipo embutido (versão prévia) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf index 143cd4e4bed..52e75e78e71 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Встроенные подсказки @@ -142,13 +142,13 @@ Отправить дополнительные диагностические данные о производительности - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Отображение подсказок для имен встроенных параметров (предварительная версия) - - Display inline type hints (preview) + + Display inlay type hints (preview) Отображение подсказок для встроенных типов (предварительная версия) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf index cf9ba4b6834..9fe8239767a 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints Satır İçi İpuçları @@ -142,13 +142,13 @@ Ek performans telemetrisi gönder - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) Satır içi parametre adı ipuçlarını görüntüle (önizleme) - - Display inline type hints (preview) + + Display inlay type hints (preview) Satır içi tür ipuçlarını görüntüle (önizleme) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf index 2a43ae60eb2..03b14f49731 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints 内联提示 @@ -142,13 +142,13 @@ 发送其他性能遥测 - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) 显示内联参数名称提示(预览版) - - Display inline type hints (preview) + + Display inlay type hints (preview) 显示内联类型提示(预览) diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf index 9b1459d5e43..51e43968b94 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf @@ -57,8 +57,8 @@ Generate default implementation body for overridden method - - Inline Hints + + Inlay Hints 內嵌提示 @@ -142,13 +142,13 @@ 傳送其他效能遙測 - - Display inline parameter name hints (preview) + + Display inlay parameter name hints (preview) 顯示內嵌參數名稱提示 (預覽) - - Display inline type hints (preview) + + Display inlay type hints (preview) 顯示內嵌類型提示 (預覽) diff --git a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj index 284ec6eeb1d..bee3a9bc9e7 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj +++ b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj @@ -75,9 +75,9 @@ - - - + + + diff --git a/vsintegration/tests/FSharp.Editor.Tests/Hints/InlineParameterNameHintTests.fs b/vsintegration/tests/FSharp.Editor.Tests/Hints/InlayParameterNameHintTests.fs similarity index 99% rename from vsintegration/tests/FSharp.Editor.Tests/Hints/InlineParameterNameHintTests.fs rename to vsintegration/tests/FSharp.Editor.Tests/Hints/InlayParameterNameHintTests.fs index 77588978d97..c5f7d858b21 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/Hints/InlineParameterNameHintTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/Hints/InlayParameterNameHintTests.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module FSharp.Editor.Tests.Hints.InlineParameterNameHintTests +module FSharp.Editor.Tests.Hints.InlayParameterNameHintTests open Xunit diff --git a/vsintegration/tests/FSharp.Editor.Tests/Hints/InlineReturnTypeHintTests.fs b/vsintegration/tests/FSharp.Editor.Tests/Hints/InlayReturnTypeHintTests.fs similarity index 98% rename from vsintegration/tests/FSharp.Editor.Tests/Hints/InlineReturnTypeHintTests.fs rename to vsintegration/tests/FSharp.Editor.Tests/Hints/InlayReturnTypeHintTests.fs index 9e55e484f34..8ab9cd53af0 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/Hints/InlineReturnTypeHintTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/Hints/InlayReturnTypeHintTests.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module FSharp.Editor.Tests.Hints.InlineReturnTypeHintTests +module FSharp.Editor.Tests.Hints.InlayReturnTypeHintTests open Xunit diff --git a/vsintegration/tests/FSharp.Editor.Tests/Hints/InlineTypeHintTests.fs b/vsintegration/tests/FSharp.Editor.Tests/Hints/InlayTypeHintTests.fs similarity index 99% rename from vsintegration/tests/FSharp.Editor.Tests/Hints/InlineTypeHintTests.fs rename to vsintegration/tests/FSharp.Editor.Tests/Hints/InlayTypeHintTests.fs index 01c108c7461..910e4c8a9e9 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/Hints/InlineTypeHintTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/Hints/InlayTypeHintTests.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module FSharp.Editor.Tests.Hints.InlineTypeHintTests +module FSharp.Editor.Tests.Hints.InlayTypeHintTests open Xunit open HintTestFramework diff --git a/vsintegration/tests/FSharp.Editor.Tests/Hints/OptionParserTests.fs b/vsintegration/tests/FSharp.Editor.Tests/Hints/OptionParserTests.fs index da3f4cc8d7c..22c334da375 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/Hints/OptionParserTests.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/Hints/OptionParserTests.fs @@ -14,8 +14,8 @@ module OptionParserTests = let ``Type hints off, parameter name hints off`` () = let options = { AdvancedOptions.Default with - IsInlineTypeHintsEnabled = false - IsInlineParameterNameHintsEnabled = false + IsInlayTypeHintsEnabled = false + IsInlayParameterNameHintsEnabled = false } let expected = [] @@ -28,8 +28,8 @@ module OptionParserTests = let ``Type hints on, parameter name hints off`` () = let options = { AdvancedOptions.Default with - IsInlineTypeHintsEnabled = true - IsInlineParameterNameHintsEnabled = false + IsInlayTypeHintsEnabled = true + IsInlayParameterNameHintsEnabled = false } let expected = [ HintKind.TypeHint ] @@ -42,8 +42,8 @@ module OptionParserTests = let ``Type hints off, parameter name hints on`` () = let options = { AdvancedOptions.Default with - IsInlineTypeHintsEnabled = false - IsInlineParameterNameHintsEnabled = true + IsInlayTypeHintsEnabled = false + IsInlayParameterNameHintsEnabled = true } let expected = [ HintKind.ParameterNameHint ] @@ -56,8 +56,8 @@ module OptionParserTests = let ``Type hints on, parameter name hints on`` () = let options = { AdvancedOptions.Default with - IsInlineTypeHintsEnabled = true - IsInlineParameterNameHintsEnabled = true + IsInlayTypeHintsEnabled = true + IsInlayParameterNameHintsEnabled = true } let expected = [ HintKind.TypeHint; HintKind.ParameterNameHint ]