Typing assists/Start new line: support for patch engine

ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/FSharpTypingAssist.fs

@@ -552,6 +552,19 @@ type FSharpTypingAssist(lifetime, dependencies) as this =
         let text = String(' ', indent) + this.GetNewLineText(textControl)
         insertText textControl lineStartOffset text "Start New Line Before" (Some (lineStartOffset + indent))
 
+    let handleStartNewLinePressed (context: IActionContext) =
+        use _ = this.CommandProcessor.UsingCommand("Start New Line")
+
+        let textControl = context.TextControl
+        textControl.Selection.Delete()
+
+        let document = textControl.Document
+        let caretLine = textControl.Caret.Position.Value.ToDocLineColumn().Line
+        let lineEndOffset = document.GetLineEndOffsetNoLineBreak(caretLine)
+        textControl.Caret.MoveTo(lineEndOffset, CaretVisualPlacement.DontScrollIfVisible)
+
+        handleEnter(context)
+
     let handleSpace (context: ITypingContext) =
         this.HandleSpaceInsideEmptyBrackets(context.TextControl)
 
@@ -561,12 +574,13 @@ type FSharpTypingAssist(lifetime, dependencies) as this =
         let isSmartParensHandlerAvailable = Predicate<_>(this.IsTypingSmartParenthesisHandlerAvailable2)
         let manager = dependencies.TypingAssistManager
 
-        manager.AddActionHandler(lifetime, TextControlActions.ActionIds.Enter, this, Func<_,_>(handleEnter), isActionHandlerAvailable)
-        manager.AddActionHandler(lifetime, EditorStartNewLineBeforeAction.ACTION_ID, this, Func<_,_>(handleStartNewLineBeforePressed), isActionHandlerAvailable)
+        manager.AddActionHandler(lifetime, TextControlActions.ActionIds.Enter, this, handleEnter, isActionHandlerAvailable)
+        manager.AddActionHandler(lifetime, EditorStartNewLineBeforeAction.ACTION_ID, this, handleStartNewLineBeforePressed, isActionHandlerAvailable)
+        manager.AddActionHandler(lifetime, EditorStartNewLineAction.ACTION_ID, this, handleStartNewLinePressed, isActionHandlerAvailable)
         manager.AddActionHandler(lifetime, TextControlActions.ActionIds.Backspace, this, Func<_,_>(this.HandleBackspacePressed), isActionHandlerAvailable)
         manager.AddActionHandler(lifetime, TextControlActions.ActionIds.Tab, this, Func<_,_>(this.HandleTabPressed), isActionHandlerAvailable)
         manager.AddActionHandler(lifetime, TextControlActions.ActionIds.TabLeft, this, Func<_,_>(this.HandleTabLeftPressed), isActionHandlerAvailable)
-        manager.AddTypingHandler(lifetime, ' ', this, Func<_,_>(handleSpace), isTypingHandlerAvailable)
+        manager.AddTypingHandler(lifetime, ' ', this, handleSpace, isTypingHandlerAvailable)
 
         manager.AddTypingHandler(lifetime, '\'', this, Func<_,_>(this.HandleSingleQuoteTyped), isTypingHandlerAvailable)
         manager.AddTypingHandler(lifetime, '"', this, Func<_,_>(this.HandleQuoteTyped), isSmartParensHandlerAvailable)

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typingAssist/FSharpPatchEngineTypingAssists.kt

@@ -0,0 +1,57 @@
+package com.jetbrains.rider.plugins.fsharp.test.cases.typingAssist
+
+import com.intellij.openapi.actionSystem.IdeActions
+import com.jetbrains.rider.test.annotations.Feature
+import com.jetbrains.rider.test.annotations.Subsystem
+import com.jetbrains.rider.test.annotations.TestEnvironment
+import com.jetbrains.rider.test.base.PatchEngineEditorTestBase
+import com.jetbrains.rider.test.base.PatchEngineEditorTestMode
+import com.jetbrains.rider.test.env.enums.SdkVersion
+import com.jetbrains.rider.test.reporting.SubsystemConstants
+import org.testng.annotations.DataProvider
+import org.testng.annotations.Test
+
+abstract class FSharpTypingAssistPatchEngineTest(mode: PatchEngineEditorTestMode) : PatchEngineEditorTestBase(mode) {
+  override val checkTextControls = false
+  override val testSolution = "CoreConsoleApp"
+
+  @DataProvider(name = "simpleCases")
+  fun simpleCases() = arrayOf(
+    arrayOf("emptyFile"),
+    arrayOf("docComment"),
+    arrayOf("indent1"),
+    arrayOf("indent2"),
+    arrayOf("removeSelection1"),
+    arrayOf("removeSelection2"),
+    arrayOf("trailingSpace")
+  )
+
+  @Test(dataProvider = "simpleCases")
+  fun testStartNewLine(caseName: String) {
+    dumpOpenedEditorFacade("Program.fs", "Program.fs") {
+      typeOrCallAction(IdeActions.ACTION_EDITOR_START_NEW_LINE)
+    }
+  }
+
+  @Test
+  fun testStartNewLineUndo() {
+    dumpOpenedEditorFacade("Program.fs", "Program.fs") {
+      typeOrCallAction(IdeActions.ACTION_EDITOR_START_NEW_LINE)
+      undo()
+    }
+  }
+}
+
+@Test
+@Subsystem(SubsystemConstants.TYPING_ASSIST)
+@Feature("Typing Assist")
+@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE)
+class FSharpTypingAssistPatchEngineSpeculativeRebaseProhibitedTest :
+  FSharpTypingAssistPatchEngineTest(PatchEngineEditorTestMode.SpeculativeRebaseProhibited)
+
+@Test
+@Subsystem(SubsystemConstants.TYPING_ASSIST)
+@Feature("Typing Assist")
+@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE)
+class FSharpTypingAssistPatchEngineSpeculativeAndForceRebaseTest :
+  FSharpTypingAssistPatchEngineTest(PatchEngineEditorTestMode.SpeculativeAndForceRebase)

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLineUndo/gold/Program.gold

@@ -0,0 +1,2 @@
+let <selstart>x<selend> =
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLineUndo/source/Program.fs

@@ -0,0 +1,2 @@
+let <selstart>x<selend> =
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_docComment/gold/Program.gold

@@ -0,0 +1,3 @@
+/// It's x
+/// <caret>
+let x = 4

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_docComment/source/Program.fs

@@ -0,0 +1,2 @@
+/// It'<caret>s x
+let x = 4

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_emptyFile/gold/Program.gold

@@ -0,0 +1,2 @@
+
+<caret>

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_emptyFile/source/Program.fs

@@ -0,0 +1 @@
+<caret>

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_indent1/gold/Program.gold

@@ -0,0 +1,3 @@
+let x =
+    <caret>
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_indent1/source/Program.fs

@@ -0,0 +1,2 @@
+let <caret>x =
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_indent2/gold/Program.gold

@@ -0,0 +1,3 @@
+let x =
+    5
+    <caret>

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_indent2/source/Program.fs

@@ -0,0 +1,2 @@
+let x =
+    <caret>5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_removeSelection1/gold/Program.gold

@@ -0,0 +1,3 @@
+let  =
+    <caret>
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_removeSelection1/source/Program.fs

@@ -0,0 +1,2 @@
+let <selstart>x<selend> =
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_removeSelection2/gold/Program.gold

@@ -0,0 +1,3 @@
+let x
+<caret>
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_removeSelection2/source/Program.fs

@@ -0,0 +1,2 @@
+let x <selstart>=<selend>
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_trailingSpace/gold/Program.gold

@@ -0,0 +1,3 @@
+let x =
+    <caret>
+    5

rider-fsharp/src/test/testData/typingAssist/FSharpPatchEngineTypingAssists/testStartNewLine_trailingSpace/source/Program.fs

@@ -0,0 +1,2 @@
+let <caret>x =    
+    5