diff --git a/CodeFix/ConvertToSingleEqualsEqualityExpression.fs b/CodeFix/ConvertToSingleEqualsEqualityExpression.fs new file mode 100644 index 00000000000..e87538d1b88 --- /dev/null +++ b/CodeFix/ConvertToSingleEqualsEqualityExpression.fs @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace Microsoft.VisualStudio.FSharp.Editor + +open System.Composition +open System.Threading +open System.Threading.Tasks + +open Microsoft.CodeAnalysis.Text +open Microsoft.CodeAnalysis.CodeFixes +open Microsoft.CodeAnalysis.CodeActions + +[] +type internal FSharpConvertToSingleEqualsEqualityExpressionCodeFixProvider() = + inherit CodeFixProvider() + + let fixableDiagnosticIds = set ["FS0043"] + + override __.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds + + override this.RegisterCodeFixesAsync context : Task = + asyncMaybe { + let! sourceText = context.Document.GetTextAsync(context.CancellationToken) + let text = sourceText.GetSubText(context.Span).ToString() + + // We're converting '==' into '=', a common new user mistake. + // If this is an FS00043 that is anything other than that, bail out + do! Option.guard (text = "==") + + let title = SR.ConvertToSingleEqualsEqualityExpression() + + let diagnostics = + context.Diagnostics + |> Seq.filter (fun x -> fixableDiagnosticIds |> Set.contains x.Id) + |> Seq.toImmutableArray + + let codeFix = + CodeFixHelpers.createTextChangeCodeFix( + title, + context, + (fun () -> asyncMaybe.Return [| TextChange(context.Span, "=") |])) + + context.RegisterCodeFix(codeFix, diagnostics) + } + |> Async.Ignore + |> RoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken) \ No newline at end of file diff --git a/FSharp.Editor.fsproj b/FSharp.Editor.fsproj index f7cb5d028d3..8fec16bd4ea 100644 --- a/FSharp.Editor.fsproj +++ b/FSharp.Editor.fsproj @@ -3,6 +3,10 @@ + + + + Debug AnyCPU @@ -180,6 +184,7 @@ + diff --git a/FSharp.Editor.resx b/FSharp.Editor.resx index 94f2d6c4c58..720e90003b3 100644 --- a/FSharp.Editor.resx +++ b/FSharp.Editor.resx @@ -219,6 +219,9 @@ F# Dispostable Values (top-level) + + Use '=' for equality check + Use 'not' to negate expression diff --git a/xlf/FSharp.Editor.cs.xlf b/xlf/FSharp.Editor.cs.xlf index b1c154e6166..39301e1124a 100644 --- a/xlf/FSharp.Editor.cs.xlf +++ b/xlf/FSharp.Editor.cs.xlf @@ -7,6 +7,11 @@ Přidejte klíčové slovo new. + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.de.xlf b/xlf/FSharp.Editor.de.xlf index 728a4f2e556..c6b772545b4 100644 --- a/xlf/FSharp.Editor.de.xlf +++ b/xlf/FSharp.Editor.de.xlf @@ -7,6 +7,11 @@ Schlüsselwort "new" hinzufügen + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.es.xlf b/xlf/FSharp.Editor.es.xlf index 3a42ab5f955..156379e248a 100644 --- a/xlf/FSharp.Editor.es.xlf +++ b/xlf/FSharp.Editor.es.xlf @@ -7,6 +7,11 @@ Agregar "nueva" palabra clave + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.fr.xlf b/xlf/FSharp.Editor.fr.xlf index 9dc3d3c8256..0d06914bd12 100644 --- a/xlf/FSharp.Editor.fr.xlf +++ b/xlf/FSharp.Editor.fr.xlf @@ -7,6 +7,11 @@ Ajouter le mot clé 'new' + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.it.xlf b/xlf/FSharp.Editor.it.xlf index 03e9a26b0a3..d9b4ae18f3b 100644 --- a/xlf/FSharp.Editor.it.xlf +++ b/xlf/FSharp.Editor.it.xlf @@ -7,6 +7,11 @@ Aggiungi la parola chiave 'new' + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.ja.xlf b/xlf/FSharp.Editor.ja.xlf index 94a636ea333..98b6321c3e7 100644 --- a/xlf/FSharp.Editor.ja.xlf +++ b/xlf/FSharp.Editor.ja.xlf @@ -7,6 +7,11 @@ 'new' キーワードを追加する + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.ko.xlf b/xlf/FSharp.Editor.ko.xlf index 9bc5464d9a8..846f4f1f59f 100644 --- a/xlf/FSharp.Editor.ko.xlf +++ b/xlf/FSharp.Editor.ko.xlf @@ -7,6 +7,11 @@ 'new' 키워드 추가 + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.pl.xlf b/xlf/FSharp.Editor.pl.xlf index aff222fbe9c..04349ea8fee 100644 --- a/xlf/FSharp.Editor.pl.xlf +++ b/xlf/FSharp.Editor.pl.xlf @@ -7,6 +7,11 @@ Dodaj słowo kluczowe „new” + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.pt-BR.xlf b/xlf/FSharp.Editor.pt-BR.xlf index 6c9a2e0bda9..cc9abde1f4c 100644 --- a/xlf/FSharp.Editor.pt-BR.xlf +++ b/xlf/FSharp.Editor.pt-BR.xlf @@ -7,6 +7,11 @@ Adicionar a palavra-chave 'new' + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.ru.xlf b/xlf/FSharp.Editor.ru.xlf index 5b061944686..4aea41af1e0 100644 --- a/xlf/FSharp.Editor.ru.xlf +++ b/xlf/FSharp.Editor.ru.xlf @@ -7,6 +7,11 @@ Добавить ключевое слово "new" + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.tr.xlf b/xlf/FSharp.Editor.tr.xlf index 7266f9c201e..a34f26a5e29 100644 --- a/xlf/FSharp.Editor.tr.xlf +++ b/xlf/FSharp.Editor.tr.xlf @@ -7,6 +7,11 @@ 'new' anahtar sözcüğünü ekleme + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.zh-Hans.xlf b/xlf/FSharp.Editor.zh-Hans.xlf index af1ab1fd54c..a9259adff01 100644 --- a/xlf/FSharp.Editor.zh-Hans.xlf +++ b/xlf/FSharp.Editor.zh-Hans.xlf @@ -7,6 +7,11 @@ 添加“新”关键字 + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation diff --git a/xlf/FSharp.Editor.zh-Hant.xlf b/xlf/FSharp.Editor.zh-Hant.xlf index abf9dcb7465..4d66d55af16 100644 --- a/xlf/FSharp.Editor.zh-Hant.xlf +++ b/xlf/FSharp.Editor.zh-Hant.xlf @@ -7,6 +7,11 @@ 新增 'new' 關鍵字 + + Use '=' for equality check + Use '=' for equality check + + Use subtraction instead of negation Use subtraction instead of negation