Merge branch 'main' into main

tyron12233 · Feb 28, 2022 · 17d0992 · 17d0992
2 parents 0097c05 + 900cd67
commit 17d0992
Show file tree

Hide file tree

Showing 72 changed files with 4,550 additions and 965 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/assets/textmate/QuietLight.tmTheme b/app/src/main/assets/textmate/QuietLight.tmTheme
@@ -319,8 +319,6 @@
                 </string>
                 <key>settings</key>
                 <dict>
-                    <key>fontStyle</key>
-                    <string>italic</string>
                     <key>foreground</key>
                     <string>#91B3E0</string>
                 </dict>

diff --git a/app/src/main/assets/textmate/darcula.json b/app/src/main/assets/textmate/darcula.json
@@ -3,7 +3,7 @@
   "settings": [
     {
       "settings": {
-        "background": "#242424",
+        "background": "#1F1A1B",
         "foreground": "#cccccc",
         "lineHighlight": "#2B2B2B",
         "selection": "#214283",
@@ -506,6 +506,14 @@
       "settings": {
         "foreground": "#FFC66D"
       }
+    },
+
+    {
+      "name": "XML Namespace prefix",
+      "scope": "entity.name.tag.namesapce.xml",
+      "settings": {
+        "foreground": "#9876AA"
+      }
     }
   ]
 }
diff --git a/app/src/main/assets/textmate/groovy/language-configuration.json b/app/src/main/assets/textmate/groovy/language-configuration.json
@@ -0,0 +1,43 @@
+{
+  "comments": {
+    "lineComment": "//",
+    "blockComment": ["/*", "*/"]
+  },
+  "brackets": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+  "autoClosingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"], {
+      "open": "\"",
+      "close": "\"",
+      "notIn": ["string"]
+    }, {
+      "open": "'",
+      "close": "'",
+      "notIn": ["string"]
+    }, {
+      "open": "/**",
+      "close": " */",
+      "notIn": ["string"]
+    }
+  ],
+  "surroundingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+    ["\"", "\""],
+    ["'", "'"],
+    ["<", ">"]
+  ],
+  "folding": {
+    "offSide": false,
+    "markers": {
+      "start": "^\\s*//\\s*#region",
+      "end": "^\\s*//\\s*#endregion"
+    }
+  }
+}