From 0c2c6860229ea4a116d7966dfb59aa5b7bfe248e Mon Sep 17 00:00:00 2001
From: SuperMonster003 <wu2du2mo2gu0@gmail.com>
Date: Sat, 18 Jan 2025 23:44:12 +0800
Subject: [PATCH] =?UTF-8?q?6.6.2=20-=20Alpha2=20-=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=96=E8=BE=91=E5=99=A8=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=A1=8C=E5=B0=BE=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/edit/ClassSearchDialogBuilder.java       |  3 ++-
 .../autojs/autojs/ui/edit/editor/CodeEditor.kt  | 17 ++++++++++++-----
 version.properties                              |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java
index f7be04bd..eca5559f 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java
@@ -3,6 +3,7 @@ package org.autojs.autojs.ui.edit;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.EditText;
@@ -41,7 +42,7 @@ public class ClassSearchDialogBuilder extends MaterialDialog.Builder {
 
     public ClassSearchDialogBuilder(@NonNull Context context) {
         super(new ContextThemeWrapper(context, R.style.AppTheme));
-        mHandler = new Handler();
+        mHandler = new Handler(Looper.getMainLooper());
         initViews(getContext());
         AndroidClassIndices.getInstance(getContext());
     }
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.kt b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.kt
index d9032b2e..cc8bd714 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.kt
@@ -250,20 +250,27 @@ class CodeEditor : HVScrollView {
         val layout = codeEditText.layout
         val line = LayoutHelper.getLineOfChar(layout, minOf(codeEditText.selectionStart, codeEditText.selectionEnd))
         if (line >= 0 && line < layout.lineCount) {
-            codeEditText.setSelection(layout.getLineEnd(line))
-            // codeEditText.setSelection(layout.getLineEnd(line) - 1)
+            val lineEnd = layout.getLineEnd(line)
+            val text = codeEditText.text.toString()
+            val finalPosition = when {
+                lineEnd > 0 && text[lineEnd - 1] == '\n' -> {
+                    lineEnd - 1
+                }
+                else -> lineEnd
+            }
+            codeEditText.setSelection(finalPosition)
         }
     }
 
-    fun setTheme(theme: Theme?) {
+    fun setTheme(theme: Theme) {
         mTheme = theme
-        setBackgroundColor(mTheme!!.backgroundColor)
+        setBackgroundColor(theme.backgroundColor)
         mJavaScriptHighlighter.setTheme(theme)
         val text = codeEditText.text
         if (text != null) {
             mJavaScriptHighlighter.updateTokens(text.toString())
         }
-        codeEditText.setTheme(mTheme!!)
+        codeEditText.setTheme(theme)
         invalidate()
     }
 
diff --git a/version.properties b/version.properties
index 41f0d7b7..9a8b2a3c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
-#Wed Jan 15 01:24:51 CST 2025
-BUILD_TIME=1736875491255
+#Sat Jan 18 23:40:06 CST 2025
+BUILD_TIME=1737214806122
 COMPILE_SDK_VERSION=34
 JAVA_VERSION=23
 JAVA_VERSION_MIN_RADICAL=0
@@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
 TARGET_SDK_VERSION=34
 TARGET_SDK_VERSION_INRT=29
-VERSION_BUILD=2973
+VERSION_BUILD=2976
 VERSION_NAME=6.6.2 Alpha2
 VSCODE_EXT_REQUIRED_VERSION=1.0.8