From e2d638e5c939b736366d4dda91c89e5601a54e6f Mon Sep 17 00:00:00 2001 From: dawe Date: Wed, 5 Jul 2023 14:11:36 +0200 Subject: [PATCH 1/2] Use WRAP_LIMIT to limit the width of tooltip signatures --- .../src/QuickDoc/FSharpQuickDocProvider.fs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ReSharper.FSharp/src/FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs b/ReSharper.FSharp/src/FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs index 0898aa7808..79e4fadc29 100644 --- a/ReSharper.FSharp/src/FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs +++ b/ReSharper.FSharp/src/FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs @@ -3,12 +3,14 @@ module JetBrains.ReSharper.Plugins.FSharp.Psi.Daemon.QuickDoc open FSharp.Compiler.EditorServices open FSharp.Compiler.Tokenization open JetBrains.Application.DataContext +open JetBrains.Application.Settings open JetBrains.DocumentModel.DataContext open JetBrains.ReSharper.Daemon open JetBrains.ReSharper.Feature.Services.QuickDoc open JetBrains.ReSharper.Plugins.FSharp.Psi open JetBrains.ReSharper.Plugins.FSharp.Psi.Features open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree +open JetBrains.ReSharper.Plugins.FSharp.Services.Formatter open JetBrains.ReSharper.Plugins.FSharp.Util.FcsTaggedText open JetBrains.ReSharper.Psi.DataContext open JetBrains.ReSharper.Psi.Files @@ -31,7 +33,11 @@ module FSharpQuickDoc = // todo: provide tooltip for #r strings in fsx, should pass String tag let line = int coords.Line + 1 let column = int coords.Column - Some(results.CheckResults.GetToolTip(line, column, lineText, tokenNames, FSharpTokenTag.Identifier)) + + let settingsStore = token.GetSettingsStoreWithEditorConfig() + let wrapLimit = settingsStore.GetValue(fun (key: FSharpFormatSettingsKey) -> key.WRAP_LIMIT) + + Some(results.CheckResults.GetToolTip(line, column, lineText, tokenNames, FSharpTokenTag.Identifier, wrapLimit)) type FSharpQuickDocPresenter(xmlDocService: FSharpXmlDocService, identifier: IFSharpIdentifier) = From d731d007761f755070fd8cca6ee70eefb6aced0d Mon Sep 17 00:00:00 2001 From: dawe Date: Mon, 17 Jul 2023 09:14:23 +0200 Subject: [PATCH 2/2] divide WRAP_LIMIT by 3 --- .../FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReSharper.FSharp/src/FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs b/ReSharper.FSharp/src/FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs index 79e4fadc29..0c52abd4c1 100644 --- a/ReSharper.FSharp/src/FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs +++ b/ReSharper.FSharp/src/FSharp.Psi.Daemon/src/QuickDoc/FSharpQuickDocProvider.fs @@ -35,7 +35,7 @@ module FSharpQuickDoc = let column = int coords.Column let settingsStore = token.GetSettingsStoreWithEditorConfig() - let wrapLimit = settingsStore.GetValue(fun (key: FSharpFormatSettingsKey) -> key.WRAP_LIMIT) + let wrapLimit = settingsStore.GetValue(fun (key: FSharpFormatSettingsKey) -> key.WRAP_LIMIT) / 3 Some(results.CheckResults.GetToolTip(line, column, lineText, tokenNames, FSharpTokenTag.Identifier, wrapLimit))