Add IgnoreUnusedBindingExpression quick-fix

ReSharper.FSharp/src/FSharp.Psi.Features/FSharp.Psi.Features.fsproj

@@ -159,6 +159,7 @@
     <Compile Include="src\QuickFixes\AddExtensionAttributeFix.fs" />
     <Compile Include="src\QuickFixes\RemoveRedundantParenExprFix.fs" />
     <Compile Include="src\QuickFixes\NamespaceToModuleFix.fs" />
+    <Compile Include="src\QuickFixes\IgnoreUnusedBindingExpressionFix.fs" />
     <Compile Include="src\PostfixTemplates\PostfixTemplates.fs" />
     <Compile Include="src\PostfixTemplates\NotTemplate.fs" />
     <Compile Include="src\PostfixTemplates\LetPostfixTemplate.fs" />

ReSharper.FSharp/src/FSharp.Psi.Features/src/Daemon/Highlightings/CommonErrors.xml

@@ -87,6 +87,7 @@
     <QuickFix>AddUnderscorePrefixFix</QuickFix>
     <QuickFix>RemoveUnusedLocalBindingFix</QuickFix>
     <QuickFix>RemoveUnusedNamedAsPatFix</QuickFix>
+    <QuickFix>IgnoreUnusedBindingExpressionFix</QuickFix>
   </Warning>
 
   <Warning staticGroup="FSharpErrors" name="UnitTypeExpected">

ReSharper.FSharp/src/FSharp.Psi.Features/src/QuickFixes/IgnoreUnusedBindingExpressionFix.fs

@@ -0,0 +1,54 @@
+namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.QuickFixes
+
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
+open JetBrains.ReSharper.Plugins.FSharp.Psi
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util
+open JetBrains.ReSharper.Psi
+open JetBrains.ReSharper.Psi.ExtensionsAPI.Tree
+open JetBrains.ReSharper.Resources.Shell
+
+type IgnoreUnusedBindingExpressionFix(warning: UnusedValueWarning) =
+    inherit FSharpQuickFixBase()
+
+    let pat = warning.Pat.IgnoreParentParens()
+    let binding = BindingNavigator.GetByHeadPattern(pat)
+    let letOrUseExpr = LetOrUseExprNavigator.GetByBinding(binding)
+
+    let ignoreInnermostExpression (expr: IFSharpExpression) =
+        let rec getInnermostExpression (expr: IFSharpExpression) =
+            match expr with
+            | :? ISequentialExpr as seqExpr -> getInnermostExpression (seqExpr.Expressions.Last())
+            | :? ILetOrUseExpr as letOrUseExpr -> getInnermostExpression letOrUseExpr.InExpression
+            | :? IParenExpr as parenExpr -> getInnermostExpression parenExpr.InnerExpression
+            | _ -> expr
+
+        let exprToIgnore = getInnermostExpression expr
+        let ignoredExpr = exprToIgnore.CreateElementFactory().CreateIgnoreApp(exprToIgnore, false)
+        let replaced = ModificationUtil.ReplaceChild(exprToIgnore, ignoredExpr)
+        addParensIfNeeded replaced.LeftArgument |> ignore
+
+    override x.Text = "Inline and ignore expression"
+
+    override x.IsAvailable _ =
+        isValid pat && isValid letOrUseExpr && letOrUseExpr.Bindings.Count = 1 && isValid binding.Expression
+     && not (binding.Expression :? IDoExpr)
+
+    override x.ExecutePsiTransaction _ =
+        use writeLock = WriteLockCookie.Create(pat.IsPhysical())
+        use formatter = FSharpRegistryUtil.AllowFormatterCookie.Create()
+
+        if not (binding.Expression.Type().IsVoid()) then
+            ignoreInnermostExpression binding.Expression
+
+        let inExpr = letOrUseExpr.InExpression
+        let newLine = NewLine(letOrUseExpr.GetLineEnding())
+
+        let bindingExpr = ModificationUtil.ReplaceChild(letOrUseExpr, binding.Expression)
+        addNodesAfter bindingExpr [
+            newLine
+            newLine
+            inExpr
+        ] |> ignore

ReSharper.FSharp/src/FSharp.Psi/src/CodeFormatter/FSharpCodeFormatterInfoProvider.cs

@@ -214,6 +214,22 @@ private void Aligning()
 
     private void Formatting()
     {
+      Describe<FormattingRule>()
+        .Name("LineBreakBeforeIgnorePipe")
+        .Group(LineBreaksRuleGroup)
+        .Where(
+          Parent()
+            .HasType(ElementType.BINARY_APP_EXPR)
+            .Satisfies((node, context) => ((IBinaryAppExpr) node).RightArgument.GetText() == "ignore"),
+          Left()
+            .HasRole(BinaryAppExpr.LEFT_ARG_EXPR)
+            .Satisfies((node, context) => node.ContainsLineBreak(context.CodeFormatter))
+            .In(ElementType.MATCH_EXPR, ElementType.IF_THEN_ELSE_EXPR, ElementType.TRY_WITH_EXPR,
+              ElementType.TRY_FINALLY_EXPR, ElementType.LAMBDA_EXPR, ElementType.ASSERT_EXPR,
+              ElementType.LAZY_EXPR, ElementType.MATCH_LAMBDA_EXPR))
+        .Return(IntervalFormatType.NewLine)
+        .Build();
+
       Describe<FormattingRule>()
         .Group(SpaceRuleGroup)
         .Name("SpaceAfterImplicitConstructorDecl")
@@ -285,7 +301,8 @@ private void DescribeSimpleAlignmentRule((string name, CompositeNodeType nodeTyp
     }
 
     private static bool IndentElseExpr(ITreeNode elseExpr, CodeFormattingContext context) =>
-      elseExpr.GetPreviousMeaningfulSibling().IsFirstOnLine(context.CodeFormatter) && !(elseExpr is IElifExpr);
+      (elseExpr.GetPreviousMeaningfulSibling().IsFirstOnLine(context.CodeFormatter)
+    || !AreAligned(elseExpr, elseExpr.Parent?.FirstChild, context.CodeFormatter)) && !(elseExpr is IElifExpr);
 
     private static bool AreAligned(ITreeNode first, ITreeNode second, IWhitespaceChecker whitespaceChecker) =>
       first.CalcLineIndent(whitespaceChecker) == second.CalcLineIndent(whitespaceChecker);

ReSharper.FSharp/src/FSharp.Psi/src/Impl/Tree/AssertExpr.cs

@@ -0,0 +1,9 @@
+using JetBrains.ReSharper.Psi;
+
+namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree
+{
+  internal partial class AssertExpr
+  {
+    public override IType Type() => GetPsiModule().GetPredefinedType().Void;
+  }
+}

ReSharper.FSharp/src/FSharp.Psi/src/Impl/Tree/LetOrUseExpr.cs

@@ -1,5 +1,6 @@
 using JetBrains.Diagnostics;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Parsing;
+using JetBrains.ReSharper.Psi;
 
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree
 {
@@ -18,5 +19,7 @@ public void SetIsRecursive(bool value)
 
       LetOrUseToken.NotNull().AddTokenAfter(FSharpTokenType.REC);
     }
+
+    public override IType Type() => InExpression.Type();
   }
 }

ReSharper.FSharp/src/FSharp.Psi/src/Impl/Tree/TryFinallyExpr.cs

@@ -0,0 +1,9 @@
+using JetBrains.ReSharper.Psi;
+
+namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree
+{
+  internal partial class TryFinallyExpr
+  {
+    public override IType Type() => GetPsiModule().GetPredefinedType().Void;
+  }
+}

ReSharper.FSharp/src/FSharp.Psi/src/Impl/Tree/TryWithExpr.cs

@@ -0,0 +1,9 @@
+using JetBrains.ReSharper.Psi;
+
+namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree
+{
+  internal partial class TryWithExpr
+  {
+    public override IType Type() => GetPsiModule().GetPredefinedType().Void;
+  }
+}

ReSharper.FSharp/test/data/features/quickFixes/addUnderscorePrefix/Availability 01 - Escaped name.fs.gold

@@ -15,6 +15,7 @@ Replace with '_'
 --Replace unused values with '_' in solution
 Rename to '_foo'
 Remove unused value
+Inline and ignore expression
 1: The value 'foo bar' is unused
 QUICKFIXES:
 Replace with '_'
@@ -23,3 +24,4 @@ Replace with '_'
 --Replace unused values with '_' in project
 --Replace unused values with '_' in solution
 Remove unused value
+Inline and ignore expression

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 01 - Seq expr.fs

@@ -0,0 +1,8 @@
+module Module
+
+let a =
+  let b{caret} =
+    1
+    1
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 01 - Seq expr.fs.gold

@@ -0,0 +1,7 @@
+module Module
+
+let a =
+  1{caret}
+  1 |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 02 - Nested let.fs

@@ -0,0 +1,8 @@
+module Module
+
+let a =
+  let b{caret} =
+    let c = 1
+    c + c
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 02 - Nested let.fs.gold

@@ -0,0 +1,7 @@
+module Module
+
+let a =
+  let {caret}c = 1
+  c + c |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 03 - If expr.fs

@@ -0,0 +1,10 @@
+module Module
+
+let a =
+  let b{caret} =
+    if true then
+      1
+    else
+      2
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 03 - If expr.fs.gold

@@ -0,0 +1,10 @@
+module Module
+
+let a =
+  {caret}if true then
+    1
+  else
+    2
+  |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 04 - Match expr.fs

@@ -0,0 +1,9 @@
+module Module
+
+let a =
+  let b{caret} =
+    match () with
+    | a -> 1
+    | b -> 2
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 04 - Match expr.fs.gold

@@ -0,0 +1,9 @@
+module Module
+
+let a =
+  {caret}match () with
+  | a -> 1
+  | b -> 2
+  |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 05 - Match expr - Deindented last clause.fs

@@ -0,0 +1,11 @@
+module Module
+
+let a =
+  let b{caret} =
+    match () with
+    | a -> 1
+    | b ->
+
+    2
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 05 - Match expr - Deindented last clause.fs.gold

@@ -0,0 +1,11 @@
+module Module
+
+let a =
+  {caret}match () with
+  | a -> 1
+  | b ->
+
+    2
+  |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 06 - If expr - Deindented else expr.fs

@@ -0,0 +1,9 @@
+module Module
+
+let a =
+  let b{caret} =
+    if true then 1 else
+
+    2
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 06 - If expr - Deindented else expr.fs.gold

@@ -0,0 +1,9 @@
+module Module
+
+let a =
+  {caret}if true then 1 else
+
+    2
+  |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 07 - Paren expr.fs

@@ -0,0 +1,11 @@
+module Module
+
+let a =
+  let b{caret} = (
+    let a = 1
+    let b = 2
+
+    a + b
+  )
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 07 - Paren expr.fs.gold

@@ -0,0 +1,11 @@
+module Module
+
+let a =
+  {caret}(
+  let a = 1
+  let b = 2
+
+  a + b |> ignore
+  )
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 08 - Unit.fs

@@ -0,0 +1,10 @@
+module Module
+
+let a =
+  let b{caret} = 
+    let a = 1
+    let b = 2
+
+    ()
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 08 - Unit.fs.gold

@@ -0,0 +1,9 @@
+module Module
+
+let a =
+  let {caret}a = 1
+  let b = 2
+
+  ()
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 09 - Lazy.fs

@@ -0,0 +1,8 @@
+module Module
+
+let a =
+  let {caret}a =
+    lazy
+      1
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 09 - Lazy.fs.gold

@@ -0,0 +1,8 @@
+module Module
+
+let a =
+  l{caret}azy
+    1
+  |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 10 - Match lambda expr.fs

@@ -0,0 +1,9 @@
+module Module
+
+let a =
+  let {caret}a =
+    function
+    | b -> 1
+    | c -> 2
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 10 - Match lambda expr.fs.gold

@@ -0,0 +1,9 @@
+module Module
+
+let a =
+  {caret}function
+  | b -> 1
+  | c -> 2
+  |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 11 - Lambda expr.fs

@@ -0,0 +1,8 @@
+module Module
+
+let a =
+  let {caret}a =
+    fun x ->
+      x + 1
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 11 - Lambda expr.fs.gold

@@ -0,0 +1,8 @@
+module Module
+
+let a =
+  {caret}fun x ->
+    x + 1
+  |> ignore
+
+  ()

ReSharper.FSharp/test/data/features/quickFixes/ignoreUnusedBindingExpression/Multiline 12 - Try with expr.fs

@@ -0,0 +1,9 @@
+module Module
+
+let a =
+  let {caret}a =
+    try () with
+    | b -> ()
+    | c -> ()
+
+  ()