diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Common/Resources/Strings.Designer.fs b/ReSharper.FSharp/src/FSharp/FSharp.Common/Resources/Strings.Designer.fs index b78d92e2bb..f6501e2548 100644 --- a/ReSharper.FSharp/src/FSharp/FSharp.Common/Resources/Strings.Designer.fs +++ b/ReSharper.FSharp/src/FSharp/FSharp.Common/Resources/Strings.Designer.fs @@ -42,5 +42,5 @@ type public Strings() = static member FSharpTypeHints_LocalBindings_Description = Strings.ResourceManager.GetString("FSharpTypeHints_LocalBindings_Description") static member FSharpTypeHints_ShowPipeReturnTypes_Description = Strings.ResourceManager.GetString("FSharpTypeHints_ShowPipeReturnTypes_Description") static member FSharpTypeHints_HideSameLinePipe_Description = Strings.ResourceManager.GetString("FSharpTypeHints_HideSameLinePipe_Description") - static member FSharpTypeHints_MatchClauses_Description = Strings.ResourceManager.GetString("FSharpTypeHints_MatchClauses_Description") - static member FSharpTypeHints_MatchClausesSettings_Header = Strings.ResourceManager.GetString("FSharpTypeHints_MatchClausesSettings_Header") \ No newline at end of file + static member FSharpTypeHints_MatchPatterns_Description = Strings.ResourceManager.GetString("FSharpTypeHints_MatchPatterns_Description") + static member FSharpTypeHints_MatchPatternsSettings_Header = Strings.ResourceManager.GetString("FSharpTypeHints_MatchPatternsSettings_Header") \ No newline at end of file diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Common/Resources/Strings.resx b/ReSharper.FSharp/src/FSharp/FSharp.Common/Resources/Strings.resx index 39b9d10a2e..5e7867ab25 100644 --- a/ReSharper.FSharp/src/FSharp/FSharp.Common/Resources/Strings.resx +++ b/ReSharper.FSharp/src/FSharp/FSharp.Common/Resources/Strings.resx @@ -28,10 +28,10 @@ Hide when |> is on same line as argument - - Type hints for match clauses + + Type hints for match patterns - - Match clauses + + Match patterns diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Common/src/Settings/FSharpOptions.fs b/ReSharper.FSharp/src/FSharp/FSharp.Common/src/Settings/FSharpOptions.fs index 4e25a59364..2054248e0b 100644 --- a/ReSharper.FSharp/src/FSharp/FSharp.Common/src/Settings/FSharpOptions.fs +++ b/ReSharper.FSharp/src/FSharp/FSharp.Common/src/Settings/FSharpOptions.fs @@ -197,8 +197,8 @@ type FSharpTypeHintOptions = [, - DescriptionResourceName = nameof(Strings.FSharpTypeHints_MatchClauses_Description))>] - mutable ShowTypeHintsForMatchClauses: PushToHintMode } + DescriptionResourceName = nameof(Strings.FSharpTypeHints_MatchPatterns_Description))>] + mutable ShowTypeHintsForMatchPatterns: PushToHintMode } [)>] diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/Resources/Strings.Designer.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/Resources/Strings.Designer.fs index 173f73accf..b45bcf896b 100644 --- a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/Resources/Strings.Designer.fs +++ b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/Resources/Strings.Designer.fs @@ -49,4 +49,4 @@ type public Strings() = static member FSharpTypeHints_ShowPipeReturnTypes_Description = Strings.ResourceManager.GetString("FSharpTypeHints_ShowPipeReturnTypes_Description") static member FSharpTypeHints_HideSameLinePipe_Description = Strings.ResourceManager.GetString("FSharpTypeHints_HideSameLinePipe_Description") static member FSharpTypeHints_PipesSettings_Header = Strings.ResourceManager.GetString("FSharpTypeHints_PipesSettings_Header") - static member FSharpTypeHints_MatchClausesSettings_Header = Strings.ResourceManager.GetString("FSharpTypeHints_MatchClausesSettings_Header") \ No newline at end of file + static member FSharpTypeHints_MatchPatternsSettings_Header = Strings.ResourceManager.GetString("FSharpTypeHints_MatchPatternsSettings_Header") \ No newline at end of file diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/Resources/Strings.resx b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/Resources/Strings.resx index 94db25152a..cb6b1fca3c 100644 --- a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/Resources/Strings.resx +++ b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/Resources/Strings.resx @@ -49,7 +49,7 @@ Pipe operators - - Match clauses + + Match patterns diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Highlightings/FSharpTypeHintBulbActionsProvider.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Highlightings/FSharpTypeHintBulbActionsProvider.fs index 33616f039f..bd2058f7c3 100644 --- a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Highlightings/FSharpTypeHintBulbActionsProvider.fs +++ b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Highlightings/FSharpTypeHintBulbActionsProvider.fs @@ -39,5 +39,5 @@ type FSharpLocalBindingTypeHintBulbActionsProvider private () = static member val Instance = FSharpLocalBindingTypeHintBulbActionsProvider() type FSharpMatchClauseTypeHintBulbActionsProvider private () = - inherit FSharpTypeHintBulbActionsProvider((fun x -> x.ShowTypeHintsForMatchClauses), Strings.FSharpTypeHints_MatchClausesSettings_Header) + inherit FSharpTypeHintBulbActionsProvider((fun x -> x.ShowTypeHintsForMatchPatterns), Strings.FSharpTypeHints_MatchPatternsSettings_Header) static member val Instance = FSharpMatchClauseTypeHintBulbActionsProvider() diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Options/FSharpTypeHintOptionsPage.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Options/FSharpTypeHintOptionsPage.fs index aa8235e45d..fc3c3bf22a 100644 --- a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Options/FSharpTypeHintOptionsPage.fs +++ b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Options/FSharpTypeHintOptionsPage.fs @@ -43,8 +43,8 @@ type FSharpTypeHintsOptionsPage(lifetime: Lifetime, optionsPageContext: OptionsP this.AddHeader(Strings.FSharpTypeHints_LocalBindingsSettings_Header) |> ignore this.AddVisibilityOption(fun (s: FSharpTypeHintOptions) -> s.ShowTypeHintsForLocalBindings) - this.AddHeader(Strings.FSharpTypeHints_MatchClausesSettings_Header) |> ignore - this.AddVisibilityOption(fun (s: FSharpTypeHintOptions) -> s.ShowTypeHintsForMatchClauses) + this.AddHeader(Strings.FSharpTypeHints_MatchPatternsSettings_Header) |> ignore + this.AddVisibilityOption(fun (s: FSharpTypeHintOptions) -> s.ShowTypeHintsForMatchPatterns) this.AddHeader(Strings.FSharpTypeHints_PipesSettings_Header) |> ignore diff --git a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/PatternTypeHintsStage.fs b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/PatternTypeHintsStage.fs index 8f360b6fc3..59e5b59691 100644 --- a/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/PatternTypeHintsStage.fs +++ b/ReSharper.FSharp/src/FSharp/FSharp.Psi.Daemon/src/Stages/PatternTypeHintsStage.fs @@ -20,32 +20,32 @@ open JetBrains.TextControl.DocumentMarkup.Adornments.IntraTextAdornments type private NodesRequiringHints = { TopLevelNodes: List LocalNodes: List - MatchClauses: List } + MatchNodes: List } type private FSharpTypeHintSettings = { TopLevelMembers: PushToHintMode LocalBindings: PushToHintMode - MatchClauses: PushToHintMode } with + MatchPatterns: PushToHintMode } with static member Create(settingsStore: IContextBoundSettingsStore) = { TopLevelMembers = settingsStore.GetValue(fun (key: FSharpTypeHintOptions) -> key.ShowTypeHintsForTopLevelMembers) .EnsureInlayHintsDefault(settingsStore) LocalBindings = settingsStore.GetValue(fun (key: FSharpTypeHintOptions) -> key.ShowTypeHintsForLocalBindings) .EnsureInlayHintsDefault(settingsStore) - MatchClauses = settingsStore.GetValue(fun (key: FSharpTypeHintOptions) -> key.ShowTypeHintsForMatchClauses) - .EnsureInlayHintsDefault(settingsStore)} + MatchPatterns = settingsStore.GetValue(fun (key: FSharpTypeHintOptions) -> key.ShowTypeHintsForMatchPatterns) + .EnsureInlayHintsDefault(settingsStore)} member x.IsDisabled = x.TopLevelMembers = PushToHintMode.Never && x.LocalBindings = PushToHintMode.Never && - x.MatchClauses = PushToHintMode.Never + x.MatchPatterns = PushToHintMode.Never type private MembersVisitor(settings) = inherit TreeNodeVisitor() let disabledForTopBindings = settings.TopLevelMembers = PushToHintMode.Never let disabledForLocalBindings = settings.LocalBindings = PushToHintMode.Never - let disabledForMatchClauses = settings.MatchClauses = PushToHintMode.Never + let disabledForMatchPatterns = settings.MatchPatterns = PushToHintMode.Never let isTopLevelMember (node: ITreeNode) = match node with @@ -62,7 +62,7 @@ type private MembersVisitor(settings) = | _ -> false override x.VisitNode(node, context) = - if disabledForLocalBindings && disabledForMatchClauses && isTopLevelMember node then () else + if disabledForLocalBindings && disabledForMatchPatterns && isTopLevelMember node then () else for child in node.Children() do if disabledForTopBindings && isTopLevelMember child || disabledForLocalBindings && isLocalBinding child @@ -115,9 +115,9 @@ type private MembersVisitor(settings) = x.VisitNode(forEachExpr, context) override x.VisitMatchClause(matchClause, context) = - if not disabledForMatchClauses then + if not disabledForMatchPatterns then let result = collectTypeHintAnchorsForMatchClause matchClause - context.MatchClauses.AddRange(result) + context.MatchNodes.AddRange(result) x.VisitNode(matchClause, context) @@ -225,17 +225,17 @@ type private PatternsHighlightingProcess(fsFile, settingsStore: IContextBoundSet adornNodes topLevelNodes settings.TopLevelMembers FSharpTopLevelMembersTypeHintBulbActionsProvider.Instance adornNodes localNodes settings.LocalBindings FSharpLocalBindingTypeHintBulbActionsProvider.Instance - adornNodes matchClauses settings.MatchClauses FSharpMatchClauseTypeHintBulbActionsProvider.Instance + adornNodes matchClauses settings.MatchPatterns FSharpMatchClauseTypeHintBulbActionsProvider.Instance highlightingConsumer.CollectHighlightings() override x.Execute(committer) = - let consumer = { TopLevelNodes = List(); LocalNodes = List(); MatchClauses = List() } + let consumer = { TopLevelNodes = List(); LocalNodes = List(); MatchNodes = List() } fsFile.Accept(MembersVisitor(settings), consumer) let topLevelNodes = consumer.TopLevelNodes |> Array.ofSeq let localNodes = consumer.LocalNodes |> Array.ofSeq - let matchClauses = consumer.MatchClauses |> Array.ofSeq + let matchClauses = consumer.MatchNodes |> Array.ofSeq // Visible range may be larger than document range by 1 char // Intersect them to ensure commit doesn't throw diff --git a/ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/Daemon/TypeHintStageTest.fs b/ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/Daemon/TypeHintStageTest.fs index 0e6a73c8b9..5becd73c81 100644 --- a/ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/Daemon/TypeHintStageTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/Daemon/TypeHintStageTest.fs @@ -12,7 +12,7 @@ open NUnit.Framework [)>] [, "ShowTypeHintsForTopLevelMembers", PushToHintMode.Always)>] [, "ShowTypeHintsForLocalBindings", PushToHintMode.Always)>] -[, "ShowTypeHintsForMatchClauses", PushToHintMode.Always)>] +[, "ShowTypeHintsForMatchPatterns", PushToHintMode.Always)>] type TypeHintStageTest() = inherit FSharpHighlightingTestBase() @@ -22,11 +22,11 @@ type TypeHintStageTest() = [] member x.``Signatures - Show all 01``() = x.DoPatternsCommonTest() [, "ShowTypeHintsForLocalBindings", PushToHintMode.Never)>] - [, "ShowTypeHintsForMatchClauses", PushToHintMode.Never)>] + [, "ShowTypeHintsForMatchPatterns", PushToHintMode.Never)>] [] member x.``Signatures - Top level 01``() = x.DoPatternsCommonTest() [, "ShowTypeHintsForTopLevelMembers", PushToHintMode.Never)>] - [, "ShowTypeHintsForMatchClauses", PushToHintMode.Never)>] + [, "ShowTypeHintsForMatchPatterns", PushToHintMode.Never)>] [] member x.``Signatures - Locals 01``() = x.DoPatternsCommonTest() [, "ShowTypeHintsForTopLevelMembers", PushToHintMode.Never)>] @@ -39,7 +39,7 @@ type TypeHintStageTest() = [, "DefaultMode", PushToHintMode.Never)>] [, "ShowTypeHintsForTopLevelMembers", PushToHintMode.Default)>] [, "ShowTypeHintsForLocalBindings", PushToHintMode.Default)>] - [, "ShowTypeHintsForMatchClauses", PushToHintMode.Default)>] + [, "ShowTypeHintsForMatchPatterns", PushToHintMode.Default)>] [] member x.``Disabled 02 - By mode``() = x.DoPatternsCommonTest() [] member x.``Signatures - Unfinished declarations 01``() = x.DoNamedTest()