未验证 提交 db6ce1b7 编写于 作者: K kerams 提交者: GitHub

Implement triple quoted interpolation code fix (#12945)

上级 08992b32
......@@ -306,6 +306,14 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput,
Some(app.Range, lambdaArgs.Range, lambdaBody.Range)
| _ -> defaultTraverse binding })
member _.TryRangeOfStringInterpolationContainingPos pos =
SyntaxTraversal.Traverse(pos, input, { new SyntaxVisitorBase<_>() with
member _.VisitExpr(_, _, defaultTraverse, expr) =
match expr with
| SynExpr.InterpolatedString(range = range) when rangeContainsPos range pos ->
Some range
| _ -> defaultTraverse expr })
member _.TryRangeOfExprInYieldOrReturn pos =
SyntaxTraversal.Traverse(pos, input, { new SyntaxVisitorBase<_>() with
member _.VisitExpr(_path, _, defaultTraverse, expr) =
......
......@@ -20,6 +20,9 @@ type public FSharpParseFileResults =
/// Attempts to find the range of an attempted lambda expression or pattern, the argument range, and the expr range when writing a C#-style "lambda" (which is actually an operator application)
member TryRangeOfParenEnclosingOpEqualsGreaterUsage: opGreaterEqualPos: pos -> (range * range * range) option
/// Attempts to find the range of the string interpolation that contains a given position.
member TryRangeOfStringInterpolationContainingPos: pos: pos -> range option
/// Attempts to find the range of an expression `expr` contained in a `yield expr` or `return expr` expression (and bang-variants).
member TryRangeOfExprInYieldOrReturn: pos: pos -> range option
......
......@@ -2069,6 +2069,7 @@ FSharp.Compiler.CodeAnalysis.FSharpParseFileResults: Microsoft.FSharp.Core.FShar
FSharp.Compiler.CodeAnalysis.FSharpParseFileResults: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] TryRangeOfNameOfNearestOuterBindingContainingPos(FSharp.Compiler.Text.Position)
FSharp.Compiler.CodeAnalysis.FSharpParseFileResults: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] TryRangeOfRecordExpressionContainingPos(FSharp.Compiler.Text.Position)
FSharp.Compiler.CodeAnalysis.FSharpParseFileResults: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] TryRangeOfRefCellDereferenceContainingPos(FSharp.Compiler.Text.Position)
FSharp.Compiler.CodeAnalysis.FSharpParseFileResults: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] TryRangeOfStringInterpolationContainingPos(FSharp.Compiler.Text.Position)
FSharp.Compiler.CodeAnalysis.FSharpParseFileResults: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] ValidateBreakpointLocation(FSharp.Compiler.Text.Position)
FSharp.Compiler.CodeAnalysis.FSharpParseFileResults: Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Text.Range]] GetAllArgumentsForFunctionApplicationAtPostion(FSharp.Compiler.Text.Position)
FSharp.Compiler.CodeAnalysis.FSharpParseFileResults: Microsoft.FSharp.Core.FSharpOption`1[System.Tuple`2[FSharp.Compiler.Syntax.Ident,System.Int32]] TryIdentOfPipelineContainingPosAndNumArgsApplied(FSharp.Compiler.Text.Position)
......
// 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 Microsoft.CodeAnalysis.Text
open Microsoft.CodeAnalysis.CodeFixes
[<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "UseTripleQuotedInterpolation"); Shared>]
type internal FSharpUseTripleQuotedInterpolationCodeFixProvider
[<ImportingConstructor>]
(
) =
inherit CodeFixProvider()
let fixableDiagnosticIds = ["FS3373"]
override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
override _.RegisterCodeFixesAsync context =
asyncMaybe {
let! parseResults = context.Document.GetFSharpParseResultsAsync(nameof(FSharpUseTripleQuotedInterpolationCodeFixProvider)) |> liftAsync
let! sourceText = context.Document.GetTextAsync(context.CancellationToken)
let errorRange = RoslynHelpers.TextSpanToFSharpRange(context.Document.FilePath, context.Span, sourceText)
let! interpolationRange = parseResults.TryRangeOfStringInterpolationContainingPos errorRange.Start
let! interpolationSpan = RoslynHelpers.TryFSharpRangeToTextSpan(sourceText, interpolationRange)
let replacement =
let interpolation = sourceText.GetSubText(interpolationSpan).ToString()
TextChange(interpolationSpan, "$\"\"" + interpolation.[ 1 .. ] + "\"\"")
let diagnostics =
context.Diagnostics
|> Seq.filter (fun x -> fixableDiagnosticIds |> List.contains x.Id)
|> Seq.toImmutableArray
let title = SR.UseTripleQuotedInterpolation()
let codeFix =
CodeFixHelpers.createTextChangeCodeFix(
title,
context,
(fun () -> asyncMaybe.Return [| replacement |]))
context.RegisterCodeFix(codeFix, diagnostics)
}
|> Async.Ignore
|> RoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken)
......@@ -121,6 +121,7 @@
<Compile Include="CodeFix\MissingReferenceCodeFixProvider.fs" />
<Compile Include="CodeFix\FixIndexerAccess.fs" />
<Compile Include="CodeFix\RenameParamToMatchSignature.fs" />
<Compile Include="CodeFix\UseTripleQuotedInterpolation.fs" />
<Compile Include="Build\SetGlobalPropertiesForSdkProjects.fs" />
<Compile Include="AutomaticCompletion\BraceCompletionSessionProvider.fsi" />
<Compile Include="AutomaticCompletion\BraceCompletionSessionProvider.fs" />
......
......@@ -288,4 +288,7 @@
<data name="UseNameof" xml:space="preserve">
<value>Use 'nameof'</value>
</data>
</root>
<data name="UseTripleQuotedInterpolation" xml:space="preserve">
<value>Use triple quoted string interpolation.</value>
</data>
</root>
\ No newline at end of file
......@@ -262,6 +262,11 @@
<target state="translated">Použít nameof</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">Použijte upcast</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">"nameof" verwenden</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">"upcast" verwenden</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">Usar 'nameof'</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">Usar "upcast"</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">Utiliser « nameof »</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">Utiliser 'upcast'</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">Usa 'nameof'</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">Usare 'upcast'</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">'nameof' を使用する</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">'upcast' を使用する</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">'nameof' 사용</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">'upcast' 사용</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">Użyj wyrażenia "nameof"</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">Użyj operatora „upcast”</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">Usar 'nameof'</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">Usar 'upcast'</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">Использовать "nameof"</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">Используйте "upcast"</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">“Nameof” kullanın</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">'upcast' kullan</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">使用 "nameof"</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">使用“向上转换”</target>
......
......@@ -262,6 +262,11 @@
<target state="translated">使用 'nameof'</target>
<note />
</trans-unit>
<trans-unit id="UseTripleQuotedInterpolation">
<source>Use triple quoted string interpolation.</source>
<target state="new">Use triple quoted string interpolation.</target>
<note />
</trans-unit>
<trans-unit id="UseUpcastKeyword">
<source>Use 'upcast'</source>
<target state="translated">使用「向上轉型」</target>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册