Modify caret move

naotsugu · Feb 1, 2024 · 7a20468 · 7a20468
1 parent b2a1aa4
commit 7a20468
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 20 deletions.
diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/Caret.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/Caret.java
@@ -64,6 +64,16 @@ public interface Caret {
      */
     void down();
 
+    /**
+     * Move the caret to the home.
+     */
+    void home();
+
+    /**
+     * Move the caret to the end.
+     */
+    void end();
+
     /**
      * Get the point at caret.
      * Return {@code null} if caret is off-screen.

diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/Caret1.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/Caret1.java
@@ -206,6 +206,16 @@ public void down() {
         y = next.offsetY();
     }
 
+    @Override
+    public void home() {
+
+    }
+
+    @Override
+    public void end() {
+
+    }
+
 
     @Override
     public OffsetPoint caretPoint() {

diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/Caret2.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/Caret2.java
@@ -70,6 +70,18 @@ public void down() {
         moons.forEach(CaretLine::down);
     }
 
+    @Override
+    public void home() {
+        main.home();
+        moons.forEach(CaretLine::home);
+    }
+
+    @Override
+    public void end() {
+        main.end();
+        moons.forEach(CaretLine::end);
+    }
+
     @Override
     public OffsetPoint caretPoint() {
         if (offset() == 0) {

diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/CaretLine.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/CaretLine.java
@@ -156,6 +156,31 @@ public void down() {
     }
 
 
+    public void home() {
+        boolean skipWhitespace = true;
+        if (line.offset() != bar.offset()) {
+            if (bar.offset() - line.offset() < 36 &&
+                line.text().substring(0, (int) (bar.offset() - line.offset())).trim().isEmpty()) {
+                skipWhitespace = false;
+            }
+            at(line.offset());
+        }
+        if (skipWhitespace) {
+            if (Character.isWhitespace(line.charAt(bar.offset()))) {
+                while (bar.offset() < line.tailOffset() &&
+                    Character.isWhitespace(line.charAt(bar.offset()))) {
+                    right();
+                }
+            }
+        }
+    }
+
+
+    public void end() {
+        at(line.tailOffset() - line.endMarkCount());
+    }
+
+
     public void refresh() {
         long offset = bar.offset();
         line = offsetToLine.apply(offset);

diff --git a/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/EditorModelImpl.java b/modules/ui-model/src/main/java/com/mammb/code/editor/ui/model/impl/EditorModelImpl.java
@@ -499,31 +499,13 @@ public void moveCaretDown() {
     @Override
     public void moveCaretLineHome() {
         vScrollToCaret();
-        LayoutLine line = texts.layoutLine(caret.offset());
-        boolean skipWhitespace = true;
-        if (line.offset() != caret.offset()) {
-            if (caret.offset() - line.offset() < 36 &&
-                line.text().substring(0, (int) (caret.offset() - line.offset())).trim().isEmpty()) {
-                skipWhitespace = false;
-            }
-            caret.at(line.offset(), true);
-        }
-        if (skipWhitespace) {
-            if (Character.isWhitespace(line.charAt(caret.offset()))) {
-                while (caret.offset() < line.tailOffset() &&
-                    Character.isWhitespace(line.charAt(caret.offset()))) {
-                    caret.right();
-                }
-            }
-        }
+        caret.home();
         screen.hScrollTo(caret.x());
     }
     @Override
     public void moveCaretLineEnd() {
         vScrollToCaret();
-        LayoutLine line = texts.layoutLine(caret.offset());
-        long offset = line.tailOffset() - line.endMarkCount();
-        caret.at(offset, true);
+        caret.end();
         screen.hScrollTo(caret.x());
     }
     // </editor-fold>