feat: Improvement in sora editor

Innovative-CST · Aug 13, 2023 · de5d706 · de5d706
1 parent 96ed175
commit de5d706
Show file tree

Hide file tree

Showing 47 changed files with 54,470 additions and 2,065 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -92,7 +92,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.squareup.okhttp3:okhttp:3.9.1'
     def editorGroupId = "io.github.Rosemoe.sora-editor"
-    implementation platform("$editorGroupId:bom:0.21.1")
+    implementation platform("$editorGroupId:bom:0.22.0")
     implementation "$editorGroupId:editor"
     implementation "$editorGroupId:language-textmate"
     implementation 'jp.co.cyberagent.android:gpuimage:2.1.0'

diff --git a/app/src/main/java/android/code/editor/MyApplication.java b/app/src/main/java/android/code/editor/MyApplication.java
@@ -25,7 +25,11 @@
 import android.content.Intent;
 import android.os.Process;
 import android.util.Log;
+import android.widget.Toast;
 import com.google.android.material.color.DynamicColors;
+import editor.tsd.editors.sora.lang.textmate.provider.TextMateProvider;
+import io.github.rosemoe.sora.langs.textmate.registry.FileProviderRegistry;
+import io.github.rosemoe.sora.langs.textmate.registry.provider.AssetsFileResolver;
 
 public class MyApplication extends Application {
   private static Context mApplicationContext;
@@ -65,5 +69,11 @@ public void uncaughtException(Thread thread, Throwable throwable) {
           }
         });
     super.onCreate();
+    FileProviderRegistry.getInstance().addFileProvider(new AssetsFileResolver(getAssets()));
+    try {
+      TextMateProvider.loadGrammars();
+    } catch (Exception e) {
+      Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG).show();
+    }
   }
 }
diff --git a/editor/build.gradle b/editor/build.gradle
@@ -31,8 +31,9 @@ android {
 }
 
 dependencies {
+    implementation 'com.google.code.gson:gson:2.8.7'
     def editorGroupId = "io.github.Rosemoe.sora-editor"
-    implementation platform("$editorGroupId:bom:0.21.1")
+    implementation platform("$editorGroupId:bom:0.22.0")
     implementation "$editorGroupId:editor"
     implementation "$editorGroupId:language-textmate"
     implementation "$editorGroupId:language-java"

diff --git a/editor/src/main/assets/Editor/SoraEditor/bat/language-configuration.json b/editor/src/main/assets/Editor/SoraEditor/bat/language-configuration.json
@@ -0,0 +1,29 @@
+{
+	"comments": {
+		"lineComment": "@REM"
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		{ "open": "\"", "close": "\"", "notIn": ["string"] }
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["%", "%"],
+		["\"", "\""]
+	],
+	"folding": {
+		"markers": {
+			"start": "^\\s*(::|REM|@REM)\\s*#region",
+			"end": "^\\s*(::|REM|@REM)\\s*#endregion"
+		}
+	}
+}