Merge pull request #116 from krymtkts:feature/raw-ui

Support full-width characters in query widndow
krymtkts · Jan 8, 2024 · a09fe9b · a09fe9b
2 parents 73b9c5a + 3521028
commit a09fe9b
Show file tree

Hide file tree

Showing 10 changed files with 293 additions and 190 deletions.
diff --git a/src/pocof.Test/Pocof.fs b/src/pocof.Test/Pocof.fs
@@ -5,17 +5,63 @@ open FsUnitTyped
 open System
 open pocof.Pocof
 open pocof.PocofData
+open pocof.PocofScreen
+open PocofUI
+
+module calculateWindowBeginningCursor =
+    [<Fact>]
+    let ``should return 0.`` () =
+        let state =
+            { Query = "a"
+              Cursor = 1
+              WindowBeginningCursor = 0
+              WindowWidth = 30 }
+
+        let rui = new MockRawUI()
+        use buff = new Buff(rui, (fun _ -> Seq.empty))
+
+        let actual = calculateWindowBeginningCursor buff.GetLengthInBufferCells state
+
+        actual |> shouldEqual 0
+
+    [<Fact>]
+    let ``should return 1.`` () =
+        let state =
+            { Query = String.replicate 31 "a"
+              Cursor = 31
+              WindowBeginningCursor = 0
+              WindowWidth = 30 }
+
+        let rui = new MockRawUI()
+        use buff = new Buff(rui, (fun _ -> Seq.empty))
+
+        let actual = calculateWindowBeginningCursor buff.GetLengthInBufferCells state
+
+        actual |> shouldEqual 1
+
+    [<Fact>]
+    let ``should return cursor value.`` () =
+        let state =
+            { Query = String.replicate 31 "a"
+              Cursor = 0
+              WindowBeginningCursor = 31
+              WindowWidth = 30 }
+
+        let rui = new MockRawUI()
+        use buff = new Buff(rui, (fun _ -> Seq.empty))
+
+        let actual = calculateWindowBeginningCursor buff.GetLengthInBufferCells state
+
+        actual |> shouldEqual 0
 
 module loop =
     open System.Management.Automation
-    open PocofUI
-    open pocof.PocofScreen
 
     let initState () : InternalState =
         { QueryState =
             { Query = ""
               Cursor = 0
-              WindowBeginningX = 0
+              WindowBeginningCursor = 0
               WindowWidth = 0 }
           QueryCondition =
             { Matcher = MATCH
@@ -71,7 +117,8 @@ module loop =
               propMap = propMap
               writeScreen = writeScreen
               getKey = m.getKey
-              getConsoleWidth = fun () -> 0 }
+              getConsoleWidth = fun () -> 60
+              getLengthInBufferCells = String.length }
 
         let actual = loop args input state pos context
         actual |> List.length |> shouldEqual 5
@@ -95,7 +142,8 @@ module loop =
               propMap = propMap
               writeScreen = writeScreen
               getKey = m.getKey
-              getConsoleWidth = fun () -> 0 }
+              getConsoleWidth = fun () -> 60
+              getLengthInBufferCells = String.length }
 
         let actual = loop args input state pos context
         actual |> List.length |> shouldEqual 0
@@ -116,7 +164,8 @@ module loop =
               propMap = propMap
               writeScreen = writeScreen
               getKey = m.getKey
-              getConsoleWidth = fun () -> 0 }
+              getConsoleWidth = fun () -> 60
+              getLengthInBufferCells = String.length }
 
         let actual = loop args input state pos context
         actual |> List.length |> shouldEqual 5
@@ -144,7 +193,8 @@ module loop =
               propMap = propMap
               writeScreen = writeScreen
               getKey = m.getKey
-              getConsoleWidth = fun () -> 0 }
+              getConsoleWidth = fun () -> 60
+              getLengthInBufferCells = String.length }
 
         let actual = loop args input state pos context
         actual |> List.length |> shouldEqual 2
@@ -174,8 +224,9 @@ module loop =
               getKey = m.getKey
               getConsoleWidth =
                 fun () ->
-                    rui.x <- 80
-                    80 }
+                    rui.width <- 80
+                    80
+              getLengthInBufferCells = String.length }
 
         let actual = loop args input state pos context
         actual |> List.length |> shouldEqual 1

diff --git a/src/pocof.Test/PocofData.fs b/src/pocof.Test/PocofData.fs
@@ -177,7 +177,7 @@ module initConfig =
             { QueryState =
                 { Query = ":name"
                   Cursor = 5
-                  WindowBeginningX = 0
+                  WindowBeginningCursor = 0
                   WindowWidth =
                     60
                     - (String.length "prompt>")
@@ -264,7 +264,7 @@ module QueryState =
         let qs q x =
             { Query = q
               Cursor = x
-              WindowBeginningX = 0
+              WindowBeginningCursor = 0
               WindowWidth = 0 }
 
         [<Fact>]

diff --git a/src/pocof.Test/PocofHandle.fs b/src/pocof.Test/PocofHandle.fs
@@ -11,7 +11,7 @@ module invokeAction =
         { QueryState =
             { Query = ""
               Cursor = 0
-              WindowBeginningX = 0
+              WindowBeginningCursor = 0
               WindowWidth = 0 }
           QueryCondition =
             { Matcher = MATCH

diff --git a/src/pocof.Test/PocofQuery.fs b/src/pocof.Test/PocofQuery.fs
@@ -9,7 +9,7 @@ let initState () : PocofData.InternalState =
     { QueryState = {
         Query = ""
         Cursor = 0
-        WindowBeginningX = 0
+        WindowBeginningCursor = 0
         WindowWidth = 0}
       QueryCondition =
         { Matcher = PocofData.Matcher.MATCH