From 9ef904dc55a9cc73ca6a90b2d439cea3a033e87a Mon Sep 17 00:00:00 2001 From: majocha Date: Thu, 23 Mar 2023 12:47:40 +0100 Subject: [PATCH 1/8] first shot --- .../Navigation/GoToDefinition.fs | 26 +++++++++--- .../FSharp.Editor/Options/EditorOptions.fs | 3 ++ .../src/FSharp.Editor/Options/UIHelpers.fs | 40 +++++++++++++++++++ .../QuickInfo/QuickInfoProvider.fs | 18 ++++++--- .../QuickInfoOptionControl.xaml | 6 +++ 5 files changed, 82 insertions(+), 11 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs index 33fef1808a9..4901de036c4 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs @@ -571,7 +571,13 @@ module internal FSharpQuickInfo = // when a construct has been declared in a signature file the documentation comments that are // written in that file are the ones that go into the generated xml when the project is compiled // therefore we should include these doccoms in our design time quick info - let getQuickInfoFromRange (document: Document, declRange: range, cancellationToken: CancellationToken) : Async = + let getQuickInfoFromRange + ( + document: Document, + declRange: range, + width: int option, + cancellationToken: CancellationToken + ) : Async = asyncMaybe { let userOpName = "getQuickInfoFromRange" @@ -593,7 +599,8 @@ module internal FSharpQuickInfo = extLexerSymbol.Ident.idRange.EndColumn, extLineText, extLexerSymbol.FullIsland, - FSharpTokenTag.IDENT + FSharpTokenTag.IDENT, + ?width = width ) match extQuickInfoText with @@ -624,6 +631,7 @@ module internal FSharpQuickInfo = ( document: Document, position: int, + width: int option, cancellationToken: CancellationToken ) : Async<(range * FSharpQuickInfo option * FSharpQuickInfo option) option> = @@ -643,7 +651,15 @@ module internal FSharpQuickInfo = let targetQuickInfo = match lexerSymbol.Kind with | LexerSymbolKind.Keyword -> checkFileResults.GetKeywordTooltip(lexerSymbol.FullIsland) - | _ -> checkFileResults.GetToolTip(fcsTextLineNumber, idRange.EndColumn, lineText, lexerSymbol.FullIsland, tag) + | _ -> + checkFileResults.GetToolTip( + fcsTextLineNumber, + idRange.EndColumn, + lineText, + lexerSymbol.FullIsland, + tag, + ?width = width + ) match targetQuickInfo with | ToolTipText [] @@ -693,7 +709,7 @@ module internal FSharpQuickInfo = match findSigDeclarationResult with | FindDeclResult.DeclFound declRange when isSignatureFile declRange.FileName -> asyncMaybe { - let! sigQuickInfo = getQuickInfoFromRange (document, declRange, cancellationToken) + let! sigQuickInfo = getQuickInfoFromRange (document, declRange, width, cancellationToken) // if the target was declared in a signature file, and the current file // is not the corresponding module implementation file for that signature, @@ -712,7 +728,7 @@ module internal FSharpQuickInfo = | FindDeclResult.DeclNotFound _ | FindDeclResult.ExternalDecl _ -> return symbolUse.Range, Some sigQuickInfo, None | FindDeclResult.DeclFound declRange -> - let! implQuickInfo = getQuickInfoFromRange (document, declRange, cancellationToken) + let! implQuickInfo = getQuickInfoFromRange (document, declRange, width, cancellationToken) return symbolUse.Range, diff --git a/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs b/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs index 61c66cf2f54..d29e2e76287 100644 --- a/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs +++ b/vsintegration/src/FSharp.Editor/Options/EditorOptions.fs @@ -45,12 +45,14 @@ type QuickInfoOptions = { DisplayLinks: bool UnderlineStyle: QuickInfoUnderlineStyle + DescriptionWidth: int option } static member Default = { DisplayLinks = true UnderlineStyle = QuickInfoUnderlineStyle.Solid + DescriptionWidth = None } [] @@ -178,6 +180,7 @@ module internal OptionsUI = bindRadioButton view.dot path QuickInfoUnderlineStyle.Dot bindRadioButton view.dash path QuickInfoUnderlineStyle.Dash bindCheckBox view.displayLinks (nameof QuickInfoOptions.Default.DisplayLinks) + bindDescriptionWidthTextBox view.descriptionWidth (nameof QuickInfoOptions.Default.DescriptionWidth) upcast view [] diff --git a/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs b/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs index 6f39c0d8878..739eec4ff69 100644 --- a/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs +++ b/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs @@ -8,6 +8,7 @@ open Microsoft.VisualStudio.Shell open Microsoft.VisualStudio.ComponentModelHost module internal OptionsUIHelpers = + open System [] type AbstractOptionPage<'options>() as this = @@ -78,3 +79,42 @@ module internal OptionsUIHelpers = let bindCheckBox (checkBox: CheckBox) (path: string) = checkBox.SetBinding(CheckBox.IsCheckedProperty, path) |> ignore + + let bindDescriptionWidthTextBox (tb: TextBox) path = + let intOptionConverter = + { new IValueConverter with + member this.Convert(value, _, _, _) = + value :?> int option + |> Option.map Convert.ToString + |> Option.defaultValue "" + |> box + + member this.ConvertBack(value, _, _, _) = + try + Convert.ToInt32(value) |> Some |> box + with _ -> + None + } + + let binding = + Binding(path, Converter = intOptionConverter, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged) + + binding.ValidationRules.Add( + { new ValidationRule() with + member _.Validate(value, _) = + try + if String.IsNullOrWhiteSpace(downcast value) then + ValidationResult.ValidResult + else + let n = Convert.ToInt32(value) + + if n >= 20 && n < 400 then + ValidationResult.ValidResult + else + ValidationResult(false, "") + with _ -> + ValidationResult(false, "") + } + ) + + tb.SetBinding(TextBox.TextProperty, binding) |> ignore diff --git a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs index bd26e5f3c2d..45d24fb9d56 100644 --- a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs +++ b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs @@ -27,13 +27,14 @@ type internal FSharpAsyncQuickInfoSource statusBar: StatusBar, xmlMemberIndexService: IVsXMLMemberIndexService, metadataAsSource: FSharpMetadataAsSourceService, - textBuffer: ITextBuffer + textBuffer: ITextBuffer, + editorOptions: EditorOptions ) = // test helper - static member ProvideQuickInfo(document: Document, position: int) = + static member ProvideQuickInfo(document: Document, position: int, ?width: int) = asyncMaybe { - let! _, sigQuickInfo, targetQuickInfo = FSharpQuickInfo.getQuickInfo (document, position, CancellationToken.None) + let! _, sigQuickInfo, targetQuickInfo = FSharpQuickInfo.getQuickInfo (document, position, width, CancellationToken.None) return! sigQuickInfo |> Option.orElse targetQuickInfo } @@ -69,12 +70,14 @@ type internal FSharpAsyncQuickInfoSource | true -> let triggerPoint = triggerPoint.GetValueOrDefault() + let width = editorOptions.QuickInfo.DescriptionWidth + asyncMaybe { let document = textBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges() let! symbolUseRange, sigQuickInfo, targetQuickInfo = - FSharpQuickInfo.getQuickInfo (document, triggerPoint.Position, cancellationToken) + FSharpQuickInfo.getQuickInfo (document, triggerPoint.Position, width, cancellationToken) let getTooltip filePath = let solutionDir = Path.GetDirectoryName(document.Project.Solution.FilePath) @@ -195,7 +198,8 @@ type internal FSharpAsyncQuickInfoSource type internal FSharpAsyncQuickInfoSourceProvider [] ( [)>] serviceProvider: IServiceProvider, - metadataAsSource: FSharpMetadataAsSourceService + metadataAsSource: FSharpMetadataAsSourceService, + editorOptions: EditorOptions ) = interface IAsyncQuickInfoSourceProvider with @@ -204,4 +208,6 @@ type internal FSharpAsyncQuickInfoSourceProvider [] // It is safe to do it here (see #4713) let statusBar = StatusBar(serviceProvider.GetService()) let xmlMemberIndexService = serviceProvider.XMLMemberIndexService - new FSharpAsyncQuickInfoSource(statusBar, xmlMemberIndexService, metadataAsSource, textBuffer) :> IAsyncQuickInfoSource + + new FSharpAsyncQuickInfoSource(statusBar, xmlMemberIndexService, metadataAsSource, textBuffer, editorOptions) + :> IAsyncQuickInfoSource diff --git a/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml b/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml index 60d14de3177..3316d215031 100644 --- a/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml +++ b/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml @@ -29,6 +29,12 @@ + + + + + + From 3e87cd822aae19d126ce69da4e72201d4496b261 Mon Sep 17 00:00:00 2001 From: majocha Date: Thu, 23 Mar 2023 14:18:55 +0100 Subject: [PATCH 2/8] add strings --- .../src/FSharp.Editor/FSharp.Editor.resx | 4 +++- .../QuickInfoOptionControl.xaml | 4 ++-- .../src/FSharp.UIResources/Strings.Designer.cs | 18 ++++++++++++++++++ .../src/FSharp.UIResources/Strings.resx | 6 ++++++ .../src/FSharp.UIResources/xlf/Strings.cs.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.de.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.es.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.fr.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.it.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.ja.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.ko.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.pl.xlf | 10 ++++++++++ .../FSharp.UIResources/xlf/Strings.pt-BR.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.ru.xlf | 10 ++++++++++ .../src/FSharp.UIResources/xlf/Strings.tr.xlf | 10 ++++++++++ .../FSharp.UIResources/xlf/Strings.zh-Hans.xlf | 10 ++++++++++ .../FSharp.UIResources/xlf/Strings.zh-Hant.xlf | 10 ++++++++++ 17 files changed, 159 insertions(+), 3 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx index da310df50bf..cf0c02473e3 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx @@ -173,7 +173,9 @@ Always add new line on enter; QuickInfo - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml b/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml index 3316d215031..f839b92ff3d 100644 --- a/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml +++ b/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml @@ -29,9 +29,9 @@ - + - + diff --git a/vsintegration/src/FSharp.UIResources/Strings.Designer.cs b/vsintegration/src/FSharp.UIResources/Strings.Designer.cs index f983f08de3b..5f063ae1f99 100644 --- a/vsintegration/src/FSharp.UIResources/Strings.Designer.cs +++ b/vsintegration/src/FSharp.UIResources/Strings.Designer.cs @@ -231,6 +231,15 @@ public static string Format_on_paste { } } + /// + /// Looks up a localized string similar to Formatting. + /// + public static string Formatting { + get { + return ResourceManager.GetString("Formatting", resourceCulture); + } + } + /// /// Looks up a localized string similar to Inline Hints. /// @@ -267,6 +276,15 @@ public static string LiveBuffers { } } + /// + /// Looks up a localized string similar to Maximum description width. + /// + public static string Maximum_description_width { + get { + return ResourceManager.GetString("Maximum_description_width", resourceCulture); + } + } + /// /// Looks up a localized string similar to Navigation links. /// diff --git a/vsintegration/src/FSharp.UIResources/Strings.resx b/vsintegration/src/FSharp.UIResources/Strings.resx index 06637b5c147..fc251d4f765 100644 --- a/vsintegration/src/FSharp.UIResources/Strings.resx +++ b/vsintegration/src/FSharp.UIResources/Strings.resx @@ -249,4 +249,10 @@ Cache parsing results (experimental) + + Formatting + + + Maximum description width + \ No newline at end of file diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf index d4e489701e2..7eac485a6c7 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf @@ -22,6 +22,11 @@ Najít možnosti výkonu odkazů + + Formatting + Formatting + + Inline Hints Vložené nápovědy @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Navigační odkazy diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf index 5f8ed3d9709..a82fed4942d 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf @@ -22,6 +22,11 @@ Leistungsoptionen für Verweise suchen + + Formatting + Formatting + + Inline Hints Inlinehinweise @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Navigationslinks diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf index 648984fccbb..1a3065420b0 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf @@ -22,6 +22,11 @@ Buscar opciones de rendimiento de referencias + + Formatting + Formatting + + Inline Hints Sugerencias insertadas @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Vínculos de navegación diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf index dc13ed2a628..abbb8ab9413 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf @@ -22,6 +22,11 @@ Options de performances de recherche de références + + Formatting + Formatting + + Inline Hints Indicateurs inline @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Liens de navigation diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf index 412ccfeb5f9..0098113ae26 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf @@ -22,6 +22,11 @@ Trovare opzioni prestazioni riferimenti + + Formatting + Formatting + + Inline Hints Suggerimenti inline @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Collegamenti di navigazione diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf index 7247dbae375..d7dab4c874e 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf @@ -22,6 +22,11 @@ 参照の検索のパフォーマンス オプション + + Formatting + Formatting + + Inline Hints インラインのヒント @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links ナビゲーション リンク diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf index 55ebb99e142..2159d329212 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf @@ -22,6 +22,11 @@ 참조 성능 옵션 찾기 + + Formatting + Formatting + + Inline Hints 인라인 힌트 @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links 탐색 링크 diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf index c9cfedb1971..a62226d2776 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf @@ -22,6 +22,11 @@ Opcje wydajności znajdowania odwołań + + Formatting + Formatting + + Inline Hints Wskazówki w tekście @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Linki nawigacyjne diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf index 038963cf9ba..82e8bf0674b 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf @@ -22,6 +22,11 @@ Opções de Localizar Referências de Desempenho + + Formatting + Formatting + + Inline Hints Dicas Embutidas @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Links de navegação diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf index 25a44c54b32..4d098a70a8a 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf @@ -22,6 +22,11 @@ Параметры производительности поиска ссылок + + Formatting + Formatting + + Inline Hints Встроенные подсказки @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Ссылки навигации diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf index 0e1f4691b91..ba8af5a9cc8 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf @@ -22,6 +22,11 @@ Başvuruları Bul Performans Seçenekleri + + Formatting + Formatting + + Inline Hints Satır İçi İpuçları @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links Gezinti bağlantıları diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf index 9a5851273c4..374df1e49a8 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf @@ -22,6 +22,11 @@ 查找引用性能选项 + + Formatting + Formatting + + Inline Hints 内联提示 @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links 导航链接 diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf index b4dd37ef316..51945a5e54a 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf @@ -22,6 +22,11 @@ 尋找參考效能選項 + + Formatting + Formatting + + Inline Hints 內嵌提示 @@ -72,6 +77,11 @@ Live Buffers (experimental) + + Maximum description width + Maximum description width + + Navigation links 導覽連結 From ec5738eb277ff8931eb9572c9cf5c04c8d46d745 Mon Sep 17 00:00:00 2001 From: majocha Date: Thu, 23 Mar 2023 14:20:23 +0100 Subject: [PATCH 3/8] strings --- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf | 8 ++++++-- .../src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf | 8 ++++++-- vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf | 8 ++++++-- .../src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf | 8 ++++++-- .../src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf | 8 ++++++-- 13 files changed, 78 insertions(+), 26 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf index 919b27ecb3e..2df4a3dd0ce 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf index f43d8d69260..a1a723a486b 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf index c63cb934417..836446665f6 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf index eb7ecbe01b5..193b777a0c5 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf index a67aed36350..461391127f0 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf index faf7498c3b5..dfbf38e14eb 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf index d4d2cbceedb..6c0b8a74ff1 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf index ed6fde565ff..618f4129dfd 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; 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 77b968844e4..f1e3c6a489a 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf index a6d553a4876..c6332c9b3fd 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf index 7e5d5661fc2..d664fae6fda 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; 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 fdc3d9f27be..06b87cecf9d 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; 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 5c6f726e41c..3034bc3ecc3 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf @@ -177,12 +177,16 @@ Enable fast find references & rename (experimental);Cache parsing results (e - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; - Navigation links; + Formatting; +Maximum description width; +Navigation links; Show navigation links as; Solid underline; Dot underline; From 562d7621a9627f985a36eeb8a3c434a1113f3427 Mon Sep 17 00:00:00 2001 From: majocha Date: Thu, 23 Mar 2023 16:48:49 +0100 Subject: [PATCH 4/8] update label --- vsintegration/src/FSharp.Editor/FSharp.Editor.resx | 2 +- .../src/FSharp.UIResources/QuickInfoOptionControl.xaml | 2 +- vsintegration/src/FSharp.UIResources/Strings.Designer.cs | 6 +++--- vsintegration/src/FSharp.UIResources/Strings.resx | 4 ++-- vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf | 6 +++--- vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf | 6 +++--- .../src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf | 6 +++--- .../src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf | 6 +++--- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx index cf0c02473e3..51066dfb0c7 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx @@ -174,7 +174,7 @@ Always add new line on enter; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml b/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml index f839b92ff3d..e4cc289d840 100644 --- a/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml +++ b/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml @@ -31,7 +31,7 @@ - diff --git a/vsintegration/src/FSharp.UIResources/Strings.Designer.cs b/vsintegration/src/FSharp.UIResources/Strings.Designer.cs index 5f063ae1f99..7f662d91c69 100644 --- a/vsintegration/src/FSharp.UIResources/Strings.Designer.cs +++ b/vsintegration/src/FSharp.UIResources/Strings.Designer.cs @@ -277,11 +277,11 @@ public static string LiveBuffers { } /// - /// Looks up a localized string similar to Maximum description width. + /// Looks up a localized string similar to Maximum description width in characters. /// - public static string Maximum_description_width { + public static string Maximum_description_width_in_characters { get { - return ResourceManager.GetString("Maximum_description_width", resourceCulture); + return ResourceManager.GetString("Maximum_description_width_in_characters", resourceCulture); } } diff --git a/vsintegration/src/FSharp.UIResources/Strings.resx b/vsintegration/src/FSharp.UIResources/Strings.resx index fc251d4f765..4eabc7894dc 100644 --- a/vsintegration/src/FSharp.UIResources/Strings.resx +++ b/vsintegration/src/FSharp.UIResources/Strings.resx @@ -252,7 +252,7 @@ Formatting - - Maximum description width + + Maximum description width in characters \ No newline at end of file diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf index 7eac485a6c7..76b20a940ad 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf index a82fed4942d..12caf3424ab 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf index 1a3065420b0..84e9c98653b 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf index abbb8ab9413..73db1619ea7 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf index 0098113ae26..77da99b6a8e 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf index d7dab4c874e..7b161461c0f 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf index 2159d329212..8fc8c2d99b7 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf index a62226d2776..34ad9502950 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf index 82e8bf0674b..ac62d42db15 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf index 4d098a70a8a..86e49db9200 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf index ba8af5a9cc8..74b57efec8b 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf index 374df1e49a8..2e486c21ecf 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf index 51945a5e54a..c9f3cb9721f 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf @@ -77,9 +77,9 @@ Live Buffers (experimental) - - Maximum description width - Maximum description width + + Maximum description width in characters + Maximum description width in characters From 1a90755564d9b4cc2e4b9423807e4ba1c08aeb54 Mon Sep 17 00:00:00 2001 From: majocha Date: Thu, 23 Mar 2023 16:56:02 +0100 Subject: [PATCH 5/8] cleanup --- .../src/FSharp.Editor/Options/UIHelpers.fs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs b/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs index 739eec4ff69..6dfa5d4f9c2 100644 --- a/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs +++ b/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs @@ -65,9 +65,9 @@ module internal OptionsUIHelpers = //data binding helpers let radioButtonCoverter = { new IValueConverter with - member this.Convert(value, _, parameter, _) = upcast value.Equals(parameter) + member _.Convert(value, _, parameter, _) = upcast value.Equals(parameter) - member this.ConvertBack(value, _, parameter, _) = + member _.ConvertBack(value, _, parameter, _) = if value.Equals(true) then parameter else Binding.DoNothing } @@ -83,13 +83,13 @@ module internal OptionsUIHelpers = let bindDescriptionWidthTextBox (tb: TextBox) path = let intOptionConverter = { new IValueConverter with - member this.Convert(value, _, _, _) = + member _.Convert(value, _, _, _) = value :?> int option |> Option.map Convert.ToString |> Option.defaultValue "" |> box - member this.ConvertBack(value, _, _, _) = + member _.ConvertBack(value, _, _, _) = try Convert.ToInt32(value) |> Some |> box with _ -> @@ -106,12 +106,9 @@ module internal OptionsUIHelpers = if String.IsNullOrWhiteSpace(downcast value) then ValidationResult.ValidResult else - let n = Convert.ToInt32(value) - - if n >= 20 && n < 400 then - ValidationResult.ValidResult - else - ValidationResult(false, "") + match Convert.ToInt32(value) with + | n when n >= 20 -> ValidationResult.ValidResult + | _ -> ValidationResult(false, "") with _ -> ValidationResult(false, "") } From 4fd1723553c4e72c268d372c4e7a961854e36b7d Mon Sep 17 00:00:00 2001 From: majocha Date: Thu, 23 Mar 2023 17:16:55 +0100 Subject: [PATCH 6/8] safer --- vsintegration/src/FSharp.Editor/Options/UIHelpers.fs | 11 +++++++---- .../src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.de.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.es.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.it.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf | 4 ++-- .../src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf | 4 ++-- 14 files changed, 33 insertions(+), 30 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs b/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs index 6dfa5d4f9c2..51e348b4b7b 100644 --- a/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs +++ b/vsintegration/src/FSharp.Editor/Options/UIHelpers.fs @@ -84,10 +84,13 @@ module internal OptionsUIHelpers = let intOptionConverter = { new IValueConverter with member _.Convert(value, _, _, _) = - value :?> int option - |> Option.map Convert.ToString - |> Option.defaultValue "" - |> box + try + value :?> int option + |> Option.map Convert.ToString + |> Option.defaultValue "" + |> box + with _ -> + Binding.DoNothing member _.ConvertBack(value, _, _, _) = try diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf index 2df4a3dd0ce..64a66b32061 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf index a1a723a486b..fae29866284 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf index 836446665f6..36b93f900bb 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf index 193b777a0c5..c84c80a733b 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf index 461391127f0..90f14a7913b 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf index dfbf38e14eb..ee70196cc94 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf index 6c0b8a74ff1..9bb15f4f0e1 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf index 618f4129dfd..22ee0b435b0 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; 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 f1e3c6a489a..c0f9df0fc6c 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pt-BR.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf index c6332c9b3fd..1117341a961 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; diff --git a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf index d664fae6fda..72788f4e0f5 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; 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 06b87cecf9d..06ebcff974a 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hans.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; 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 3034bc3ecc3..e1f3258c051 100644 --- a/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf +++ b/vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.zh-Hant.xlf @@ -178,14 +178,14 @@ Enable fast find references & rename (experimental);Cache parsing results (e Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; Dot underline; Dash underline; Formatting; -Maximum description width; +Maximum description width in characters; Navigation links; Show navigation links as; Solid underline; From 014107894c0f534afee6878b725906c9ed34de88 Mon Sep 17 00:00:00 2001 From: majocha Date: Mon, 27 Mar 2023 10:26:32 +0200 Subject: [PATCH 7/8] add tooltip --- .../QuickInfoOptionControl.xaml | 4 +-- .../FSharp.UIResources/Strings.Designer.cs | 27 ++++++++++++------- .../src/FSharp.UIResources/Strings.resx | 7 +++-- .../src/FSharp.UIResources/xlf/Strings.cs.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.de.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.es.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.fr.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.it.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.ja.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.ko.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.pl.xlf | 15 +++++++---- .../FSharp.UIResources/xlf/Strings.pt-BR.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.ru.xlf | 15 +++++++---- .../src/FSharp.UIResources/xlf/Strings.tr.xlf | 15 +++++++---- .../xlf/Strings.zh-Hans.xlf | 15 +++++++---- .../xlf/Strings.zh-Hant.xlf | 15 +++++++---- 16 files changed, 155 insertions(+), 78 deletions(-) diff --git a/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml b/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml index e4cc289d840..528aa32b1cf 100644 --- a/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml +++ b/vsintegration/src/FSharp.UIResources/QuickInfoOptionControl.xaml @@ -30,8 +30,8 @@ - - diff --git a/vsintegration/src/FSharp.UIResources/Strings.Designer.cs b/vsintegration/src/FSharp.UIResources/Strings.Designer.cs index 40583ed5b4b..c4712eb66bd 100644 --- a/vsintegration/src/FSharp.UIResources/Strings.Designer.cs +++ b/vsintegration/src/FSharp.UIResources/Strings.Designer.cs @@ -285,15 +285,6 @@ public static string LiveBuffers { } } - /// - /// Looks up a localized string similar to Maximum description width in characters. - /// - public static string Maximum_description_width_in_characters { - get { - return ResourceManager.GetString("Maximum_description_width_in_characters", resourceCulture); - } - } - /// /// Looks up a localized string similar to Navigation links. /// @@ -321,6 +312,15 @@ public static string Parallelization { } } + /// + /// Looks up a localized string similar to Preferred description width in characters. + /// + public static string Preferred_description_width_in_characters { + get { + return ResourceManager.GetString("Preferred_description_width_in_characters", resourceCulture); + } + } + /// /// Looks up a localized string similar to F# Project and Caching Performance Options. /// @@ -456,6 +456,15 @@ public static string Tooltip_in_memory_cross_project_references { } } + /// + /// Looks up a localized string similar to Format signature to the given width by adding line breaks conforming with F# syntax rules. . + /// + public static string Tooltip_preferred_description_width_in_characters { + get { + return ResourceManager.GetString("Tooltip_preferred_description_width_in_characters", resourceCulture); + } + } + /// /// Looks up a localized string similar to Analyze and suggest fixes for unused values. /// diff --git a/vsintegration/src/FSharp.UIResources/Strings.resx b/vsintegration/src/FSharp.UIResources/Strings.resx index aead752dc14..1140a72b7ed 100644 --- a/vsintegration/src/FSharp.UIResources/Strings.resx +++ b/vsintegration/src/FSharp.UIResources/Strings.resx @@ -255,7 +255,10 @@ Formatting - - Maximum description width in characters + + Preferred description width in characters + + + Format signature to the given width by adding line breaks conforming with F# syntax rules. \ No newline at end of file diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf index b774cc89c75..89780f6d6b6 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Navigační odkazy @@ -97,6 +92,11 @@ Paralelizace (vyžaduje restartování) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Zobrazit nápovědy k názvům vložených parametrů (experimentální) @@ -147,6 +147,11 @@ Přechod myší nad textem + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Odebrat nepoužívané otevřené výkazy diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf index d77db95a782..7451bd7fe2c 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Navigationslinks @@ -97,6 +92,11 @@ Parallelisierung (Neustart erforderlich) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Hinweise zu Inlineparameternamen anzeigen (experimentell) @@ -147,6 +147,11 @@ Texthover + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Nicht verwendete "open"-Anweisungen entfernen diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf index 571ca51bec8..f2e1721854a 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Vínculos de navegación @@ -97,6 +92,11 @@ Paralelización (requiere reiniciar) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Mostrar sugerencias de nombre de parámetro insertado (experimental) @@ -147,6 +147,11 @@ Texto al pasar el puntero + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Quitar instrucciones open no usadas diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf index 4c7056001d0..e78bbcf8d1c 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Liens de navigation @@ -97,6 +92,11 @@ Parallélisation (Nécessite un redémarrage) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Afficher les indicateurs de nom de paramètre en ligne (expérimental) @@ -147,6 +147,11 @@ Survol du texte + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Supprimer les instructions open inutilisées diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf index 3c14de0f971..0f34e28dd06 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Collegamenti di navigazione @@ -97,6 +92,11 @@ Parallelizzazione (richiede il riavvio) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Visualizza suggerimenti per i nomi di parametro inline (sperimentale) @@ -147,6 +147,11 @@ Passaggio del puntatore sul testo + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Rimuovi istruzioni OPEN inutilizzate diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf index 9419ac05b7e..7e1eb91b4ea 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links ナビゲーション リンク @@ -97,6 +92,11 @@ 並列化 (再起動が必要) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) インライン パラメーター名のヒントを表示する (試験段階) @@ -147,6 +147,11 @@ テキスト ホバー + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements 未使用の Open ステートメントを削除する diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf index 9859705c081..67a4dacb312 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links 탐색 링크 @@ -97,6 +92,11 @@ 병렬화(다시 시작 필요) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) 인라인 매개 변수 이름 힌트 표시(실험적) @@ -147,6 +147,11 @@ 텍스트 호버 + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements 사용되지 않는 open 문 제거 diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf index c132e1a828f..7ca1c623135 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Linki nawigacyjne @@ -97,6 +92,11 @@ Równoległość (wymaga ponownego uruchomienia) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Wyświetlaj wbudowane wskazówki dotyczące nazw parametrów (eksperymentalne) @@ -147,6 +147,11 @@ Najechanie kursorem na tekst + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Usuń nieużywane otwarte instrukcje diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf index 47818410856..5ded3335b0e 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Links de navegação @@ -97,6 +92,11 @@ Paralelização (requer reinicialização) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Exibir dicas de nome de parâmetro embutidas (experimental) @@ -147,6 +147,11 @@ Foco do texto + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Remover instruções abertas não usadas diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf index 580fa580645..a7f235c094e 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Ссылки навигации @@ -97,6 +92,11 @@ Параллелизация (требуется перезапуск) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Отображать подсказки для имен встроенных параметров (экспериментальная версия) @@ -147,6 +147,11 @@ Текст, отображаемый при наведении + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Удалить неиспользуемые открытые операторы diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf index 1ea38faadf0..9ed15c7345b 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links Gezinti bağlantıları @@ -97,6 +92,11 @@ Paralelleştirme (yeniden başlatma gerektirir) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) Satır içi parametre adı ipuçlarını göster (deneysel) @@ -147,6 +147,11 @@ Metni vurgulama + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements Kullanılmayan açık deyimleri kaldır diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf index cc650c7f2c0..88c45e47255 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links 导航链接 @@ -97,6 +92,11 @@ 并行化(需要重启) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) 显示内联参数名称提示(实验性) @@ -147,6 +147,11 @@ 文本悬停 + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements 删除未使用的 open 语句 diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf index 9f31be0069f..a6a50c29ded 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf @@ -82,11 +82,6 @@ Live Buffers (experimental) - - Maximum description width in characters - Maximum description width in characters - - Navigation links 導覽連結 @@ -97,6 +92,11 @@ 平行處理 (需要重新開機) + + Preferred description width in characters + Preferred description width in characters + + Display inline parameter name hints (preview) 顯示內嵌參數名稱提示 (實驗性) @@ -147,6 +147,11 @@ 文字暫留 + + Format signature to the given width by adding line breaks conforming with F# syntax rules. + Format signature to the given width by adding line breaks conforming with F# syntax rules. + + Remove unused open statements 移除未使用的 open 陳述式 From 5558a920232884e504842e561aa80ba316213371 Mon Sep 17 00:00:00 2001 From: majocha Date: Mon, 27 Mar 2023 10:40:27 +0200 Subject: [PATCH 8/8] update search keywords --- vsintegration/src/FSharp.Editor/FSharp.Editor.resx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx index 13d2d973171..505a8cf1629 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.resx +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.resx @@ -174,7 +174,8 @@ Always add new line on enter; Formatting; -Maximum description width in characters; +Preferred description width in characters; +Format signature to the given width by adding line breaks conforming with F# syntax rules; Navigation links; Show navigation links as; Solid underline;