mActionToId = new HashMap<>();
@Override
- public void fillMenu(DataContext context, Menu menu, String place, boolean isContext, boolean isToolbar) {
+ public void fillMenu(DataContext context,
+ Menu menu,
+ String place,
+ boolean isContext,
+ boolean isToolbar) {
// Inject values
context.putData(CommonDataKeys.CONTEXT, context);
if (Build.VERSION_CODES.P <= Build.VERSION.SDK_INT) {
@@ -38,11 +46,9 @@ public void fillMenu(DataContext context, Menu menu, String place, boolean isCon
for (AnAction value : mIdToAction.values()) {
- AnActionEvent event = new AnActionEvent(context,
- place,
- value.getTemplatePresentation(),
- isContext,
- isToolbar);
+ AnActionEvent event =
+ new AnActionEvent(context, place, value.getTemplatePresentation(), isContext,
+ isToolbar);
event.setPresentation(value.getTemplatePresentation());
@@ -94,10 +100,7 @@ private void fillMenu(Menu menu, AnAction action, AnActionEvent event) {
menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
}
menuItem.setIcon(presentation.getIcon());
- menuItem.setOnMenuItemClickListener(item -> {
- action.actionPerformed(event);
- return true;
- });
+ menuItem.setOnMenuItemClickListener(item -> performAction(action, event));
}
private void fillMenu(int id, Menu menu, ActionGroup group, AnActionEvent event) {
@@ -110,18 +113,14 @@ private void fillMenu(int id, Menu menu, ActionGroup group, AnActionEvent event)
event.setPresentation(child.getTemplatePresentation());
child.update(event);
if (event.getPresentation().isVisible()) {
- MenuItem add = menu.add(id, Menu.NONE, Menu.NONE,
- event.getPresentation().getText());
+ MenuItem add = menu.add(id, Menu.NONE, Menu.NONE, event.getPresentation().getText());
add.setEnabled(event.getPresentation().isEnabled());
add.setIcon(event.getPresentation().getIcon());
- add.setOnMenuItemClickListener(item -> {
- child.actionPerformed(event);
- return true;
- });
+ add.setOnMenuItemClickListener(item -> performAction(child, event));
}
}
}
-
+
private void fillSubMenu(SubMenu subMenu, AnAction action, AnActionEvent event) {
Presentation presentation = event.getPresentation();
@@ -160,10 +159,27 @@ private void fillSubMenu(SubMenu subMenu, AnAction action, AnActionEvent event)
}
menuItem.setIcon(presentation.getIcon());
menuItem.setContentDescription(presentation.getDescription());
- menuItem.setOnMenuItemClickListener(item -> {
+ menuItem.setOnMenuItemClickListener(item -> performAction(action, event));
+ }
+
+ private boolean performAction(AnAction action, AnActionEvent event) {
+ try {
action.actionPerformed(event);
- return true;
- });
+ } catch (Throwable e) {
+ ClipboardManager clipboardManager = event.getDataContext()
+ .getSystemService(ClipboardManager.class);
+ new MaterialAlertDialogBuilder(event.getDataContext()).setTitle(
+ "Unable to perform action")
+ .setMessage(e.getMessage())
+ .setPositiveButton(android.R.string.ok, null)
+ .setNegativeButton(android.R.string.copy,
+ (d, w) -> clipboardManager.setPrimaryClip(
+ ClipData.newPlainText("Error report",
+ Log.getStackTraceString(e))))
+ .show();
+ return false;
+ }
+ return true;
}
@Override
@@ -197,6 +213,19 @@ public boolean isGroup(@NonNull String actionId) {
return isGroup(mIdToAction.get(actionId));
}
+ @Override
+ public void performAction(String id, AnActionEvent event) {
+ AnAction anAction = mIdToAction.get(id);
+ if (anAction != null) {
+ anAction.update(event);
+ if (anAction.getTemplatePresentation().isVisible()) {
+ anAction.actionPerformed(event);
+ }
+ } else {
+ // TODO: throw exception
+ }
+ }
+
private boolean isGroup(AnAction action) {
return action instanceof ActionGroup;
}
diff --git a/actions-api/src/main/java/com/tyron/actions/menu/ActionPopupMenu.java b/actions-api/src/main/java/com/tyron/actions/menu/ActionPopupMenu.java
new file mode 100644
index 000000000..1539a69b7
--- /dev/null
+++ b/actions-api/src/main/java/com/tyron/actions/menu/ActionPopupMenu.java
@@ -0,0 +1,37 @@
+package com.tyron.actions.menu;
+
+import android.view.View;
+import android.widget.PopupMenu;
+
+import com.tyron.actions.ActionManager;
+import com.tyron.actions.DataContext;
+
+/**
+ * A helper class to show a PopupMenu inflated with actions at the given place
+ */
+public class ActionPopupMenu {
+
+ /**
+ * Creates and immediately shows the popup menu.
+ */
+ public static ActionPopupMenu createAndShow(View anchor, DataContext dataContext, String place) {
+ ActionPopupMenu popupMenu = new ActionPopupMenu(anchor, dataContext, place);
+ popupMenu.show();
+ return popupMenu;
+ }
+
+ private final PopupMenu popupMenu;
+
+ public ActionPopupMenu(View anchor, DataContext dataContext, String place) {
+ popupMenu = new PopupMenu(dataContext, anchor);
+ ActionManager.getInstance().fillMenu(dataContext, popupMenu.getMenu(), place, true, false);
+ }
+
+ public void show() {
+ popupMenu.show();
+ }
+
+ public void dismiss() {
+ popupMenu.dismiss();
+ }
+}
diff --git a/android-stubs/build.gradle b/android-stubs/build.gradle
index 2306b31ff..5f1dff5cd 100644
--- a/android-stubs/build.gradle
+++ b/android-stubs/build.gradle
@@ -4,6 +4,8 @@ plugins {
dependencies {
compileOnlyApi files('libs/android.jar')
+
+ compileOnly 'androidx.annotation:annotation:1.3.0'
}
java {
diff --git a/android-stubs/src/main/java/androidx/appcompat/app/AlertDialog.java b/android-stubs/src/main/java/androidx/appcompat/app/AlertDialog.java
new file mode 100644
index 000000000..d825f25f5
--- /dev/null
+++ b/android-stubs/src/main/java/androidx/appcompat/app/AlertDialog.java
@@ -0,0 +1,241 @@
+package androidx.appcompat.app;
+
+import android.content.DialogInterface;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListAdapter;
+
+import androidx.annotation.ArrayRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
+import androidx.appcompat.app.AlertDialog;
+
+public class AlertDialog {
+ public void dismiss() {
+ throw new RuntimeException("Stub!");
+ }
+
+ public static class Builder {
+ @NonNull
+ public AlertDialog create() {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setTitle(@StringRes int titleId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setTitle(@Nullable CharSequence title) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setCustomTitle(@Nullable View customTitleView) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setMessage(@StringRes int messageId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setMessage(@Nullable CharSequence message) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setIcon(@DrawableRes int iconId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setIcon(@Nullable Drawable icon) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setIconAttribute(@AttrRes int attrId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setPositiveButton(
+ @StringRes int textId, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setPositiveButton(
+ @Nullable CharSequence text, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setPositiveButtonIcon(@Nullable Drawable icon) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setNegativeButton(
+ @StringRes int textId, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setNegativeButton(
+ @Nullable CharSequence text, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setNegativeButtonIcon(@Nullable Drawable icon) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setNeutralButton(
+ @StringRes int textId, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setNeutralButton(
+ @Nullable CharSequence text, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setNeutralButtonIcon(@Nullable Drawable icon) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setCancelable(boolean cancelable) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setOnCancelListener(
+ @Nullable DialogInterface.OnCancelListener onCancelListener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setOnDismissListener(
+ @Nullable DialogInterface.OnDismissListener onDismissListener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setOnKeyListener(@Nullable DialogInterface.OnKeyListener onKeyListener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setItems(
+ @ArrayRes int itemsId, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setItems(
+ @Nullable CharSequence[] items, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setAdapter(
+ @Nullable final ListAdapter adapter, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setCursor(
+ @Nullable final Cursor cursor,
+ @Nullable final DialogInterface.OnClickListener listener,
+ @NonNull String labelColumn) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setMultiChoiceItems(
+ @ArrayRes int itemsId,
+ @Nullable boolean[] checkedItems,
+ @Nullable final DialogInterface.OnMultiChoiceClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setMultiChoiceItems(
+ @Nullable CharSequence[] items,
+ @Nullable boolean[] checkedItems,
+ @Nullable final DialogInterface.OnMultiChoiceClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setMultiChoiceItems(
+ @Nullable Cursor cursor,
+ @NonNull String isCheckedColumn,
+ @NonNull String labelColumn,
+ @Nullable final DialogInterface.OnMultiChoiceClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setSingleChoiceItems(
+ @ArrayRes int itemsId, int checkedItem, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setSingleChoiceItems(
+ @Nullable Cursor cursor,
+ int checkedItem,
+ @NonNull String labelColumn,
+ @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setSingleChoiceItems(
+ @Nullable CharSequence[] items, int checkedItem, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setSingleChoiceItems(
+ @Nullable ListAdapter adapter, int checkedItem, @Nullable final DialogInterface.OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setOnItemSelectedListener(
+ @Nullable final AdapterView.OnItemSelectedListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setView(int layoutResId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public AlertDialog.Builder setView(@Nullable View view) {
+ throw new RuntimeException("Stub!");
+ }
+
+ public AlertDialog show() {
+ throw new RuntimeException("Stub!");
+ }
+ }
+}
diff --git a/android-stubs/src/main/java/com/google/android/material/dialog/MaterialAlertDialogBuilder.java b/android-stubs/src/main/java/com/google/android/material/dialog/MaterialAlertDialogBuilder.java
new file mode 100644
index 000000000..2209880f3
--- /dev/null
+++ b/android-stubs/src/main/java/com/google/android/material/dialog/MaterialAlertDialogBuilder.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.material.dialog;
+
+import android.content.Context;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.DialogInterface.OnClickListener;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.DialogInterface.OnKeyListener;
+import android.content.DialogInterface.OnMultiChoiceClickListener;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListAdapter;
+
+import androidx.annotation.ArrayRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+
+/**
+ * An extension of {@link AlertDialog.Builder} for use with a Material theme (e.g.,
+ * Theme.MaterialComponents).
+ *
+ * This Builder must be used in order for AlertDialog objects to respond to color and shape
+ * theming provided by Material themes.
+ *
+ *
The type of dialog returned is still an {@link AlertDialog}; there is no specific Material
+ * implementation of {@link AlertDialog}.
+ */
+public class MaterialAlertDialogBuilder extends AlertDialog.Builder {
+
+ public MaterialAlertDialogBuilder(@NonNull Context context) {
+ throw new RuntimeException("Stub!");
+ }
+
+ public MaterialAlertDialogBuilder(@NonNull Context context, int overrideThemeResId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public AlertDialog create() {
+ throw new RuntimeException("Stub!");
+ }
+
+ @Nullable
+ public Drawable getBackground() {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public MaterialAlertDialogBuilder setBackground(@Nullable Drawable background) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public MaterialAlertDialogBuilder setBackgroundInsetStart(@Px int backgroundInsetStart) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public MaterialAlertDialogBuilder setBackgroundInsetTop(@Px int backgroundInsetTop) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public MaterialAlertDialogBuilder setBackgroundInsetEnd(@Px int backgroundInsetEnd) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ public MaterialAlertDialogBuilder setBackgroundInsetBottom(@Px int backgroundInsetBottom) {
+ throw new RuntimeException("Stub!");
+ }
+
+ // The following methods are all pass-through methods used to specify the return type for the
+ // builder chain.
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setTitle(@StringRes int titleId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setTitle(@Nullable CharSequence title) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setCustomTitle(@Nullable View customTitleView) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setMessage(@StringRes int messageId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setMessage(@Nullable CharSequence message) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setIcon(@DrawableRes int iconId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setIcon(@Nullable Drawable icon) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setIconAttribute(@AttrRes int attrId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setPositiveButton(
+ @StringRes int textId, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setPositiveButton(
+ @Nullable CharSequence text, @Nullable final OnClickListener listener) {
+ return (MaterialAlertDialogBuilder) super.setPositiveButton(text, listener);
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setPositiveButtonIcon(@Nullable Drawable icon) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setNegativeButton(
+ @StringRes int textId, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setNegativeButton(
+ @Nullable CharSequence text, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setNegativeButtonIcon(@Nullable Drawable icon) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setNeutralButton(
+ @StringRes int textId, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setNeutralButton(
+ @Nullable CharSequence text, @Nullable final OnClickListener listener) {
+ return (MaterialAlertDialogBuilder) super.setNeutralButton(text, listener);
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setNeutralButtonIcon(@Nullable Drawable icon) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setCancelable(boolean cancelable) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setOnCancelListener(
+ @Nullable OnCancelListener onCancelListener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setOnDismissListener(
+ @Nullable OnDismissListener onDismissListener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setOnKeyListener(@Nullable OnKeyListener onKeyListener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setItems(
+ @ArrayRes int itemsId, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setItems(
+ @Nullable CharSequence[] items, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setAdapter(
+ @Nullable final ListAdapter adapter, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setCursor(
+ @Nullable final Cursor cursor,
+ @Nullable final OnClickListener listener,
+ @NonNull String labelColumn) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setMultiChoiceItems(
+ @ArrayRes int itemsId,
+ @Nullable boolean[] checkedItems,
+ @Nullable final OnMultiChoiceClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setMultiChoiceItems(
+ @Nullable CharSequence[] items,
+ @Nullable boolean[] checkedItems,
+ @Nullable final OnMultiChoiceClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setMultiChoiceItems(
+ @Nullable Cursor cursor,
+ @NonNull String isCheckedColumn,
+ @NonNull String labelColumn,
+ @Nullable final OnMultiChoiceClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setSingleChoiceItems(
+ @ArrayRes int itemsId, int checkedItem, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setSingleChoiceItems(
+ @Nullable Cursor cursor,
+ int checkedItem,
+ @NonNull String labelColumn,
+ @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setSingleChoiceItems(
+ @Nullable CharSequence[] items, int checkedItem, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setSingleChoiceItems(
+ @Nullable ListAdapter adapter, int checkedItem, @Nullable final OnClickListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setOnItemSelectedListener(
+ @Nullable final AdapterView.OnItemSelectedListener listener) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setView(int layoutResId) {
+ throw new RuntimeException("Stub!");
+ }
+
+ @NonNull
+ @Override
+ public MaterialAlertDialogBuilder setView(@Nullable View view) {
+ throw new RuntimeException("Stub!");
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 8068825ec..43597865d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,23 +2,32 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
android {
- compileSdkVersion 31
- buildToolsVersion "30.0.3"
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
- applicationId "com.tyron.code"
- minSdkVersion 26
- targetSdkVersion 31
- versionCode 9
- versionName "0.2.4.1 ALPHA"
+ applicationId rootProject.ext.applicationId
+ minSdkVersion rootProject.ext.minSdkVersion
+ targetSdkVersion rootProject.ext.targetSdkVersion
+ versionCode rootProject.ext.versionCode
+ versionName rootProject.ext.versionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
-
compileOptions {
coreLibraryDesugaringEnabled = true
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+
+ testOptions {
+ unitTests {
+ includeAndroidResources = true
+ }
+
+ unitTests.all {
+ systemProperty 'robolectric.enabledSdks', '26'
+ }
}
buildTypes {
@@ -28,53 +37,133 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+
+ packagingOptions {
+ resources.excludes += "license/*"
+
+ exclude "plugin.properties"
+ exclude "plugin.xml"
+ exclude "about.html"
+ exclude ".api_description"
+ exclude "about_files/*"
+ exclude "META-INF/eclipse.inf"
+ exclude "META-INF/INDEX.LIST"
+ exclude "META-INF/DEPENDENCIES"
+ exclude "META-INF/LGPL2.1"
+ exclude "META-INF/groovy-release-info.properties"
+ exclude "META-INF/AL2.0"
+ exclude "README.md"
+ pickFirst "META-INF/sisu/*"
+ pickFirst "*/*.kotlin_builtins"
+ pickFirst "*/*/*.kotlin_builtins"
+ pickFirst "*/*/*/*.kotlin_builtins"
+ }
}
configurations.implementation {
exclude group: "org.jetbrains", module: "annotations"
+ exclude group: 'com.android.tools', module: 'common'
+ exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
}
dependencies {
+ implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.3'
+ implementation projects.terminalview
+
+ // TODO: Removed these modules, the features that are using these modules
+ // should be moved into its own module.
+
+ // TODO: language processing should be on its own module
+ implementation 'org.antlr:antlr4-runtime:4.9.2'
+ implementation files (
+ 'libs/language-base-0.5.0.jar',
+ 'libs/language-java-0.5.0.jar'
+ )
+
+ // TODO: completion providers should not be included on the main module
+ // alternate editor impl
+ implementation 'com.blacksquircle.ui:editorkit:2.1.2'
+
+ implementation project(path: ':code-editor')
+ implementation project(path: ':xml-completion')
+ implementation project(path: ':build-tools:viewbinding-inject')
+ implementation project(path: ':build-tools:xml-repository')
+ implementation project(path: ':java-completion')
+ implementation projects.eventManager
+ // not used for compilation, but for analysis
+ implementation project(path: ':build-tools:javac')
+
+ implementation project(path: ':language-api')
+
+ // groovy support
+ implementation projects.buildTools.builderBaseServicesGroovy
+
+ implementation projects.buildTools.builderLauncher
+ implementation projects.buildTools.builderBaseServices
+ implementation projects.buildTools.builderCore
+ implementation projects.buildTools.builderCoreApi
+ implementation projects.buildTools.builderLogging
+ implementation projects.buildTools.builderLauncher
+ implementation projects.buildTools.builderToolingApiBuilders
+ implementation projects.buildTools.builderBuildOperations
+ implementation projects.buildTools.builderLogging
+ implementation projects.buildTools.builderEnterpriseWorkers
+ implementation projects.buildTools.builderConfigurationCache
+ implementation projects.buildTools.builderPlugins
+ implementation projects.buildTools.builderJava
+ implementation projects.buildTools.builderNative
+ implementation project(path: ":build-tools:codeassist-builder-plugin")
+ implementation projects.buildTools.builderIde
+ implementation projects.buildTools.builderToolingApi
+ // emulating console
+ implementation 'org.fusesource.jansi:jansi:2.4.0'
+
+ implementation project(path: ':build-tools:builder-api')
+ implementation project(path: ':build-tools:builder-java')
implementation project(path: ':build-tools:build-logic')
+ implementation project(path: ':build-tools:manifmerger')
+ implementation project(path: ':build-tools:project')
+ implementation project(path: ':build-tools:logging')
implementation project(path: ':build-tools:jaxp:jaxp-internal')
implementation project(path: ':build-tools:jaxp:xml')
implementation project(path: ':common')
implementation project(path: ':build-tools:lint')
implementation project(path: ':layout-preview')
implementation project(path: ':kotlin-completion')
- implementation 'io.github.medyo:android-about-page:2.0.0'
-
+
+ // Virtual File System
+ implementation 'org.apache.commons:commons-vfs2:2.9.0'
+
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation project(path: ':dependency-resolver')
implementation project(path: ':treeview')
- // completions
- implementation project(path: ':code-editor')
- implementation project(path: ':xml-completion')
- implementation project(path: ':java-completion')
-
// apis
implementation project(path: ':completion-api')
implementation project(path: ':actions-api')
implementation project(path: ':editor-api')
implementation project(path: ':fileeditor-api')
- coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
+ // formatters
+ implementation project(path: ':google-java-format')
- implementation 'androidx.appcompat:appcompat:1.4.0'
- implementation 'androidx.core:core:1.7.0'
+ // about
+ implementation 'com.github.daniel-stoneuk:material-about-library:3.1.2'
- implementation 'com.google.android.material:material:1.4.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+ implementation 'androidx.appcompat:appcompat:1.4.1'
+ implementation 'androidx.core:core:1.7.0'
+ implementation 'com.google.android.material:material:1.5.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'androidx.viewpager:viewpager:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
- implementation 'androidx.lifecycle:lifecycle-livedata-core:2.4.0'
- implementation 'androidx.lifecycle:lifecycle-viewmodel:2.4.0'
- implementation 'androidx.lifecycle:lifecycle-livedata:2.4.0'
- implementation 'androidx.fragment:fragment:1.4.0'
- implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+ implementation 'androidx.lifecycle:lifecycle-livedata-core:2.4.1'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel:2.4.1'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+ implementation 'androidx.lifecycle:lifecycle-livedata:2.4.1'
+ implementation 'androidx.fragment:fragment:1.4.1'
+ implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
implementation 'androidx.activity:activity:1.4.0'
implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
implementation 'com.github.angads25:filepicker:1.1.1'
@@ -82,26 +171,26 @@ dependencies {
// image loading
implementation 'com.github.bumptech.glide:glide:4.12.0'
- implementation 'org.antlr:antlr4-runtime:4.9.2'
-
-
- implementation files (
- 'libs/google-java-format-1.7.jar',
- 'libs/language-base-0.5.0.jar',
- 'libs/language-java-0.5.0.jar'
- )
-
- implementation 'androidx.preference:preference:1.1.1'
+ implementation 'androidx.preference:preference:1.2.0'
implementation 'com.github.TutorialsAndroid:crashx:v6.0.19'
+ implementation project(path: ':eclipse-formatter')
+ implementation project(path: ':build-tools:builder-core')
+
+ runtimeOnly projects.javaStubs
//debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+ // testing
testImplementation 'junit:junit:4.13.2'
testImplementation "com.google.truth:truth:1.1.3"
- testImplementation "org.robolectric:robolectric:4.2.1"
- testImplementation 'androidx.test:core:1.4.0'
testImplementation 'org.mockito:mockito-core:1.10.19'
+ testImplementation "org.robolectric:robolectric:4.7.3"
+ debugImplementation 'androidx.test:core:1.4.0'
+ debugImplementation 'androidx.fragment:fragment-testing:1.4.1'
+
androidTestImplementation 'com.google.truth:truth:1.1.3'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
}
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index a069db6e2..07a75be86 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
- "versionCode": 9,
- "versionName": "0.2.4.1 ALPHA",
+ "versionCode": 20,
+ "versionName": "0.2.9 ALPHA",
"outputFile": "app-release.apk"
}
],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b603b7342..6e81fdcb3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,22 +19,25 @@
android:largeHeap="true"
android:requestLegacyExternalStorage="true"
android:resizeableActivity="true"
- android:theme="@style/AppTheme"
+ android:supportsRtl="true"
tools:targetApi="q">
+ android:exported="false">
+
+ android:label="@string/title_activity_settings"
+ android:theme="@style/AppThemeNew" />
+ android:theme="@style/AppThemeNew"
+ android:windowSoftInputMode="adjustResize">
@@ -42,8 +45,6 @@
-
-
+
+
+ author
+ Martin Kühl
+ comment
+ Based on the Quiet Light theme for Espresso by Ian Beck.
+ name
+ Quiet Light
+ settings
+
+
+ settings
+
+ background
+ #F5F5F5
+ caret
+ #000000
+ foreground
+ #333333
+ invisibles
+ #AAAAAA
+ lineHighlight
+ #E4F6D4
+ selection
+ #C9D0D9
+
+
+
+ name
+ Comments
+ scope
+ comment, punctuation.definition.comment
+ settings
+
+ fontStyle
+ italic
+ foreground
+ #AAAAAA
+
+
+
+ name
+ Comments: Preprocessor
+ scope
+ comment.block.preprocessor
+ settings
+
+ fontStyle
+
+ foreground
+ #AAAAAA
+
+
+
+ name
+ Comments: Documentation
+ scope
+ comment.documentation, comment.block.documentation
+ settings
+
+ foreground
+ #448C27
+
+
+
+ name
+ Invalid - Deprecated
+ scope
+ invalid.deprecated
+ settings
+
+ background
+ #96000014
+
+
+
+ name
+ Invalid - Illegal
+ scope
+ invalid.illegal
+ settings
+
+ background
+ #96000014
+ foreground
+ #660000
+
+
+
+ name
+ Operators
+ scope
+ keyword.operator
+ settings
+
+ foreground
+ #777777
+
+
+
+ name
+ Keywords
+ scope
+ keyword, storage
+ settings
+
+ foreground
+ #4B83CD
+
+
+
+ name
+ Types
+ scope
+ storage.type, support.type
+ settings
+
+ foreground
+ #7A3E9D
+
+
+
+ name
+ Language Constants
+ scope
+ constant.language, support.constant, variable.language
+ settings
+
+ foreground
+ #AB6526
+
+
+
+ name
+ Variables
+ scope
+ variable, support.variable
+ settings
+
+ foreground
+ #7A3E9D
+
+
+
+ name
+ Functions
+ scope
+ entity.name.function, support.function
+ settings
+
+ fontStyle
+ bold
+ foreground
+ #AA3731
+
+
+
+ name
+ Classes
+ scope
+ entity.name.type, entity.other.inherited-class, support.class
+ settings
+
+ fontStyle
+ bold
+ foreground
+ #7A3E9D
+
+
+
+ name
+ Exceptions
+ scope
+ entity.name.exception
+ settings
+
+ foreground
+ #660000
+
+
+
+ name
+ Sections
+ scope
+ entity.name.section
+ settings
+
+ fontStyle
+ bold
+
+
+
+ name
+ Numbers, Characters
+ scope
+ constant.numeric, constant.character, constant
+ settings
+
+ foreground
+ #AB6526
+
+
+
+ name
+ Strings
+ scope
+ string
+ settings
+
+ foreground
+ #448C27
+
+
+
+ name
+ Strings: Escape Sequences
+ scope
+ constant.character.escape
+ settings
+
+ foreground
+ #777777
+
+
+
+ name
+ Strings: Regular Expressions
+ scope
+ string.regexp
+ settings
+
+ foreground
+ #4B83CD
+
+
+
+ name
+ Strings: Symbols
+ scope
+ constant.other.symbol
+ settings
+
+ foreground
+ #AB6526
+
+
+
+ name
+ Punctuation
+ scope
+ punctuation
+ settings
+
+ foreground
+ #777777
+
+
+
+ name
+ Embedded Source
+ scope
+ string source, text source
+ settings
+
+ background
+ #EAEBE6
+
+
+
+ name
+ -----------------------------------
+ settings
+
+
+
+ name
+ HTML: Doctype Declaration
+ scope
+ meta.tag.sgml.doctype, meta.tag.sgml.doctype string, meta.tag.sgml.doctype
+ entity.name.tag, meta.tag.sgml punctuation.definition.tag.html
+
+ settings
+
+ foreground
+ #AAAAAA
+
+
+
+ name
+ HTML: Tags
+ scope
+ meta.tag, punctuation.definition.tag.html,
+ punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html
+
+ settings
+
+ foreground
+ #91B3E0
+
+
+
+ name
+ HTML: Tag Names
+ scope
+ entity.name.tag
+ settings
+
+ foreground
+ #4B83CD
+
+
+
+ name
+ HTML: Attribute Names
+ scope
+ meta.tag entity.other.attribute-name, entity.other.attribute-name.html
+
+ settings
+
+ foreground
+ #91B3E0
+
+
+
+ name
+ HTML: Entities
+ scope
+ constant.character.entity, punctuation.definition.entity
+ settings
+
+ foreground
+ #AB6526
+
+
+
+ name
+ -----------------------------------
+ settings
+
+
+
+ name
+ CSS: Selectors
+ scope
+ meta.selector, meta.selector entity, meta.selector entity punctuation,
+ entity.name.tag.css
+
+ settings
+
+ foreground
+ #7A3E9D
+
+
+
+ name
+ CSS: Property Names
+ scope
+ meta.property-name, support.type.property-name
+ settings
+
+ foreground
+ #AB6526
+
+
+
+ name
+ CSS: Property Values
+ scope
+ meta.property-value, meta.property-value constant.other,
+ support.constant.property-value
+
+ settings
+
+ foreground
+ #448C27
+
+
+
+ name
+ CSS: Important Keyword
+ scope
+ keyword.other.important
+ settings
+
+ fontStyle
+ bold
+
+
+
+ name
+ -----------------------------------
+ settings
+
+
+
+ name
+ Markup: Changed
+ scope
+ markup.changed
+ settings
+
+ background
+ #FFFFDD
+ foreground
+ #000000
+
+
+
+ name
+ Markup: Deletion
+ scope
+ markup.deleted
+ settings
+
+ background
+ #FFDDDD
+ foreground
+ #000000
+
+
+
+ name
+ Markup: Emphasis
+ scope
+ markup.italic
+ settings
+
+ fontStyle
+ italic
+
+
+
+ name
+ Markup: Error
+ scope
+ markup.error
+ settings
+
+ background
+ #96000014
+ foreground
+ #660000
+
+
+
+ name
+ Markup: Insertion
+ scope
+ markup.inserted
+ settings
+
+ background
+ #DDFFDD
+ foreground
+ #000000
+
+
+
+ name
+ Markup: Link
+ scope
+ meta.link
+ settings
+
+ foreground
+ #4B83CD
+
+
+
+ name
+ Markup: Output
+ scope
+ markup.output, markup.raw
+ settings
+
+ foreground
+ #777777
+
+
+
+ name
+ Markup: Prompt
+ scope
+ markup.prompt
+ settings
+
+ foreground
+ #777777
+
+
+
+ name
+ Markup: Heading
+ scope
+ markup.heading
+ settings
+
+ foreground
+ #AA3731
+
+
+
+ name
+ Markup: Strong
+ scope
+ markup.bold
+ settings
+
+ fontStyle
+ bold
+
+
+
+ name
+ Markup: Traceback
+ scope
+ markup.traceback
+ settings
+
+ foreground
+ #660000
+
+
+
+ name
+ Markup: Underline
+ scope
+ markup.underline
+ settings
+
+ fontStyle
+ underline
+
+
+
+ name
+ Markup Quote
+ scope
+ markup.quote
+ settings
+
+ foreground
+ #7A3E9D
+
+
+
+ name
+ Markup Lists
+ scope
+ markup.list
+ settings
+
+ foreground
+ #4B83CD
+
+
+
+ name
+ Markup Styling
+ scope
+ markup.bold, markup.italic
+ settings
+
+ foreground
+ #448C27
+
+
+
+ name
+ Markup Inline
+ scope
+ markup.inline.raw
+ settings
+
+ fontStyle
+
+ foreground
+ #AB6526
+
+
+
+ name
+ -----------------------------------
+ settings
+
+
+
+ name
+ Extra: Diff Range
+ scope
+ meta.diff.range, meta.diff.index, meta.separator
+ settings
+
+ background
+ #DDDDFF
+ foreground
+ #434343
+
+
+
+ name
+ Extra: Diff From
+ scope
+ meta.diff.header.from-file
+ settings
+
+ background
+ #FFDDDD
+ foreground
+ #434343
+
+
+
+ name
+ Extra: Diff To
+ scope
+ meta.diff.header.to-file
+ settings
+
+ background
+ #DDFFDD
+ foreground
+ #434343
+
+
+
+ uuid
+ 231D6A91-5FD1-4CBE-BD2A-0F36C08693F1
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/darcula.json b/app/src/main/assets/textmate/darcula.json
new file mode 100644
index 000000000..06fbcfe89
--- /dev/null
+++ b/app/src/main/assets/textmate/darcula.json
@@ -0,0 +1,542 @@
+{
+ "name": "darcula",
+ "settings": [
+ {
+ "settings": {
+ "background": "#1F1A1B",
+ "foreground": "#cccccc",
+ "lineHighlight": "#2B2B2B",
+ "blockLineColor": "#575757",
+ "currentBlockLineColor": "#7a7a7a",
+ "selection": "#214283",
+ "completionWindowBackground": "#1F1A1B",
+ "completionWindowStroke": "#555555"
+ }
+ },
+ {
+ "name": "Package declaration",
+ "scope": "storage.modifier.package",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Import declaration",
+ "scope": "storage.modifier.import",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Class names (Identifiers starting with uppercase)",
+ "scope": "storage.type.java",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Annotation",
+ "scope": "storage.type.annotation",
+ "settings": {
+ "foreground": "#BBB529"
+ }
+ },
+ {
+ "name": "Comment",
+ "scope": "comment",
+ "settings": {
+ "foreground": "#707070"
+ }
+ },
+ {
+ "name": "Operator Keywords",
+ "scope": "keyword.operator,keyword.operator.logical,keyword.operator.relational,keyword.operator.assignment,keyword.operator.comparison,keyword.operator.ternary,keyword.operator.arithmetic,keyword.operator.spread",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Strings",
+ "scope": "string,string.character.escape,string.template.quoted,string.template.quoted.punctuation,string.template.quoted.punctuation.single,string.template.quoted.punctuation.double,string.type.declaration.annotation,string.template.quoted.punctuation.tag",
+ "settings": {
+ "foreground": "#6A8759"
+ }
+ },
+ {
+ "name": "String Interpolation Begin and End",
+ "scope": "punctuation.definition.template-expression.begin,punctuation.definition.template-expression.end",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "String Interpolation Body",
+ "scope": "expression.string,meta.template.expression",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Number",
+ "scope": "constant.numeric",
+ "settings": {
+ "foreground": "#7A9EC2"
+ }
+ },
+ {
+ "name": "Built-in constant",
+ "scope": "constant.language,variable.language",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "User-defined constant",
+ "scope": "constant.character, constant.other",
+ "settings": {
+ "foreground": "#9E7BB0"
+ }
+ },
+ {
+ "name": "Keyword",
+ "scope": "keyword,keyword.operator.new,keyword.operator.delete,keyword.operator.static,keyword.operator.this,keyword.operator.expression",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "Method return type",
+ "scope": "meta.method.return-type",
+ "settings": {
+ "foreground": "#A9B7C6"
+ }
+ },
+ {
+ "name": "Method call identifier",
+ "scope": "meta.method-call",
+ "settings": {
+ "foreground": "#A9B7C6"
+ }
+ },
+ {
+ "name": "Types, Class Types",
+ "scope": "entity.name.type,meta.return.type,meta.type.annotation,meta.type.parameters,support.type.primitive",
+ "settings": {
+ "foreground": "#7A9EC2"
+ }
+ },
+ {
+ "name": "Storage type",
+ "scope": "storage,storage.type,storage.modifier,storage.arrow",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "Class constructor",
+ "scope": "class.instance.constructor,new.expr entity.name.type",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "Function",
+ "scope": "support.function, entity.name.function",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "Function Types",
+ "scope": "annotation.meta.ts, annotation.meta.tsx",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Function Argument",
+ "scope": "variable.parameter, operator.rest.parameters",
+ "settings": {
+ "foreground": "#A9B7C6"
+ }
+ },
+ {
+ "name": "Variable, Property",
+ "scope": "variable.property,variable.other.property,variable.other.object.property,variable.object.property,support.variable.property",
+ "settings": {
+ "foreground": "#9E7BB0"
+ }
+ },
+ {
+ "name": "Variable name",
+ "scope": "entity.name.variable",
+ "settings": {
+ "foreground": "#A9B7C6"
+ }
+ },
+ {
+ "name": "CONSTANT",
+ "scope": "variable.other.constant",
+ "settings": {
+ "foreground": "#9876AA"
+ }
+ },
+ {
+ "name": "Module Name",
+ "scope": "quote.module",
+ "settings": {
+ "foreground": "#6A8759"
+ }
+ },
+ {
+ "name": "Markup Headings",
+ "scope": "markup.heading",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "Tag name",
+ "scope": "punctuation.definition.tag.html, punctuation.definition.tag.begin, punctuation.definition.tag.end, entity.name.tag",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "Tag attribute",
+ "scope": "entity.other.attribute-name",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Object Keys",
+ "scope": "meta.object-literal.key",
+ "settings": {
+ "foreground": "#9E7BB0"
+ }
+ },
+ {
+ "name": "TypeScript Class Modifiers",
+ "scope": "storage.modifier.ts",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "TypeScript Type Casting",
+ "scope": "ts.cast.expr,ts.meta.entity.class.method.new.expr.cast,ts.meta.entity.type.name.new.expr.cast,ts.meta.entity.type.name.var-single-variable.annotation,tsx.cast.expr,tsx.meta.entity.class.method.new.expr.cast,tsx.meta.entity.type.name.new.expr.cast,tsx.meta.entity.type.name.var-single-variable.annotation",
+ "settings": {
+ "foreground": "#7A9EC2"
+ }
+ },
+ {
+ "name": "TypeScript Type Declaration",
+ "scope": "ts.meta.type.support,ts.meta.type.entity.name,ts.meta.class.inherited-class,tsx.meta.type.support,tsx.meta.type.entity.name,tsx.meta.class.inherited-class,type-declaration,enum-declaration",
+ "settings": {
+ "foreground": "#7A9EC2"
+ }
+ },
+ {
+ "name": "TypeScript Method Declaration",
+ "scope": "function-declaration,method-declaration,method-overload-declaration,type-fn-type-parameters",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "Documentation Block",
+ "scope": "comment.block.documentation",
+ "settings": {
+ "foreground": "#6A8759"
+ }
+ },
+ {
+ "name": "Documentation Highlight (JSDoc)",
+ "scope": "storage.type.class.jsdoc",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "Import-Export-All (*) Keyword",
+ "scope": "constant.language.import-export-all",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Object Key Seperator",
+ "scope": "objectliteral.key.separator, punctuation.separator.key-value",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Regex",
+ "scope": "regex",
+ "settings": {
+ "fontStyle": " italic"
+ }
+ },
+ {
+ "name": "Typescript Namespace",
+ "scope": "ts.meta.entity.name.namespace,tsx.meta.entity.name.namespace",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Regex Character-class",
+ "scope": "regex.character-class",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Class Name",
+ "scope": "entity.name.type.class",
+ "settings": {
+ "foreground": "#A9B7C6"
+ }
+ },
+ {
+ "name": "Class Inheritances",
+ "scope": "entity.other.inherited-class",
+ "settings": {
+ "foreground": "#7A9EC2"
+ }
+ },
+ {
+ "name": "Documentation Entity",
+ "scope": "entity.name.type.instance.jsdoc",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "YAML entity",
+ "scope": "yaml.entity.name,yaml.string.entity.name",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "YAML string value",
+ "scope": "yaml.string.out",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Ignored (Exceptions Rules)",
+ "scope": "meta.brace.square.ts,block.support.module,block.support.type.module,block.support.function.variable,punctuation.definition.typeparameters.begin,punctuation.definition.typeparameters.end",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Regex",
+ "scope": "string.regexp",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "Regex Group/Set",
+ "scope": "punctuation.definition.group.regexp,punctuation.definition.character-class.regexp",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "Regex Character Class",
+ "scope": "constant.other.character-class.regexp, constant.character.escape.ts",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Regex Or Operator",
+ "scope": "expr.regex.or.operator",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Tag string",
+ "scope": "string.template.tag,string.template.punctuation.tag,string.quoted.punctuation.tag,string.quoted.embedded.tag, string.quoted.double.tag",
+ "settings": {
+ "foreground": "#6A8759"
+ }
+ },
+ {
+ "name": "Tag function parenthesis",
+ "scope": "tag.punctuation.begin.arrow.parameters.embedded,tag.punctuation.end.arrow.parameters.embedded",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "Object-literal key class",
+ "scope": "object-literal.object.member.key.field.other,object-literal.object.member.key.accessor,object-literal.object.member.key.array.brace.square",
+ "settings": {
+ "foreground": "#CCCCCC"
+ }
+ },
+ {
+ "name": "CSS Property-value",
+ "scope": "property-list.property-value,property-list.constant",
+ "settings": {
+ "foreground": "#A5C261"
+ }
+ },
+ {
+ "name": "CSS Property variable",
+ "scope": "support.type.property-name.variable.css,support.type.property-name.variable.scss,variable.scss",
+ "settings": {
+ "foreground": "#7A9EC2"
+ }
+ },
+ {
+ "name": "CSS Property entity",
+ "scope": "entity.other.attribute-name.class.css,entity.other.attribute-name.class.scss,entity.other.attribute-name.parent-selector-suffix.css,entity.other.attribute-name.parent-selector-suffix.scss",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "CSS Property-value",
+ "scope": "property-list.property-value.rgb-value, keyword.other.unit.css,keyword.other.unit.scss",
+ "settings": {
+ "foreground": "#7A9EC2"
+ }
+ },
+ {
+ "name": "CSS Property-value function",
+ "scope": "property-list.property-value.function",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "CSS constant variables",
+ "scope": "support.constant.property-value.css,support.constant.property-value.scss",
+ "settings": {
+ "foreground": "#A5C261"
+ }
+ },
+ {
+ "name": "CSS Tag",
+ "scope": "css.entity.name.tag,scss.entity.name.tag",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "CSS ID, Selector",
+ "scope": "meta.selector.css, entity.attribute-name.id, entity.other.attribute-name.pseudo-class.css,entity.other.attribute-name.pseudo-element.css",
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+ {
+ "name": "CSS Keyword",
+ "scope": "keyword.scss,keyword.css",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "Triple-slash Directive Tag",
+ "scope": "triple-slash.tag",
+ "settings": {
+ "foreground": "#CCCCCC",
+ "fontStyle": "italic"
+ }
+ },
+ {
+ "scope": "token.info-token",
+ "settings": {
+ "foreground": "#6796e6"
+ }
+ },
+ {
+ "scope": "token.warn-token",
+ "settings": {
+ "foreground": "#cd9731"
+ }
+ },
+ {
+ "scope": "token.error-token",
+ "settings": {
+ "foreground": "#f44747"
+ }
+ },
+ {
+ "scope": "token.debug-token",
+ "settings": {
+ "foreground": "#b267e6"
+ }
+ },
+ {
+ "name": "Python operators",
+ "scope": "keyword.operator.logical.python",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "Dart class type",
+ "scope": "support.class.dart",
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "PHP variables",
+ "scope": [
+ "variable.language.php",
+ "variable.other.php"
+ ],
+ "settings": {
+ "foreground": "#9E7BB0"
+ }
+ },
+ {
+ "name": "Perl specific",
+ "scope": [
+ "variable.other.readwrite.perl"
+ ],
+ "settings": {
+ "foreground": "#9E7BB0"
+ }
+ },
+ {
+ "name": "PHP variables",
+ "scope": [
+ "variable.other.property.php"
+ ],
+ "settings": {
+ "foreground": "#CC8242"
+ }
+ },
+ {
+ "name": "PHP variables",
+ "scope": [
+ "support.variable.property.php"
+ ],
+ "settings": {
+ "foreground": "#FFC66D"
+ }
+ },
+
+ {
+ "name": "XML Namespace prefix",
+ "scope": "entity.name.tag.namesapce.xml",
+ "settings": {
+ "foreground": "#9876AA"
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/groovy/language-configuration.json b/app/src/main/assets/textmate/groovy/language-configuration.json
new file mode 100644
index 000000000..f339aa970
--- /dev/null
+++ 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"
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/groovy/syntaxes/groovy.tmLanguage b/app/src/main/assets/textmate/groovy/syntaxes/groovy.tmLanguage
new file mode 100644
index 000000000..67d5b0861
--- /dev/null
+++ b/app/src/main/assets/textmate/groovy/syntaxes/groovy.tmLanguage
@@ -0,0 +1,2145 @@
+
+
+
+
+ fileTypes
+
+ groovy
+ gvy
+
+ foldingStartMarker
+ (\{\s*$|^\s*// \{\{\{)
+ foldingStopMarker
+ ^\s*(\}|// \}\}\}$)
+ keyEquivalent
+ ^~G
+ name
+ Groovy
+ patterns
+
+
+ captures
+
+ 1
+
+ name
+ punctuation.definition.comment.groovy
+
+
+ match
+ ^(#!).+$\n
+ name
+ comment.line.hashbang.groovy
+
+
+ captures
+
+ 1
+
+ name
+ keyword.other.package.groovy
+
+ 2
+
+ name
+ storage.modifier.package.groovy
+
+ 3
+
+ name
+ punctuation.terminator.groovy
+
+
+ match
+ ^\s*(package)\b(?:\s*([^ ;$]+)\s*(;)?)?
+ name
+ meta.package.groovy
+
+
+ begin
+ (import static)\b\s*
+ beginCaptures
+
+ 1
+
+ name
+ keyword.other.import.static.groovy
+
+
+ captures
+
+ 1
+
+ name
+ keyword.other.import.groovy
+
+ 2
+
+ name
+ storage.modifier.import.groovy
+
+ 3
+
+ name
+ punctuation.terminator.groovy
+
+
+ contentName
+ storage.modifier.import.groovy
+ end
+ \s*(?:$|(?=%>)(;))
+ endCaptures
+
+ 1
+
+ name
+ punctuation.terminator.groovy
+
+
+ name
+ meta.import.groovy
+ patterns
+
+
+ match
+ \.
+ name
+ punctuation.separator.groovy
+
+
+ match
+ \s
+ name
+ invalid.illegal.character_not_allowed_here.groovy
+
+
+
+
+ begin
+ (import)\b\s*
+ beginCaptures
+
+ 1
+
+ name
+ keyword.other.import.groovy
+
+
+ captures
+
+ 1
+
+ name
+ keyword.other.import.groovy
+
+ 2
+
+ name
+ storage.modifier.import.groovy
+
+ 3
+
+ name
+ punctuation.terminator.groovy
+
+
+ contentName
+ storage.modifier.import.groovy
+ end
+ \s*(?:$|(?=%>)|(;))
+ endCaptures
+
+ 1
+
+ name
+ punctuation.terminator.groovy
+
+
+ name
+ meta.import.groovy
+ patterns
+
+
+ match
+ \.
+ name
+ punctuation.separator.groovy
+
+
+ match
+ \s
+ name
+ invalid.illegal.character_not_allowed_here.groovy
+
+
+
+
+ captures
+
+ 1
+
+ name
+ keyword.other.import.groovy
+
+ 2
+
+ name
+ keyword.other.import.static.groovy
+
+ 3
+
+ name
+ storage.modifier.import.groovy
+
+ 4
+
+ name
+ punctuation.terminator.groovy
+
+
+ match
+ ^\s*(import)(?:\s+(static)\s+)\b(?:\s*([^ ;$]+)\s*(;)?)?
+ name
+ meta.import.groovy
+
+
+ include
+ #groovy
+
+
+ repository
+
+ annotations
+
+ patterns
+
+
+ begin
+ (?<!\.)(@[^ (]+)(\()
+ beginCaptures
+
+ 1
+
+ name
+ storage.type.annotation.groovy
+
+ 2
+
+ name
+ punctuation.definition.annotation-arguments.begin.groovy
+
+
+ end
+ (\))
+ endCaptures
+
+ 1
+
+ name
+ punctuation.definition.annotation-arguments.end.groovy
+
+
+ name
+ meta.declaration.annotation.groovy
+ patterns
+
+
+ captures
+
+ 1
+
+ name
+ constant.other.key.groovy
+
+ 2
+
+ name
+ keyword.operator.assignment.groovy
+
+
+ match
+ (\w*)\s*(=)
+
+
+ include
+ #values
+
+
+ match
+ ,
+ name
+ punctuation.definition.seperator.groovy
+
+
+
+
+ match
+ (?<!\.)@\S+
+ name
+ storage.type.annotation.groovy
+
+
+
+ anonymous-classes-and-new
+
+ begin
+ \bnew\b
+ beginCaptures
+
+ 0
+
+ name
+ keyword.control.new.groovy
+
+
+ end
+ (?<=\)|\])(?!\s*{)|(?<=})|(?=[;])|$
+ patterns
+
+
+ begin
+ (\w+)\s*(?=\[)
+ beginCaptures
+
+ 1
+
+ name
+ storage.type.groovy
+
+
+ end
+ }|(?=\s*(?:,|;|\)))|$
+ patterns
+
+
+ begin
+ \[
+ end
+ \]
+ patterns
+
+
+ include
+ #groovy
+
+
+
+
+ begin
+ {
+ end
+ (?=})
+ patterns
+
+
+ include
+ #groovy
+
+
+
+
+
+
+ begin
+ (?=\w.*\(?)
+ end
+ (?<=\))|$
+ patterns
+
+
+ include
+ #object-types
+
+
+ begin
+ \(
+ beginCaptures
+
+ 1
+
+ name
+ storage.type.groovy
+
+
+ end
+ \)
+ patterns
+
+
+ include
+ #groovy
+
+
+
+
+
+
+ begin
+ {
+ end
+ }
+ name
+ meta.inner-class.groovy
+ patterns
+
+
+ include
+ #class-body
+
+
+
+
+
+ braces
+
+ begin
+ \{
+ end
+ \}
+ patterns
+
+
+ include
+ #groovy-code
+
+
+
+ class
+
+ begin
+ (?=\w?[\w\s]*(?:class|(?:@)?interface|enum)\s+\w+)
+ end
+ }
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.class.end.groovy
+
+
+ name
+ meta.definition.class.groovy
+ patterns
+
+
+ include
+ #storage-modifiers
+
+
+ include
+ #comments
+
+
+ captures
+
+ 1
+
+ name
+ storage.modifier.groovy
+
+ 2
+
+ name
+ entity.name.type.class.groovy
+
+
+ match
+ (class|(?:@)?interface|enum)\s+(\w+)
+ name
+ meta.class.identifier.groovy
+
+
+ begin
+ extends
+ beginCaptures
+
+ 0
+
+ name
+ storage.modifier.extends.groovy
+
+
+ end
+ (?={|implements)
+ name
+ meta.definition.class.inherited.classes.groovy
+ patterns
+
+
+ include
+ #object-types-inherited
+
+
+ include
+ #comments
+
+
+
+
+ begin
+ (implements)\s
+ beginCaptures
+
+ 1
+
+ name
+ storage.modifier.implements.groovy
+
+
+ end
+ (?=\s*extends|\{)
+ name
+ meta.definition.class.implemented.interfaces.groovy
+ patterns
+
+
+ include
+ #object-types-inherited
+
+
+ include
+ #comments
+
+
+
+
+ begin
+ {
+ end
+ (?=})
+ name
+ meta.class.body.groovy
+ patterns
+
+
+ include
+ #class-body
+
+
+
+
+
+ class-body
+
+ patterns
+
+
+ include
+ #enum-values
+
+
+ include
+ #constructors
+
+
+ include
+ #groovy
+
+
+
+ closures
+
+ begin
+ \{(?=.*?->)
+ end
+ \}
+ patterns
+
+
+ begin
+ (?<=\{)(?=[^\}]*?->)
+ end
+ ->
+ endCaptures
+
+ 0
+
+ name
+ keyword.operator.groovy
+
+
+ patterns
+
+
+ begin
+ (?!->)
+ end
+ (?=->)
+ name
+ meta.closure.parameters.groovy
+ patterns
+
+
+ begin
+ (?!,|->)
+ end
+ (?=,|->)
+ name
+ meta.closure.parameter.groovy
+ patterns
+
+
+ begin
+ =
+ beginCaptures
+
+ 0
+
+ name
+ keyword.operator.assignment.groovy
+
+
+ end
+ (?=,|->)
+ name
+ meta.parameter.default.groovy
+ patterns
+
+
+ include
+ #groovy-code
+
+
+
+
+ include
+ #parameters
+
+
+
+
+
+
+
+
+ begin
+ (?=[^}])
+ end
+ (?=\})
+ patterns
+
+
+ include
+ #groovy-code
+
+
+
+
+
+ comment-block
+
+ begin
+ /\*
+ captures
+
+ 0
+
+ name
+ punctuation.definition.comment.groovy
+
+
+ end
+ \*/
+ name
+ comment.block.groovy
+
+ comments
+
+ patterns
+
+
+ captures
+
+ 0
+
+ name
+ punctuation.definition.comment.groovy
+
+
+ match
+ /\*\*/
+ name
+ comment.block.empty.groovy
+
+
+ include
+ text.html.javadoc
+
+
+ include
+ #comment-block
+
+
+ captures
+
+ 1
+
+ name
+ punctuation.definition.comment.groovy
+
+
+ match
+ (//).*$\n?
+ name
+ comment.line.double-slash.groovy
+
+
+
+ constants
+
+ patterns
+
+
+ match
+ \b([A-Z][A-Z0-9_]+)\b
+ name
+ constant.other.groovy
+
+
+ match
+ \b(true|false|null)\b
+ name
+ constant.language.groovy
+
+
+
+ constructors
+
+ applyEndPatternLast
+ 1
+ begin
+ (?<=;|^)(?=\s*(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)\s+)*[A-Z]\w*\()
+ end
+ }
+ patterns
+
+
+ include
+ #method-content
+
+
+
+ enum-values
+
+ patterns
+
+
+ begin
+ (?<=;|^)\s*\b([A-Z0-9_]+)(?=\s*(?:,|;|}|\(|$))
+ beginCaptures
+
+ 1
+
+ name
+ constant.enum.name.groovy
+
+
+ end
+ ,|;|(?=})|^(?!\s*\w+\s*(?:,|$))
+ patterns
+
+
+ begin
+ \(
+ end
+ \)
+ name
+ meta.enum.value.groovy
+ patterns
+
+
+ match
+ ,
+ name
+ punctuation.definition.seperator.parameter.groovy
+
+
+ include
+ #groovy-code
+
+
+
+
+
+
+
+ groovy
+
+ patterns
+
+
+ include
+ #comments
+
+
+ include
+ #class
+
+
+ include
+ #variables
+
+
+ include
+ #methods
+
+
+ include
+ #annotations
+
+
+ include
+ #groovy-code
+
+
+
+ groovy-code
+
+ patterns
+
+
+ include
+ #groovy-code-minus-map-keys
+
+
+ include
+ #map-keys
+
+
+
+ groovy-code-minus-map-keys
+
+ comment
+ In some situations, maps can't be declared without enclosing []'s,
+ therefore we create a collection of everything but that
+ patterns
+
+
+ include
+ #comments
+
+
+ include
+ #annotations
+
+
+ include
+ #support-functions
+
+
+ include
+ #keyword-language
+
+
+ include
+ #values
+
+
+ include
+ #anonymous-classes-and-new
+
+
+ include
+ #keyword-operator
+
+
+ include
+ #types
+
+
+ include
+ #storage-modifiers
+
+
+ include
+ #parens
+
+
+ include
+ #closures
+
+
+ include
+ #braces
+
+
+
+ keyword
+
+ patterns
+
+
+ include
+ #keyword-operator
+
+
+ include
+ #keyword-language
+
+
+
+ keyword-language
+
+ patterns
+
+
+ match
+ \b(try|catch|finally|throw)\b
+ name
+ keyword.control.exception.groovy
+
+
+ match
+ \b((?<!\.)(?:return|break|continue|default|do|while|for|switch|if|else))\b
+ name
+ keyword.control.groovy
+
+
+ begin
+ \bcase\b
+ beginCaptures
+
+ 0
+
+ name
+ keyword.control.groovy
+
+
+ end
+ :
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.case-terminator.groovy
+
+
+ name
+ meta.case.groovy
+ patterns
+
+
+ include
+ #groovy-code-minus-map-keys
+
+
+
+
+ begin
+ \b(assert)\s
+ beginCaptures
+
+ 1
+
+ name
+ keyword.control.assert.groovy
+
+
+ end
+ $|;|}
+ name
+ meta.declaration.assertion.groovy
+ patterns
+
+
+ match
+ :
+ name
+ keyword.operator.assert.expression-seperator.groovy
+
+
+ include
+ #groovy-code-minus-map-keys
+
+
+
+
+ match
+ \b(throws)\b
+ name
+ keyword.other.throws.groovy
+
+
+
+ keyword-operator
+
+ patterns
+
+
+ match
+ \b(as)\b
+ name
+ keyword.operator.as.groovy
+
+
+ match
+ \b(in)\b
+ name
+ keyword.operator.in.groovy
+
+
+ match
+ \?\:
+ name
+ keyword.operator.elvis.groovy
+
+
+ match
+ \*\:
+ name
+ keyword.operator.spreadmap.groovy
+
+
+ match
+ \.\.
+ name
+ keyword.operator.range.groovy
+
+
+ match
+ \->
+ name
+ keyword.operator.arrow.groovy
+
+
+ match
+ <<
+ name
+ keyword.operator.leftshift.groovy
+
+
+ match
+ (?<=\S)\.(?=\S)
+ name
+ keyword.operator.navigation.groovy
+
+
+ match
+ (?<=\S)\?\.(?=\S)
+ name
+ keyword.operator.safe-navigation.groovy
+
+
+ begin
+ \?
+ beginCaptures
+
+ 0
+
+ name
+ keyword.operator.ternary.groovy
+
+
+ end
+ (?=$|\)|}|])
+ name
+ meta.evaluation.ternary.groovy
+ patterns
+
+
+ match
+ :
+ name
+ keyword.operator.ternary.expression-seperator.groovy
+
+
+ include
+ #groovy-code-minus-map-keys
+
+
+
+
+ match
+ ==~
+ name
+ keyword.operator.match.groovy
+
+
+ match
+ =~
+ name
+ keyword.operator.find.groovy
+
+
+ match
+ \b(instanceof)\b
+ name
+ keyword.operator.instanceof.groovy
+
+
+ match
+ (===|==|!=|<=|>=|<=>|<>|<|>|<<)
+ name
+ keyword.operator.comparison.groovy
+
+
+ match
+ =
+ name
+ keyword.operator.assignment.groovy
+
+
+ match
+ (\-\-|\+\+)
+ name
+ keyword.operator.increment-decrement.groovy
+
+
+ match
+ (\-|\+|\*|\/|%)
+ name
+ keyword.operator.arithmetic.groovy
+
+
+ match
+ (!|&&|\|\|)
+ name
+ keyword.operator.logical.groovy
+
+
+
+ language-variables
+
+ patterns
+
+
+ match
+ \b(this|super)\b
+ name
+ variable.language.groovy
+
+
+
+ map-keys
+
+ patterns
+
+
+ captures
+
+ 1
+
+ name
+ constant.other.key.groovy
+
+ 2
+
+ name
+ punctuation.definition.seperator.key-value.groovy
+
+
+ match
+ (\w+)\s*(:)
+
+
+
+ method-call
+
+ begin
+ ([\w$]+)(\()
+ beginCaptures
+
+ 1
+
+ name
+ meta.method.groovy
+
+ 2
+
+ name
+ punctuation.definition.method-parameters.begin.groovy
+
+
+ end
+ \)
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.method-parameters.end.groovy
+
+
+ name
+ meta.method-call.groovy
+ patterns
+
+
+ match
+ ,
+ name
+ punctuation.definition.seperator.parameter.groovy
+
+
+ include
+ #groovy-code
+
+
+
+ method-content
+
+ patterns
+
+
+ match
+ \s
+
+
+ include
+ #annotations
+
+
+ begin
+ (?=(?:\w|<)[^\(]*\s+(?:[\w$]|<)+\s*\()
+ end
+ (?=[\w$]+\s*\()
+ name
+ meta.method.return-type.java
+ patterns
+
+
+ include
+ #storage-modifiers
+
+
+ include
+ #types
+
+
+
+
+ begin
+ ([\w$]+)\s*\(
+ beginCaptures
+
+ 1
+
+ name
+ entity.name.function.java
+
+
+ end
+ \)
+ name
+ meta.definition.method.signature.java
+ patterns
+
+
+ begin
+ (?=[^)])
+ end
+ (?=\))
+ name
+ meta.method.parameters.groovy
+ patterns
+
+
+ begin
+ (?=[^,)])
+ end
+ (?=,|\))
+ name
+ meta.method.parameter.groovy
+ patterns
+
+
+ match
+ ,
+ name
+ punctuation.definition.separator.groovy
+
+
+ begin
+ =
+ beginCaptures
+
+ 0
+
+ name
+ keyword.operator.assignment.groovy
+
+
+ end
+ (?=,|\))
+ name
+ meta.parameter.default.groovy
+ patterns
+
+
+ include
+ #groovy-code
+
+
+
+
+ include
+ #parameters
+
+
+
+
+
+
+
+
+ begin
+ (?=<)
+ end
+ (?=\s)
+ name
+ meta.method.paramerised-type.groovy
+ patterns
+
+
+ begin
+ <
+ end
+ >
+ name
+ storage.type.parameters.groovy
+ patterns
+
+
+ include
+ #types
+
+
+ match
+ ,
+ name
+ punctuation.definition.seperator.groovy
+
+
+
+
+
+
+ begin
+ throws
+ beginCaptures
+
+ 0
+
+ name
+ storage.modifier.groovy
+
+
+ end
+ (?={|;)|^(?=\s*(?:[^{\s]|$))
+ name
+ meta.throwables.groovy
+ patterns
+
+
+ include
+ #object-types
+
+
+
+
+ begin
+ {
+ end
+ (?=})
+ name
+ meta.method.body.java
+ patterns
+
+
+ include
+ #groovy-code
+
+
+
+
+
+ methods
+
+ applyEndPatternLast
+ 1
+ begin
+ (?x:(?<=;|^|{)(?=\s*
+ (?:
+ (?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final) # visibility/modifier
+ |
+ (?:def)
+ |
+ (?:
+ (?:
+ (?:void|boolean|byte|char|short|int|float|long|double)
+ |
+ (?:@?(?:[a-zA-Z]\w*\.)*[A-Z]+\w*) # object type
+ )
+ [\[\]]*
+ (?:<.*>)?
+ )
+
+ )
+ \s+
+ ([^=]+\s+)?\w+\s*\(
+ ))
+ end
+ }|(?=[^{])
+ name
+ meta.definition.method.groovy
+ patterns
+
+
+ include
+ #method-content
+
+
+
+ nest_curly
+
+ begin
+ \{
+ captures
+
+ 0
+
+ name
+ punctuation.section.scope.groovy
+
+
+ end
+ \}
+ patterns
+
+
+ include
+ #nest_curly
+
+
+
+ numbers
+
+ patterns
+
+
+ match
+ ((0(x|X)[0-9a-fA-F]*)|(\+|-)?\b(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)([LlFfUuDdg]|UL|ul)?\b
+ name
+ constant.numeric.groovy
+
+
+
+ object-types
+
+ patterns
+
+
+ begin
+ \b((?:[a-z]\w*\.)*(?:[A-Z]+\w*[a-z]+\w*|UR[LI]))<
+ end
+ >|[^\w\s,\?<\[\]]
+ name
+ storage.type.generic.groovy
+ patterns
+
+
+ include
+ #object-types
+
+
+ begin
+ <
+ comment
+ This is just to support <>'s with no actual type prefix
+ end
+ >|[^\w\s,\[\]<]
+ name
+ storage.type.generic.groovy
+
+
+
+
+ begin
+ \b((?:[a-z]\w*\.)*[A-Z]+\w*[a-z]+\w*)(?=\[)
+ end
+ (?=[^\]\s])
+ name
+ storage.type.object.array.groovy
+ patterns
+
+
+ begin
+ \[
+ end
+ \]
+ patterns
+
+
+ include
+ #groovy
+
+
+
+
+
+
+ match
+ \b(?:[a-zA-Z]\w*\.)*(?:[A-Z]+\w*[a-z]+\w*|UR[LI])\b
+ name
+ storage.type.groovy
+
+
+
+ object-types-inherited
+
+ patterns
+
+
+ begin
+ \b((?:[a-zA-Z]\w*\.)*[A-Z]+\w*[a-z]+\w*)<
+ end
+ >|[^\w\s,\?<\[\]]
+ name
+ entity.other.inherited-class.groovy
+ patterns
+
+
+ include
+ #object-types-inherited
+
+
+ begin
+ <
+ comment
+ This is just to support <>'s with no actual type prefix
+ end
+ >|[^\w\s,\[\]<]
+ name
+ storage.type.generic.groovy
+
+
+
+
+ captures
+
+ 1
+
+ name
+ keyword.operator.dereference.groovy
+
+
+ match
+ \b(?:[a-zA-Z]\w*(\.))*[A-Z]+\w*[a-z]+\w*\b
+ name
+ entity.other.inherited-class.groovy
+
+
+
+ parameters
+
+ patterns
+
+
+ include
+ #annotations
+
+
+ include
+ #storage-modifiers
+
+
+ include
+ #types
+
+
+ match
+ \w+
+ name
+ variable.parameter.method.groovy
+
+
+
+ parens
+
+ begin
+ \(
+ end
+ \)
+ patterns
+
+
+ include
+ #groovy-code
+
+
+
+ primitive-arrays
+
+ patterns
+
+
+ match
+ \b(?:void|boolean|byte|char|short|int|float|long|double)(\[\])*\b
+ name
+ storage.type.primitive.array.groovy
+
+
+
+ primitive-types
+
+ patterns
+
+
+ match
+ \b(?:void|boolean|byte|char|short|int|float|long|double)\b
+ name
+ storage.type.primitive.groovy
+
+
+
+ regexp
+
+ patterns
+
+
+ begin
+ /(?=[^/]+/([^>]|$))
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.regexp.begin.groovy
+
+
+ end
+ /
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.regexp.end.groovy
+
+
+ name
+ string.regexp.groovy
+ patterns
+
+
+ match
+ \\.
+ name
+ constant.character.escape.groovy
+
+
+
+
+ begin
+ ~"
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.regexp.begin.groovy
+
+
+ end
+ "
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.regexp.end.groovy
+
+
+ name
+ string.regexp.compiled.groovy
+ patterns
+
+
+ match
+ \\.
+ name
+ constant.character.escape.groovy
+
+
+
+
+
+ storage-modifiers
+
+ patterns
+
+
+ match
+ \b(private|protected|public)\b
+ name
+ storage.modifier.access-control.groovy
+
+
+ match
+ \b(static)\b
+ name
+ storage.modifier.static.groovy
+
+
+ match
+ \b(final)\b
+ name
+ storage.modifier.final.groovy
+
+
+ match
+ \b(native|synchronized|abstract|threadsafe|transient)\b
+ name
+ storage.modifier.other.groovy
+
+
+
+ string-quoted-double
+
+ begin
+ "
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.begin.groovy
+
+
+ end
+ "
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.end.groovy
+
+
+ name
+ string.quoted.double.groovy
+ patterns
+
+
+ include
+ #string-quoted-double-contents
+
+
+
+ string-quoted-double-contents
+
+ patterns
+
+
+ match
+ \\.
+ name
+ constant.character.escape.groovy
+
+
+ applyEndPatternLast
+ 1
+ begin
+ \$\w
+ end
+ (?=\W)
+ name
+ variable.other.interpolated.groovy
+ patterns
+
+
+ match
+ \w
+ name
+ variable.other.interpolated.groovy
+
+
+ match
+ \.
+ name
+ keyword.other.dereference.groovy
+
+
+
+
+ begin
+ \$\{
+ captures
+
+ 0
+
+ name
+ punctuation.section.embedded.groovy
+
+
+ end
+ \}
+ name
+ source.groovy.embedded.source
+ patterns
+
+
+ include
+ #nest_curly
+
+
+
+
+
+ string-quoted-double-multiline
+
+ begin
+ """
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.begin.groovy
+
+
+ end
+ """
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.end.groovy
+
+
+ name
+ string.quoted.double.multiline.groovy
+ patterns
+
+
+ include
+ #string-quoted-double-contents
+
+
+
+ string-quoted-single
+
+ begin
+ '
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.begin.groovy
+
+
+ end
+ '
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.end.groovy
+
+
+ name
+ string.quoted.single.groovy
+ patterns
+
+
+ include
+ #string-quoted-single-contents
+
+
+
+ string-quoted-single-contents
+
+ patterns
+
+
+ match
+ \\.
+ name
+ constant.character.escape.groovy
+
+
+
+ string-quoted-single-multiline
+
+ begin
+ '''
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.begin.groovy
+
+
+ end
+ '''
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.end.groovy
+
+
+ name
+ string.quoted.single.multiline.groovy
+ patterns
+
+
+ include
+ #string-quoted-single-contents
+
+
+
+ strings
+
+ patterns
+
+
+ include
+ #string-quoted-double-multiline
+
+
+ include
+ #string-quoted-single-multiline
+
+
+ include
+ #string-quoted-double
+
+
+ include
+ #string-quoted-single
+
+
+ include
+ #regexp
+
+
+
+ structures
+
+ begin
+ \[
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.structure.begin.groovy
+
+
+ end
+ \]
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.structure.end.groovy
+
+
+ name
+ meta.structure.groovy
+ patterns
+
+
+ include
+ #groovy-code
+
+
+ match
+ ,
+ name
+ punctuation.definition.separator.groovy
+
+
+
+ support-functions
+
+ patterns
+
+
+ match
+ (?x)\b(?:sprintf|print(?:f|ln)?)\b
+ name
+ support.function.print.groovy
+
+
+ match
+ (?x)\b(?:shouldFail|fail(?:NotEquals)?|ass(?:ume|ert(?:S(?:cript|ame)|N(?:ot(?:Same|
+ Null)|ull)|Contains|T(?:hat|oString|rue)|Inspect|Equals|False|Length|
+ ArrayEquals)))\b
+ name
+ support.function.testing.groovy
+
+
+
+ types
+
+ patterns
+
+
+ match
+ \b(def)\b
+ name
+ storage.type.def.groovy
+
+
+ include
+ #primitive-types
+
+
+ include
+ #primitive-arrays
+
+
+ include
+ #object-types
+
+
+
+ values
+
+ patterns
+
+
+ include
+ #language-variables
+
+
+ include
+ #strings
+
+
+ include
+ #numbers
+
+
+ include
+ #constants
+
+
+ include
+ #types
+
+
+ include
+ #structures
+
+
+ include
+ #method-call
+
+
+
+ variables
+
+ applyEndPatternLast
+ 1
+ patterns
+
+
+ begin
+ (?x:(?=
+ (?:
+ (?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final) # visibility/modifier
+ |
+ (?:def)
+ |
+ (?:void|boolean|byte|char|short|int|float|long|double)
+ |
+ (?:(?:[a-z]\w*\.)*[A-Z]+\w*) # object type
+ )
+ \s+
+ [\w\d_<>\[\],\s]+
+ (?:=|$)
+
+ ))
+ end
+ ;|$
+ name
+ meta.definition.variable.groovy
+ patterns
+
+
+ match
+ \s
+
+
+ captures
+
+ 1
+
+ name
+ constant.variable.groovy
+
+
+ match
+ ([A-Z_0-9]+)\s+(?=\=)
+
+
+ captures
+
+ 1
+
+ name
+ meta.definition.variable.name.groovy
+
+
+ match
+ (\w[^\s,]*)\s+(?=\=)
+
+
+ begin
+ =
+ beginCaptures
+
+ 0
+
+ name
+ keyword.operator.assignment.groovy
+
+
+ end
+ $
+ patterns
+
+
+ include
+ #groovy-code
+
+
+
+
+ captures
+
+ 1
+
+ name
+ meta.definition.variable.name.groovy
+
+
+ match
+ (\w[^\s=]*)(?=\s*($|;))
+
+
+ include
+ #groovy-code
+
+
+
+
+
+
+ scopeName
+ source.groovy
+ uuid
+ B3A64888-EBBB-4436-8D9E-F1169C5D7613
+
+
diff --git a/app/src/main/assets/textmate/java/language-configuration.json b/app/src/main/assets/textmate/java/language-configuration.json
new file mode 100644
index 000000000..f339aa970
--- /dev/null
+++ b/app/src/main/assets/textmate/java/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"
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/java/syntaxes/java.tmLanguage.json b/app/src/main/assets/textmate/java/syntaxes/java.tmLanguage.json
new file mode 100644
index 000000000..e80a6b5bf
--- /dev/null
+++ b/app/src/main/assets/textmate/java/syntaxes/java.tmLanguage.json
@@ -0,0 +1,1855 @@
+{
+ "information_for_contributors": [
+ "This file has been converted from https://github.com/atom/language-java/blob/master/grammars/java.cson",
+ "If you want to provide a fix or improvement, please create a pull request against the original repository.",
+ "Once accepted there, we are happy to receive an update request."
+ ],
+ "version": "https://github.com/atom/language-java/commit/29f977dc42a7e2568b39bb6fb34c4ef108eb59b3",
+ "name": "Java",
+ "scopeName": "source.java",
+ "patterns": [
+ {
+ "begin": "\\b(package)\\b\\s*",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.other.package.java"
+ }
+ },
+ "end": "\\s*(;)",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.terminator.java"
+ }
+ },
+ "name": "meta.package.java",
+ "contentName": "storage.modifier.package.java",
+ "patterns": [
+ {
+ "include": "#comments"
+ },
+ {
+ "match": "(?<=\\.)\\s*\\.|\\.(?=\\s*;)",
+ "name": "invalid.illegal.character_not_allowed_here.java"
+ },
+ {
+ "match": "(?",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.bracket.angle.java"
+ }
+ },
+ "patterns": [
+ {
+ "match": "\\b(extends|super)\\b",
+ "name": "storage.modifier.$1.java"
+ },
+ {
+ "match": "(?>>?|~|\\^)",
+ "name": "keyword.operator.bitwise.java"
+ },
+ {
+ "match": "((&|\\^|\\||<<|>>>?)=)",
+ "name": "keyword.operator.assignment.bitwise.java"
+ },
+ {
+ "match": "(===?|!=|<=|>=|<>|<|>)",
+ "name": "keyword.operator.comparison.java"
+ },
+ {
+ "match": "([+*/%-]=)",
+ "name": "keyword.operator.assignment.arithmetic.java"
+ },
+ {
+ "match": "(=)",
+ "name": "keyword.operator.assignment.java"
+ },
+ {
+ "match": "(\\-\\-|\\+\\+)",
+ "name": "keyword.operator.increment-decrement.java"
+ },
+ {
+ "match": "(\\-|\\+|\\*|\\/|%)",
+ "name": "keyword.operator.arithmetic.java"
+ },
+ {
+ "match": "(!|&&|\\|\\|)",
+ "name": "keyword.operator.logical.java"
+ },
+ {
+ "match": "(\\||&)",
+ "name": "keyword.operator.bitwise.java"
+ },
+ {
+ "match": "\\b(const|goto)\\b",
+ "name": "keyword.reserved.java"
+ }
+ ]
+ },
+ "lambda-expression": {
+ "patterns": [
+ {
+ "match": "->",
+ "name": "storage.type.function.arrow.java"
+ }
+ ]
+ },
+ "member-variables": {
+ "begin": "(?=private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)",
+ "end": "(?=\\=|;)",
+ "patterns": [
+ {
+ "include": "#storage-modifiers"
+ },
+ {
+ "include": "#variables"
+ },
+ {
+ "include": "#primitive-arrays"
+ },
+ {
+ "include": "#object-types"
+ }
+ ]
+ },
+ "method-call": {
+ "begin": "(\\.)\\s*([A-Za-z_$][\\w$]*)\\s*(\\()",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.separator.period.java"
+ },
+ "2": {
+ "name": "entity.name.function.java"
+ },
+ "3": {
+ "name": "punctuation.definition.parameters.begin.bracket.round.java"
+ }
+ },
+ "end": "\\)",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.parameters.end.bracket.round.java"
+ }
+ },
+ "name": "meta.method-call.java",
+ "patterns": [
+ {
+ "include": "#code"
+ }
+ ]
+ },
+ "methods": {
+ "begin": "(?!new)(?=[\\w<].*\\s+)(?=([^=/]|/(?!/))+\\()",
+ "end": "(})|(?=;)",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.section.method.end.bracket.curly.java"
+ }
+ },
+ "name": "meta.method.java",
+ "patterns": [
+ {
+ "include": "#storage-modifiers"
+ },
+ {
+ "begin": "(\\w+)\\s*(\\()",
+ "beginCaptures": {
+ "1": {
+ "name": "entity.name.function.java"
+ },
+ "2": {
+ "name": "punctuation.definition.parameters.begin.bracket.round.java"
+ }
+ },
+ "end": "\\)",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.parameters.end.bracket.round.java"
+ }
+ },
+ "name": "meta.method.identifier.java",
+ "patterns": [
+ {
+ "include": "#parameters"
+ },
+ {
+ "include": "#parens"
+ },
+ {
+ "include": "#comments"
+ }
+ ]
+ },
+ {
+ "include": "#generics"
+ },
+ {
+ "begin": "(?=\\w.*\\s+\\w+\\s*\\()",
+ "end": "(?=\\s+\\w+\\s*\\()",
+ "name": "meta.method.return-type.java",
+ "patterns": [
+ {
+ "include": "#all-types"
+ },
+ {
+ "include": "#parens"
+ },
+ {
+ "include": "#comments"
+ }
+ ]
+ },
+ {
+ "include": "#throws"
+ },
+ {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.method.begin.bracket.curly.java"
+ }
+ },
+ "end": "(?=})",
+ "contentName": "meta.method.body.java",
+ "patterns": [
+ {
+ "include": "#code"
+ }
+ ]
+ },
+ {
+ "include": "#comments"
+ }
+ ]
+ },
+ "module": {
+ "begin": "((open)\\s)?(module)\\s+(\\w+)",
+ "end": "}",
+ "beginCaptures": {
+ "1": {
+ "name": "storage.modifier.java"
+ },
+ "3": {
+ "name": "storage.modifier.java"
+ },
+ "4": {
+ "name": "entity.name.type.module.java"
+ }
+ },
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.section.module.end.bracket.curly.java"
+ }
+ },
+ "name": "meta.module.java",
+ "patterns": [
+ {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.module.begin.bracket.curly.java"
+ }
+ },
+ "end": "(?=})",
+ "contentName": "meta.module.body.java",
+ "patterns": [
+ {
+ "include": "#comments"
+ },
+ {
+ "include": "#comments-javadoc"
+ },
+ {
+ "match": "\\b(requires|transitive|exports|opens|to|uses|provides|with)\\b",
+ "name": "keyword.module.java"
+ }
+ ]
+ }
+ ]
+ },
+ "numbers": {
+ "patterns": [
+ {
+ "match": "(?x)\n\\b(?)?(\\()",
+ "beginCaptures": {
+ "1": {
+ "name": "storage.modifier.java"
+ },
+ "2": {
+ "name": "entity.name.type.record.java"
+ },
+ "3": {
+ "patterns": [
+ {
+ "include": "#generics"
+ }
+ ]
+ },
+ "4": {
+ "name": "punctuation.definition.parameters.begin.bracket.round.java"
+ }
+ },
+ "end": "\\)",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.parameters.end.bracket.round.java"
+ }
+ },
+ "name": "meta.record.identifier.java",
+ "patterns": [
+ {
+ "include": "#code"
+ }
+ ]
+ },
+ {
+ "begin": "(implements)\\s",
+ "beginCaptures": {
+ "1": {
+ "name": "storage.modifier.implements.java"
+ }
+ },
+ "end": "(?=\\s*\\{)",
+ "name": "meta.definition.class.implemented.interfaces.java",
+ "patterns": [
+ {
+ "include": "#object-types-inherited"
+ },
+ {
+ "include": "#comments"
+ }
+ ]
+ },
+ {
+ "include": "#record-body"
+ }
+ ]
+ },
+ "record-body": {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.class.begin.bracket.curly.java"
+ }
+ },
+ "end": "(?=})",
+ "name": "meta.record.body.java",
+ "patterns": [
+ {
+ "include": "#record-constructor"
+ },
+ {
+ "include": "#class-body"
+ }
+ ]
+ },
+ "record-constructor": {
+ "begin": "(?!new)(?=[\\w<].*\\s+)(?=([^\\(=/]|/(?!/))+(?={))",
+ "end": "(})|(?=;)",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.section.method.end.bracket.curly.java"
+ }
+ },
+ "name": "meta.method.java",
+ "patterns": [
+ {
+ "include": "#storage-modifiers"
+ },
+ {
+ "begin": "(\\w+)",
+ "beginCaptures": {
+ "1": {
+ "name": "entity.name.function.java"
+ }
+ },
+ "end": "(?=\\s*{)",
+ "name": "meta.method.identifier.java",
+ "patterns": [
+ {
+ "include": "#comments"
+ }
+ ]
+ },
+ {
+ "include": "#comments"
+ },
+ {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.method.begin.bracket.curly.java"
+ }
+ },
+ "end": "(?=})",
+ "contentName": "meta.method.body.java",
+ "patterns": [
+ {
+ "include": "#code"
+ }
+ ]
+ }
+ ]
+ },
+ "static-initializer": {
+ "patterns": [
+ {
+ "include": "#anonymous-block-and-instance-initializer"
+ },
+ {
+ "match": "static",
+ "name": "storage.modifier.java"
+ }
+ ]
+ },
+ "storage-modifiers": {
+ "match": "\\b(public|private|protected|static|final|native|synchronized|abstract|threadsafe|transient|volatile|default|strictfp|sealed|non-sealed)\\b",
+ "name": "storage.modifier.java"
+ },
+ "strings": {
+ "patterns": [
+ {
+ "begin": "\"",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.begin.java"
+ }
+ },
+ "end": "\"",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.java"
+ }
+ },
+ "name": "string.quoted.double.java",
+ "patterns": [
+ {
+ "match": "\\\\.",
+ "name": "constant.character.escape.java"
+ }
+ ]
+ },
+ {
+ "begin": "'",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.begin.java"
+ }
+ },
+ "end": "'",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.java"
+ }
+ },
+ "name": "string.quoted.single.java",
+ "patterns": [
+ {
+ "match": "\\\\.",
+ "name": "constant.character.escape.java"
+ }
+ ]
+ }
+ ]
+ },
+ "throws": {
+ "begin": "throws",
+ "beginCaptures": {
+ "0": {
+ "name": "storage.modifier.java"
+ }
+ },
+ "end": "(?={|;)",
+ "name": "meta.throwables.java",
+ "patterns": [
+ {
+ "match": ",",
+ "name": "punctuation.separator.delimiter.java"
+ },
+ {
+ "match": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
+ "name": "storage.type.java"
+ }
+ ]
+ },
+ "try-catch-finally": {
+ "patterns": [
+ {
+ "begin": "\\btry\\b",
+ "beginCaptures": {
+ "0": {
+ "name": "keyword.control.try.java"
+ }
+ },
+ "end": "}",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.section.try.end.bracket.curly.java"
+ }
+ },
+ "name": "meta.try.java",
+ "patterns": [
+ {
+ "begin": "\\(",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.try.resources.begin.bracket.round.java"
+ }
+ },
+ "end": "\\)",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.section.try.resources.end.bracket.round.java"
+ }
+ },
+ "name": "meta.try.resources.java",
+ "patterns": [
+ {
+ "include": "#code"
+ }
+ ]
+ },
+ {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.try.begin.bracket.curly.java"
+ }
+ },
+ "end": "(?=})",
+ "contentName": "meta.try.body.java",
+ "patterns": [
+ {
+ "include": "#code"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "begin": "\\b(catch)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.control.catch.java"
+ }
+ },
+ "end": "}",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.section.catch.end.bracket.curly.java"
+ }
+ },
+ "name": "meta.catch.java",
+ "patterns": [
+ {
+ "include": "#comments"
+ },
+ {
+ "begin": "\\(",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.parameters.begin.bracket.round.java"
+ }
+ },
+ "end": "\\)",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.parameters.end.bracket.round.java"
+ }
+ },
+ "contentName": "meta.catch.parameters.java",
+ "patterns": [
+ {
+ "include": "#comments"
+ },
+ {
+ "include": "#storage-modifiers"
+ },
+ {
+ "begin": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
+ "beginCaptures": {
+ "0": {
+ "name": "storage.type.java"
+ }
+ },
+ "end": "(\\|)|(?=\\))",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.catch.separator.java"
+ }
+ },
+ "patterns": [
+ {
+ "include": "#comments"
+ },
+ {
+ "match": "\\w+",
+ "captures": {
+ "0": {
+ "name": "variable.parameter.java"
+ }
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.catch.begin.bracket.curly.java"
+ }
+ },
+ "end": "(?=})",
+ "contentName": "meta.catch.body.java",
+ "patterns": [
+ {
+ "include": "#code"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "begin": "\\bfinally\\b",
+ "beginCaptures": {
+ "0": {
+ "name": "keyword.control.finally.java"
+ }
+ },
+ "end": "}",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.section.finally.end.bracket.curly.java"
+ }
+ },
+ "name": "meta.finally.java",
+ "patterns": [
+ {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.finally.begin.bracket.curly.java"
+ }
+ },
+ "end": "(?=})",
+ "contentName": "meta.finally.body.java",
+ "patterns": [
+ {
+ "include": "#code"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ "variables": {
+ "begin": "(?x)\n(?=\n \\b\n (\n (void|boolean|byte|char|short|int|float|long|double)\n |\n (?>(\\w+\\.)*[A-Z_]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n )\n \\b\n \\s*\n (\n <[\\w<>,\\.?\\s\\[\\]]*> # e.g. `HashMap`, or `List`\n )?\n \\s*\n (\n (\\[\\])* # int[][]\n )?\n \\s+\n [A-Za-z_$][\\w$]* # At least one identifier after space\n ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n \\s*(=|:|;)\n)",
+ "end": "(?=\\=|:|;)",
+ "name": "meta.definition.variable.java",
+ "patterns": [
+ {
+ "match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(;|:|=|,))",
+ "captures": {
+ "1": {
+ "name": "variable.other.definition.java"
+ }
+ }
+ },
+ {
+ "include": "#all-types"
+ },
+ {
+ "include": "#code"
+ }
+ ]
+ },
+ "variables-local": {
+ "begin": "(?=\\b(var)\\b\\s+[A-Za-z_$][\\w$]*\\s*(=|:|;))",
+ "end": "(?=\\=|:|;)",
+ "name": "meta.definition.variable.local.java",
+ "patterns": [
+ {
+ "match": "\\bvar\\b",
+ "name": "storage.type.local.java"
+ },
+ {
+ "match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(=|:|;))",
+ "captures": {
+ "1": {
+ "name": "variable.other.definition.java"
+ }
+ }
+ },
+ {
+ "include": "#code"
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/json/language-configuration.json b/app/src/main/assets/textmate/json/language-configuration.json
new file mode 100644
index 000000000..094b22275
--- /dev/null
+++ b/app/src/main/assets/textmate/json/language-configuration.json
@@ -0,0 +1,38 @@
+{
+ "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"
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/json/syntaxes/json.tmLanguage.json b/app/src/main/assets/textmate/json/syntaxes/json.tmLanguage.json
new file mode 100644
index 000000000..46ee87f21
--- /dev/null
+++ b/app/src/main/assets/textmate/json/syntaxes/json.tmLanguage.json
@@ -0,0 +1,182 @@
+{
+ "scopeName": "source.json",
+ "name": "JSON",
+ "fileTypes": [
+ "avsc",
+ "babelrc",
+ "bowerrc",
+ "composer.lock",
+ "geojson",
+ "gltf",
+ "htmlhintrc",
+ "ipynb",
+ "jscsrc",
+ "jshintrc",
+ "jslintrc",
+ "json",
+ "jsonl",
+ "jsonld",
+ "languagebabel",
+ "ldj",
+ "ldjson",
+ "Pipfile.lock",
+ "schema",
+ "stylintrc",
+ "template",
+ "tern-config",
+ "tern-project",
+ "tfstate",
+ "tfstate.backup",
+ "topojson",
+ "webapp",
+ "webmanifest"
+ ],
+ "patterns": [
+ {
+ "include": "#value"
+ }
+ ],
+ "repository": {
+ "array": {
+ "begin": "\\[",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.array.begin.json"
+ }
+ },
+ "end": "(,)?[\\s\\n]*(\\])",
+ "endCaptures": {
+ "1": {
+ "name": "invalid.illegal.trailing-array-separator.json"
+ },
+ "2": {
+ "name": "punctuation.definition.array.end.json"
+ }
+ },
+ "name": "meta.structure.array.json",
+ "patterns": [
+ {
+ "include": "#value"
+ },
+ {
+ "match": ",",
+ "name": "punctuation.separator.array.json"
+ },
+ {
+ "match": "[^\\s\\]]",
+ "name": "invalid.illegal.expected-array-separator.json"
+ }
+ ]
+ },
+ "constant": {
+ "match": "\\b(true|false|null)\\b",
+ "name": "constant.language.json"
+ },
+ "number": {
+ "match": "-?(?=[1-9]|0(?!\\d))\\d+(\\.\\d+)?([eE][+-]?\\d+)?",
+ "name": "constant.numeric.json"
+ },
+ "object": {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.dictionary.begin.json"
+ }
+ },
+ "end": "}",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.dictionary.end.json"
+ }
+ },
+ "name": "meta.structure.dictionary.json",
+ "patterns": [
+ {
+ "begin": "(?=\")",
+ "end": "(?<=\")",
+ "name": "meta.structure.dictionary.key.json",
+ "patterns": [
+ {
+ "include": "#string"
+ }
+ ]
+ },
+ {
+ "begin": ":",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.separator.dictionary.key-value.json"
+ }
+ },
+ "end": "(,)(?=[\\s\\n]*})|(,)|(?=})",
+ "endCaptures": {
+ "1": {
+ "name": "invalid.illegal.trailing-dictionary-separator.json"
+ },
+ "2": {
+ "name": "punctuation.separator.dictionary.pair.json"
+ }
+ },
+ "name": "meta.structure.dictionary.value.json",
+ "patterns": [
+ {
+ "include": "#value"
+ },
+ {
+ "match": "[^\\s,]",
+ "name": "invalid.illegal.expected-dictionary-separator.json"
+ }
+ ]
+ },
+ {
+ "match": "[^\\s}]",
+ "name": "invalid.illegal.expected-dictionary-separator.json"
+ }
+ ]
+ },
+ "string": {
+ "begin": "\"",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.begin.json"
+ }
+ },
+ "end": "\"",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.json"
+ }
+ },
+ "name": "string.quoted.double.json",
+ "patterns": [
+ {
+ "match": "(?x)\n\\\\ # a literal backslash\n( # followed by\n [\"\\\\/bfnrt] # one of these characters\n | # or\n u[0-9a-fA-F]{4} # a u and four hex digits\n)",
+ "name": "constant.character.escape.json"
+ },
+ {
+ "match": "\\\\.",
+ "name": "invalid.illegal.unrecognized-string-escape.json"
+ }
+ ]
+ },
+ "value": {
+ "patterns": [
+ {
+ "include": "#constant"
+ },
+ {
+ "include": "#number"
+ },
+ {
+ "include": "#string"
+ },
+ {
+ "include": "#array"
+ },
+ {
+ "include": "#object"
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/kotlin/language-configuration.json b/app/src/main/assets/textmate/kotlin/language-configuration.json
new file mode 100644
index 000000000..b742e9e0c
--- /dev/null
+++ b/app/src/main/assets/textmate/kotlin/language-configuration.json
@@ -0,0 +1,35 @@
+{
+ "comments": {
+ "lineComment": "//",
+ "blockComment": [ "/*", "*/" ]
+ },
+ "brackets": [
+ ["{", "}"],
+ ["[", "]"],
+ ["(", ")"],
+ ["<", ">"]
+ ],
+ "autoClosingPairs": [
+ { "open": "{", "close": "}" },
+ { "open": "[", "close": "]" },
+ { "open": "(", "close": ")" },
+ { "open": "'", "close": "'", "notIn": ["string", "comment"] },
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "/*", "close": " */", "notIn": ["string"] }
+ ],
+ "surroundingPairs": [
+ ["{", "}"],
+ ["[", "]"],
+ ["(", ")"],
+ ["<", ">"],
+ ["'", "'"],
+ ["\"", "\""]
+ ],
+ "folding": {
+ "offSide": false,
+ "markers": {
+ "start": "^\\s*//\\s*#region",
+ "end": "^\\s*//\\s*#endregion"
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/kotlin/syntaxes/kotlin.tmLanguage b/app/src/main/assets/textmate/kotlin/syntaxes/kotlin.tmLanguage
new file mode 100644
index 000000000..4a61ffeb2
--- /dev/null
+++ b/app/src/main/assets/textmate/kotlin/syntaxes/kotlin.tmLanguage
@@ -0,0 +1,1067 @@
+
+
+
+
+ fileTypes
+
+ kt
+ kts
+
+ foldingStartMarker
+ (\{\s*(//.*)?$|^\s*// \{\{\{)
+ foldingStopMarker
+ ^\s*(\}|// \}\}\}$)
+ name
+ Kotlin
+ patterns
+
+
+ include
+ #comments
+
+
+ captures
+
+ 1
+
+ name
+ keyword.other.kotlin
+
+ 2
+
+ name
+ entity.name.package.kotlin
+
+
+ match
+ ^\s*(package)\b(?:\s*([^ ;$]+)\s*)?
+
+
+ captures
+
+ 1
+
+ name
+ keyword.other.import.kotlin
+
+ 2
+
+ name
+ storage.modifier.import.java
+
+ 3
+
+ name
+ keyword.other.kotlin
+
+ 4
+
+ name
+ entity.name.type
+
+
+ match
+ ^\s*(import)\s+([^ $.]+(?:\.(?:[`][^$`]+[`]|[^` $.]+))+)(?:\s+(as)\s+([`][^$`]+[`]|[^` $.]+))?
+ name
+ meta.import.kotlin
+
+
+ include
+ #code
+
+
+ repository
+
+ annotations
+
+ patterns
+
+
+ begin
+ (@[^ (]+)(\()?
+ beginCaptures
+
+ 1
+
+ name
+ storage.type.annotation.kotlin
+
+ 2
+
+ name
+ punctuation.definition.annotation-arguments.begin.kotlin
+
+
+ end
+ (\)|\s|$)
+ endCaptures
+
+ 1
+
+ name
+ punctuation.definition.annotation-arguments.end.kotlin
+
+
+ name
+ meta.declaration.annotation.kotlin
+ patterns
+
+
+ captures
+
+ 1
+
+ name
+ constant.other.key.kotlin
+
+ 2
+
+ name
+ keyword.operator.assignment.kotlin
+
+
+ match
+ (\w*)\s*(=)
+
+
+ include
+ #code
+
+
+ match
+ ,
+ name
+ punctuation.seperator.property.kotlin
+
+
+
+
+ match
+ @\w*
+ name
+ storage.type.annotation.kotlin
+
+
+
+ builtin-functions
+
+ patterns
+
+
+ match
+ \b(apply|also|let|takeIf|run|takeUnless|with|print|println)\b\s*(?={|\()
+ captures
+
+ 1
+
+ name
+ support.function.kotlin
+
+
+
+
+ match
+ \b(mutableListOf|listOf|mutableMapOf|mapOf|mutableSetOf|setOf)\b\s*(?={|\()
+ captures
+
+ 1
+
+ name
+ support.function.kotlin
+
+
+
+
+
+ comments
+
+ patterns
+
+
+ captures
+
+ 0
+
+ name
+ punctuation.definition.comment.kotlin
+
+
+ match
+ /\*\*/
+ name
+ comment.block.empty.kotlin
+
+
+ include
+ #comments-inline
+
+
+
+ comments-inline
+
+ patterns
+
+
+ begin
+ /\*
+ captures
+
+ 0
+
+ name
+ punctuation.definition.comment.kotlin
+
+
+ end
+ \*/
+ name
+ comment.block.kotlin
+
+
+ captures
+
+ 1
+
+ name
+ comment.line.double-slash.kotlin
+
+ 2
+
+ name
+ punctuation.definition.comment.kotlin
+
+
+ match
+ \s*((//).*$\n?)
+
+
+
+ class-literal
+
+ begin
+ (?=\b(?:class|interface|object)\s+\w+)\b
+ end
+ (?=\}|$)
+ name
+ meta.class.kotlin
+ patterns
+
+
+ include
+ #keyword-literal
+
+
+ begin
+ \b(class|object|interface)\b\s+(\w+)
+ beginCaptures
+
+ 1
+
+ name
+ storage.modifier.kotlin
+
+ 2
+
+ name
+ entity.name.class.kotlin
+
+
+ end
+ (?=\{|\(|:|$)
+ patterns
+
+
+ include
+ #keyword-literal
+
+
+ include
+ #annotations
+
+
+ include
+ #types
+
+
+
+
+ begin
+ (:)\s*(\w+)
+ beginCaptures
+
+ 1
+
+ name
+ keyword.operator.declaration.kotlin
+
+ 2
+
+ name
+ entity.other.inherited-class.kotlin
+
+
+ end
+ (?={|=|$)
+ patterns
+
+
+ include
+ #types
+
+
+
+
+ include
+ #braces
+
+
+ include
+ #parens
+
+
+
+ literal-functions
+
+ begin
+ (?=\b(?:fun)\b)
+ end
+ (?=$|=|\})
+ patterns
+
+
+ begin
+ \b(fun)\b
+ beginCaptures
+
+ 1
+
+ name
+ keyword.other.kotlin
+
+
+ end
+ (?=\()
+ patterns
+
+
+ captures
+
+ 2
+
+ name
+ entity.name.function.kotlin
+
+
+ match
+ ([\.<\?>\w]+\.)?(\w+|(`[^`]*`))
+
+
+ include
+ #types
+
+
+
+
+ begin
+ (:)
+ beginCaptures
+
+ 1
+
+ name
+ keyword.operator.declaration.kotlin
+
+
+ end
+ (?={|=|$)
+ patterns
+
+
+ include
+ #types
+
+
+
+
+ include
+ #parens
+
+
+ include
+ #braces
+
+
+
+ parameters
+
+ patterns
+
+
+ begin
+ (:)
+ beginCaptures
+
+ 1
+
+ name
+ keyword.operator.declaration.kotlin
+
+
+ end
+ (?=,|=|\))
+ patterns
+
+
+ include
+ #types
+
+
+
+
+ match
+ \w+(?=:)
+ name
+ variable.parameter.function.kotlin
+
+
+ include
+ #keyword-literal
+
+
+
+ keyword-literal
+
+ patterns
+
+
+ match
+ (\!in|\!is|as\?)
+ name
+ keyword.operator.kotlin
+
+
+ match
+ \b(in|is|as|assert)\b
+ name
+ keyword.operator.kotlin
+
+
+ match
+ \b(const)\b
+ name
+ storage.modifier.kotlin
+
+
+ match
+ \b(val|var)\b
+ name
+ storage.type.kotlin
+
+
+ match
+ \b(\_)\b
+ name
+ punctuation.definition.variable.kotlin
+
+
+ match
+ \b(data|inline|tailrec|operator|infix|typealias|reified)\b
+ name
+ storage.type.kotlin
+
+
+ match
+ \b(external|public|private|protected|internal|abstract|final|sealed|enum|open|annotation|override|vararg|typealias|expect|actual|suspend|yield|out|in)\b
+ name
+ storage.modifier.kotlin
+
+
+ match
+ \b(try|catch|finally|throw)\b
+ name
+ keyword.control.catch-exception.kotlin
+
+
+ match
+ \b(if|else|when)\b
+ name
+ keyword.control.conditional.kotlin
+
+
+ match
+ \b(while|for|do|return|break|continue)\b
+ name
+ keyword.control.kotlin
+
+
+ match
+ \b(constructor|init)\b
+ name
+ entity.name.function.constructor
+
+
+ match
+ \b(companion|object)\b
+ name
+ storage.type.kotlin
+
+
+
+ keyword-operator
+
+ patterns
+
+
+ match
+ \b(and|or|not|inv)\b
+ name
+ keyword.operator.bitwise.kotlin
+
+
+ match
+ (==|!=|===|!==|<=|>=|<|>)
+ name
+ keyword.operator.comparison.kotlin
+
+
+ match
+ (=)
+ name
+ keyword.operator.assignment.kotlin
+
+
+ match
+ (:(?!:))
+ name
+ keyword.operator.declaration.kotlin
+
+
+ match
+ (\?:)
+ name
+ keyword.operator.elvis.kotlin
+
+
+ match
+ (\-\-|\+\+)
+ name
+ keyword.operator.increment-decrement.kotlin
+
+
+ match
+ (\-|\+|\*|\/|%)
+ name
+ keyword.operator.arithmetic.kotlin
+
+
+ match
+ (\+\=|\-\=|\*\=|\/\=)
+ name
+ keyword.operator.arithmetic.assign.kotlin
+
+
+ match
+ (\!|\&\&|\|\|)
+ name
+ keyword.operator.logical.kotlin
+
+
+ match
+ (\.\.)
+ name
+ keyword.operator.range.kotlin
+
+
+
+ keyword-punctuation
+
+ patterns
+
+
+ match
+ (::)
+ name
+ punctuation.accessor.reference.kotlin
+
+
+ match
+ (\?\.)
+ name
+ punctuation.accessor.dot.safe.kotlin
+
+
+ match
+ (\.)
+ name
+ punctuation.accessor.dot.kotlin
+
+
+ match
+ (\,)
+ name
+ punctuation.seperator.kotlin
+
+
+ match
+ (\;)
+ name
+ punctuation.terminator.kotlin
+
+
+
+ keyword-constant
+
+ patterns
+
+
+ match
+ \b(true|false|null|class)\b
+ name
+ constant.language.kotlin
+
+
+ match
+ \b(this|super)\b
+ name
+ variable.language.kotlin
+
+
+ match
+ \b(0(x|X)[0-9A-Fa-f_]*)[L]?\b
+ name
+ constant.numeric.hex.kotlin
+
+
+ match
+ \b(0(b|B)[0-1_]*)[L]?\b
+ name
+ constant.numeric.binary.kotlin
+
+
+ match
+ \b([0-9][0-9_]*\.[0-9][0-9_]*[fFL]?)\b
+ name
+ constant.numeric.float.kotlin
+
+
+ match
+ \b([0-9][0-9_]*[fFL]?)\b
+ name
+ constant.numeric.integer.kotlin
+
+
+
+ literal-string
+
+ patterns
+
+
+ begin
+ "
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.begin.kotlin
+
+
+ end
+ "
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.end.kotlin
+
+
+ name
+ string.quoted.double.kotlin
+ patterns
+
+
+ include
+ #string-content
+
+
+
+
+
+ literal-raw-string
+
+ patterns
+
+
+ begin
+ """
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.begin.kotlin
+
+
+ end
+ """
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.end.kotlin
+
+
+ name
+ string.quoted.triple.kotlin
+ patterns
+
+
+ include
+ #string-content
+
+
+
+
+
+ string-content
+
+ patterns
+
+
+ name
+ constant.character.escape.newline.kotlin
+ match
+ \\\s*\n
+
+
+ name
+ constant.character.escape.kotlin
+ match
+ \\(x[\da-fA-F]{2}|u[\da-fA-F]{4}|.)
+
+
+ begin
+ (\$)(\{)
+ beginCaptures
+
+ 1
+
+ name
+ punctuation.definition.keyword.kotlin
+
+ 2
+
+ name
+ punctuation.section.block.begin.kotlin
+
+
+ end
+ \}
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.block.end.kotlin
+
+
+ name
+ entity.string.template.element.kotlin
+ patterns
+
+
+ include
+ #code
+
+
+
+
+
+ types
+
+ patterns
+
+
+ match
+ \b(Nothing|Any|Unit|String|CharSequence|Int|Boolean|Char|Long|Double|Float|Short|Byte|Array|List|Map|Set|dynamic)\b(\?)?
+ name
+ support.class.kotlin
+
+
+ match
+ \b(IntArray|BooleanArray|CharArray|LongArray|DoubleArray|FloatArray|ShortArray|ByteArray)\b(\?)?
+ name
+ support.class.kotlin
+
+
+ match
+ ((?:[a-zA-Z]\w*\.)*[A-Z]+\w*[a-z]+\w*)(\?)
+ name
+ entity.name.type.class.kotlin
+ patterns
+
+
+ include
+ #keyword-punctuation
+
+
+ include
+ #types
+
+
+
+
+ match
+ \b(?:[a-z]\w*(\.))*[A-Z]+\w*\b
+ captures
+
+ 1
+
+ name
+ keyword.operator.dereference.kotlin
+
+
+ name
+ entity.name.type.class.kotlin
+
+
+ begin
+ \(
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.section.group.begin.kotlin
+
+
+ end
+ \)
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.group.end.kotlin
+
+
+ patterns
+
+
+ include
+ #types
+
+
+
+
+ include
+ #keyword-punctuation
+
+
+ include
+ #keyword-operator
+
+
+
+ parens
+
+ patterns
+
+
+ begin
+ \(
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.section.group.begin.kotlin
+
+
+ end
+ \)
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.group.end.kotlin
+
+
+ name
+ meta.group.kotlin
+ patterns
+
+
+ include
+ #keyword-punctuation
+
+
+ include
+ #parameters
+
+
+ include
+ #code
+
+
+
+
+
+ braces
+
+ patterns
+
+
+ begin
+ \{
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.section.group.begin.kotlin
+
+
+ end
+ \}
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.group.end.kotlin
+
+
+ name
+ meta.block.kotlin
+ patterns
+
+
+ include
+ #code
+
+
+
+
+
+ brackets
+
+ patterns
+
+
+ begin
+ \[
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.section.brackets.begin.kotlin
+
+
+ end
+ \]
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.brackets.end.kotlin
+
+
+ name
+ meta.brackets.kotlin
+ patterns
+
+
+ include
+ #code
+
+
+
+
+
+ code
+
+ patterns
+
+
+ include
+ #comments
+
+
+ include
+ #comments-inline
+
+
+ include
+ #annotations
+
+
+ include
+ #class-literal
+
+
+ include
+ #parens
+
+
+ include
+ #braces
+
+
+ include
+ #brackets
+
+
+ include
+ #keyword-literal
+
+
+ include
+ #types
+
+
+ include
+ #keyword-operator
+
+
+ include
+ #keyword-constant
+
+
+ include
+ #keyword-punctuation
+
+
+ include
+ #builtin-functions
+
+
+ include
+ #literal-functions
+
+
+ include
+ #builtin-classes
+
+
+ include
+ #literal-raw-string
+
+
+ include
+ #literal-string
+
+
+
+
+ scopeName
+ source.kotlin
+ uuid
+ d9380650-5edc-447d-8dbd-98838c7d0adf
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/xml/language-configuration.json b/app/src/main/assets/textmate/xml/language-configuration.json
new file mode 100644
index 000000000..00f0bd9af
--- /dev/null
+++ b/app/src/main/assets/textmate/xml/language-configuration.json
@@ -0,0 +1,42 @@
+{
+ "comments": {
+ "lineComment": [""],
+ },
+ "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"
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/assets/textmate/xml/syntaxes/xml.tmLanguage.json b/app/src/main/assets/textmate/xml/syntaxes/xml.tmLanguage.json
new file mode 100644
index 000000000..d493c6a3a
--- /dev/null
+++ b/app/src/main/assets/textmate/xml/syntaxes/xml.tmLanguage.json
@@ -0,0 +1,430 @@
+{
+ "scopeName": "text.xml",
+ "name": "XML",
+ "fileTypes": [
+ "aiml",
+ "atom",
+ "axml",
+ "bpmn",
+ "config",
+ "cpt",
+ "csl",
+ "csproj",
+ "csproj.user",
+ "dae",
+ "dia",
+ "dita",
+ "ditamap",
+ "dtml",
+ "fodg",
+ "fodp",
+ "fods",
+ "fodt",
+ "fsproj",
+ "fxml",
+ "gir",
+ "glade",
+ "gpx",
+ "graphml",
+ "icls",
+ "iml",
+ "isml",
+ "jmx",
+ "jsp",
+ "kml",
+ "kst",
+ "launch",
+ "menu",
+ "mxml",
+ "nunit",
+ "nuspec",
+ "opml",
+ "owl",
+ "pom",
+ "ppj",
+ "proj",
+ "pt",
+ "pubxml",
+ "pubxml.user",
+ "rdf",
+ "rng",
+ "rss",
+ "sdf",
+ "shproj",
+ "siml",
+ "sld",
+ "storyboard",
+ "StyleCop",
+ "svg",
+ "targets",
+ "tld",
+ "vbox",
+ "vbox-prev",
+ "vbproj",
+ "vbproj.user",
+ "vcproj",
+ "vcproj.filters",
+ "vcxproj",
+ "vcxproj.filters",
+ "wixmsp",
+ "wixmst",
+ "wixobj",
+ "wixout",
+ "wsdl",
+ "wxs",
+ "xaml",
+ "xbl",
+ "xib",
+ "xlf",
+ "xliff",
+ "xml",
+ "xpdl",
+ "xsd",
+ "xul",
+ "ui"
+ ],
+ "firstLineMatch": "(?x)\n# XML declaration\n(?:\n ^ <\\? xml\n\n # VersionInfo\n \\s+ version\n \\s* = \\s*\n (['\"])\n 1 \\. [0-9]+\n \\1\n\n # EncodingDecl\n (?:\n \\s+ encoding\n \\s* = \\s*\n\n # EncName\n (['\"])\n [A-Za-z]\n [-A-Za-z0-9._]*\n \\2\n )?\n\n # SDDecl\n (?:\n \\s+ standalone\n \\s* = \\s*\n (['\"])\n (?:yes|no)\n \\3\n )?\n\n \\s* \\?>\n)\n|\n# Modeline\n(?i:\n # Emacs\n -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n xml\n (?=[\\s;]|(?]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n xml\n (?=\\s|:|$)\n)",
+ "patterns": [
+ {
+ "begin": "(<\\?)\\s*([-_a-zA-Z0-9]+)",
+ "captures": {
+ "1": {
+ "name": "punctuation.definition.tag.xml"
+ },
+ "2": {
+ "name": "entity.name.tag.xml"
+ }
+ },
+ "end": "(\\?>)",
+ "name": "meta.tag.preprocessor.xml",
+ "patterns": [
+ {
+ "match": " ([a-zA-Z-]+)",
+ "name": "entity.other.attribute-name.xml"
+ },
+ {
+ "include": "#doublequotedString"
+ },
+ {
+ "include": "#singlequotedString"
+ }
+ ]
+ },
+ {
+ "begin": "()",
+ "name": "meta.tag.sgml.doctype.xml",
+ "patterns": [
+ {
+ "include": "#internalSubset"
+ }
+ ]
+ },
+ {
+ "include": "#comments"
+ },
+ {
+ "begin": "(<)((?:([-_a-zA-Z0-9]+)(:))?([-_a-zA-Z0-9:]+))(?=(\\s[^>]*)?>)",
+ "beginCaptures": {
+ "1": {
+ "name": "punctuation.definition.tag.xml"
+ },
+ "2": {
+ "name": "entity.name.tag.xml"
+ },
+ "3": {
+ "name": "entity.name.tag.namespace.xml"
+ },
+ "4": {
+ "name": "punctuation.separator.namespace.xml"
+ },
+ "5": {
+ "name": "entity.name.tag.localname.xml"
+ }
+ },
+ "end": "(>)()",
+ "endCaptures": {
+ "1": {
+ "name": "punctuation.definition.tag.xml"
+ },
+ "2": {
+ "name": "punctuation.definition.tag.xml"
+ },
+ "3": {
+ "name": "entity.name.tag.xml"
+ },
+ "4": {
+ "name": "entity.name.tag.namespace.xml"
+ },
+ "5": {
+ "name": "punctuation.separator.namespace.xml"
+ },
+ "6": {
+ "name": "entity.name.tag.localname.xml"
+ },
+ "7": {
+ "name": "punctuation.definition.tag.xml"
+ }
+ },
+ "name": "meta.tag.no-content.xml",
+ "patterns": [
+ {
+ "include": "#tagStuff"
+ }
+ ]
+ },
+ {
+ "begin": "()",
+ "name": "meta.tag.xml",
+ "patterns": [
+ {
+ "include": "#tagStuff"
+ }
+ ]
+ },
+ {
+ "include": "#entity"
+ },
+ {
+ "include": "#bare-ampersand"
+ },
+ {
+ "begin": "<%@",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.embedded.begin.xml"
+ }
+ },
+ "end": "%>",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.section.embedded.end.xml"
+ }
+ },
+ "name": "source.java-props.embedded.xml",
+ "patterns": [
+ {
+ "match": "page|include|taglib",
+ "name": "keyword.other.page-props.xml"
+ }
+ ]
+ },
+ {
+ "begin": "<%[!=]?(?!--)",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.section.embedded.begin.xml"
+ }
+ },
+ "end": "(?!--)%>",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.section.embedded.end.xml"
+ }
+ },
+ "name": "source.java.embedded.xml",
+ "patterns": [
+ {
+ "include": "source.java"
+ }
+ ]
+ },
+ {
+ "begin": "",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.xml"
+ }
+ },
+ "name": "string.unquoted.cdata.xml"
+ }
+ ],
+ "repository": {
+ "EntityDecl": {
+ "begin": "()",
+ "patterns": [
+ {
+ "include": "#doublequotedString"
+ },
+ {
+ "include": "#singlequotedString"
+ }
+ ]
+ },
+ "bare-ampersand": {
+ "match": "&",
+ "name": "invalid.illegal.bad-ampersand.xml"
+ },
+ "doublequotedString": {
+ "begin": "\"",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.begin.xml"
+ }
+ },
+ "end": "\"",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.xml"
+ }
+ },
+ "name": "string.quoted.double.xml",
+ "patterns": [
+ {
+ "include": "#entity"
+ },
+ {
+ "include": "#bare-ampersand"
+ }
+ ]
+ },
+ "entity": {
+ "captures": {
+ "1": {
+ "name": "punctuation.definition.constant.xml"
+ },
+ "3": {
+ "name": "punctuation.definition.constant.xml"
+ }
+ },
+ "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+ "name": "constant.character.entity.xml"
+ },
+ "internalSubset": {
+ "begin": "(\\[)",
+ "captures": {
+ "1": {
+ "name": "punctuation.definition.constant.xml"
+ }
+ },
+ "end": "(\\])",
+ "name": "meta.internalsubset.xml",
+ "patterns": [
+ {
+ "include": "#EntityDecl"
+ },
+ {
+ "include": "#parameterEntity"
+ },
+ {
+ "include": "#comments"
+ }
+ ]
+ },
+ "parameterEntity": {
+ "captures": {
+ "1": {
+ "name": "punctuation.definition.constant.xml"
+ },
+ "3": {
+ "name": "punctuation.definition.constant.xml"
+ }
+ },
+ "match": "(%)([:a-zA-Z_][:a-zA-Z0-9_.-]*)(;)",
+ "name": "constant.character.parameter-entity.xml"
+ },
+ "singlequotedString": {
+ "begin": "'",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.begin.xml"
+ }
+ },
+ "end": "'",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.xml"
+ }
+ },
+ "name": "string.quoted.single.xml",
+ "patterns": [
+ {
+ "include": "#entity"
+ },
+ {
+ "include": "#bare-ampersand"
+ }
+ ]
+ },
+ "tagStuff": {
+ "patterns": [
+ {
+ "captures": {
+ "1": {
+ "name": "entity.other.attribute-name.namespace.xml"
+ },
+ "2": {
+ "name": "entity.other.attribute-name.xml"
+ },
+ "3": {
+ "name": "punctuation.separator.namespace.xml"
+ },
+ "4": {
+ "name": "entity.other.attribute-name.localname.xml"
+ }
+ },
+ "match": "(?:^|\\s+)(?:([-\\w.]+)((:)))?([-\\w.:]+)\\s*="
+ },
+ {
+ "include": "#doublequotedString"
+ },
+ {
+ "include": "#singlequotedString"
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/ApplicationLoader.java b/app/src/main/java/com/tyron/code/ApplicationLoader.java
index 7f8535b46..cecee9922 100644
--- a/app/src/main/java/com/tyron/code/ApplicationLoader.java
+++ b/app/src/main/java/com/tyron/code/ApplicationLoader.java
@@ -2,30 +2,91 @@
import android.app.Application;
import android.content.Context;
+import android.content.Intent;
import android.content.SharedPreferences;
-import android.os.Handler;
-import android.os.Looper;
+import android.os.Build;
import android.widget.Toast;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AppCompatDelegate;
import androidx.preference.PreferenceManager;
import com.developer.crashx.config.CrashConfig;
+import com.tyron.actions.ActionManager;
import com.tyron.builder.BuildModule;
+import com.tyron.code.event.EventManager;
+import com.tyron.code.service.GradleDaemonService;
+import com.tyron.code.ui.editor.action.CloseAllEditorAction;
+import com.tyron.code.ui.editor.action.CloseFileEditorAction;
+import com.tyron.code.ui.editor.action.CloseOtherEditorAction;
+import com.tyron.code.ui.editor.action.DiagnosticInfoAction;
+import com.tyron.code.ui.editor.action.PreviewLayoutAction;
+import com.tyron.code.ui.editor.action.text.TextActionGroup;
+import com.tyron.code.ui.file.action.ImportFileActionGroup;
+import com.tyron.code.ui.file.action.NewFileActionGroup;
+import com.tyron.code.ui.file.action.file.DeleteFileAction;
+import com.tyron.code.ui.main.action.compile.CompileActionGroup;
+import com.tyron.code.ui.main.action.debug.DebugActionGroup;
+import com.tyron.code.ui.main.action.other.FormatAction;
+import com.tyron.code.ui.main.action.other.OpenSettingsAction;
+import com.tyron.code.ui.main.action.project.ProjectActionGroup;
+import com.tyron.code.ui.settings.ApplicationSettingsFragment;
import com.tyron.common.ApplicationProvider;
+import com.tyron.completion.CompletionProvider;
+import com.tyron.completion.index.CompilerService;
import com.tyron.completion.java.CompletionModule;
+import com.tyron.completion.java.JavaCompilerProvider;
+import com.tyron.completion.java.JavaCompletionProvider;
import com.tyron.completion.xml.XmlCompletionModule;
+import com.tyron.completion.xml.XmlIndexProvider;
+import com.tyron.editor.selection.ExpandSelectionProvider;
+import com.tyron.kotlin_completion.KotlinCompletionModule;
+import com.tyron.language.fileTypes.FileTypeManager;
+import com.tyron.language.java.JavaFileType;
+import com.tyron.language.java.JavaLanguage;
+import com.tyron.language.xml.XmlFileType;
+import com.tyron.language.xml.XmlLanguage;
+import com.tyron.selection.java.JavaExpandSelectionProvider;
+import com.tyron.selection.xml.XmlExpandSelectionProvider;
+
+import org.gradle.internal.time.Time;
+import org.gradle.internal.time.Timer;
+import org.lsposed.hiddenapibypass.HiddenApiBypass;
+
+import java.io.File;
+import java.io.IOException;
public class ApplicationLoader extends Application {
-
+
+ private static ApplicationLoader sInstance;
+
+ public static ApplicationLoader getInstance() {
+ return sInstance;
+ }
+
+ private EventManager mEventManager;
+
+ // no memory leaks since applicationContext is a singleton
public static Context applicationContext;
- public static Handler applicationHandler = new Handler(Looper.getMainLooper());
@Override
public void onCreate() {
+ Timer timer = Time.startTimer();
super.onCreate();
- applicationContext = this;
+ System.out.println("onCreate took " + timer.getElapsed());
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ HiddenApiBypass.addHiddenApiExemptions("Lsun/misc/Unsafe");
+ }
+
+ setupTheme();
+
+ mEventManager = new EventManager();
+ sInstance = this;
+ applicationContext = this;
ApplicationProvider.initialize(applicationContext);
CompletionModule.initialize(applicationContext);
@@ -40,6 +101,88 @@ public void onCreate() {
.logErrorOnRestart(true)
.trackActivities(true)
.apply();
+
+ runStartup();
+
+ File userDir = new File(getFilesDir(), "user_dir");
+ System.setProperty("codeassist.user.dir", userDir.getAbsolutePath());
+ }
+
+ /**
+ * Can be used to communicate within the application globally
+ * @return the EventManager
+ */
+ @NonNull
+ public EventManager getEventManager() {
+ return mEventManager;
+ }
+
+ private void setupTheme() {
+ ApplicationSettingsFragment.ThemeProvider provider = new ApplicationSettingsFragment.ThemeProvider(this);
+ int theme = provider.getThemeFromPreferences();
+ AppCompatDelegate.setDefaultNightMode(theme);
+ }
+
+ private void runStartup() {
+ StartupManager startupManager = new StartupManager();
+ startupManager.addStartupActivity(() -> {
+ FileTypeManager manager = FileTypeManager.getInstance();
+ manager.registerFileType(JavaFileType.INSTANCE);
+ manager.registerFileType(XmlFileType.INSTANCE);
+ });
+ startupManager.addStartupActivity(() -> {
+ ExpandSelectionProvider.registerProvider(JavaLanguage.INSTANCE,
+ new JavaExpandSelectionProvider());
+ ExpandSelectionProvider.registerProvider(XmlLanguage.INSTANCE,
+ new XmlExpandSelectionProvider());
+ });
+ startupManager.addStartupActivity(() -> {
+ CompilerService index = CompilerService.getInstance();
+ if (index.isEmpty()) {
+ index.registerIndexProvider(JavaCompilerProvider.KEY, new JavaCompilerProvider());
+ index.registerIndexProvider(XmlIndexProvider.KEY, new XmlIndexProvider());
+ }
+ });
+ startupManager.addStartupActivity(() -> {
+ CompletionProvider.registerCompletionProvider(JavaLanguage.INSTANCE,
+ new JavaCompletionProvider());
+ });
+ startupManager.addStartupActivity(() -> {
+ ActionManager manager = ActionManager.getInstance();
+ // main toolbar actions
+ manager.registerAction(CompileActionGroup.ID, new CompileActionGroup());
+ manager.registerAction(ProjectActionGroup.ID, new ProjectActionGroup());
+ manager.registerAction(PreviewLayoutAction.ID, new PreviewLayoutAction());
+ manager.registerAction(OpenSettingsAction.ID, new OpenSettingsAction());
+ manager.registerAction(FormatAction.ID, new FormatAction());
+ manager.registerAction(DebugActionGroup.ID, new DebugActionGroup());
+
+ // editor tab actions
+ manager.registerAction(CloseFileEditorAction.ID, new CloseFileEditorAction());
+ manager.registerAction(CloseOtherEditorAction.ID, new CloseOtherEditorAction());
+ manager.registerAction(CloseAllEditorAction.ID, new CloseAllEditorAction());
+
+ // editor actions
+ manager.registerAction(TextActionGroup.ID, new TextActionGroup());
+ manager.registerAction(DiagnosticInfoAction.ID, new DiagnosticInfoAction());
+
+ // file manager actions
+ manager.registerAction(NewFileActionGroup.ID, new NewFileActionGroup());
+ manager.registerAction(DeleteFileAction.ID, new DeleteFileAction());
+ if(Build.VERSION.SDK_INT {
- CompletionEngine engine = CompletionEngine.getInstance();
- CompilerService index = CompilerService.getInstance();
- if (index.isEmpty()) {
- index.registerIndexProvider(JavaCompilerProvider.KEY, new JavaCompilerProvider());
- index.registerIndexProvider(XmlIndexProvider.KEY, new XmlIndexProvider());
- engine.registerCompletionProvider(new JavaCompletionProvider());
- engine.registerCompletionProvider(new LayoutXmlCompletionProvider());
- engine.registerCompletionProvider(new AndroidManifestCompletionProvider());
- }
- });
- startupManager.addStartupActivity(() -> {
- ActionManager manager = ActionManager.getInstance();
- // main toolbar actions
- manager.registerAction(SelectJavaParentAction.ID, new SelectJavaParentAction());
- manager.registerAction(CompileActionGroup.ID, new CompileActionGroup());
- manager.registerAction(ProjectActionGroup.ID, new ProjectActionGroup());
- manager.registerAction(PreviewLayoutAction.ID, new PreviewLayoutAction());
- manager.registerAction(OpenSettingsAction.ID, new OpenSettingsAction());
- manager.registerAction(FormatAction.ID, new FormatAction());
- manager.registerAction(DebugActionGroup.ID, new DebugActionGroup());
-
- // editor tab actions
- manager.registerAction(CloseFileEditorAction.ID, new CloseFileEditorAction());
- manager.registerAction(CloseOtherEditorAction.ID, new CloseOtherEditorAction());
- manager.registerAction(CloseAllEditorAction.ID, new CloseAllEditorAction());
-
- // editor actions
- manager.registerAction(TextActionGroup.ID, new TextActionGroup());
- manager.registerAction(DiagnosticInfoAction.ID, new DiagnosticInfoAction());
-
- // file manager actions
- manager.registerAction(NewFileActionGroup.ID, new NewFileActionGroup());
- manager.registerAction(DeleteFileAction.ID, new DeleteFileAction());
-
- // java actions
- CompletionModule.registerActions(manager);
-
- // xml actions
- XmlCompletionModule.registerActions(manager);
-
- // kotlin actions
- KotlinCompletionModule.registerActions(manager);
- });
- startupManager.startup();
+ WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
if (getSupportFragmentManager().findFragmentByTag(ProjectManagerFragment.TAG) == null) {
getSupportFragmentManager().beginTransaction()
- .replace(R.id.fragment_container,
- new ProjectManagerFragment(),
- ProjectManagerFragment.TAG)
+ .replace(R.id.fragment_container, new ProjectManagerFragment(),
+ ProjectManagerFragment.TAG)
.commit();
}
}
-
- @Override
+
+ @Override
public void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
}
+
+ @Override
+ public boolean onKeyShortcut(int keyCode, KeyEvent event) {
+ return super.onKeyShortcut(keyCode, event);
+ }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ return super.onKeyDown(keyCode, event);
+ }
+
+ @Override
+ public boolean onKeyUp(int keyCode, KeyEvent event) {
+ return super.onKeyUp(keyCode, event);
+ }
}
diff --git a/app/src/main/java/com/tyron/code/analyzer/BaseTextmateAnalyzer.java b/app/src/main/java/com/tyron/code/analyzer/BaseTextmateAnalyzer.java
new file mode 100644
index 000000000..eb7205c53
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/analyzer/BaseTextmateAnalyzer.java
@@ -0,0 +1,61 @@
+package com.tyron.code.analyzer;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+
+import com.tyron.editor.Editor;
+
+import org.eclipse.tm4e.core.theme.IRawTheme;
+import org.eclipse.tm4e.core.theme.Theme;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.lang.reflect.Field;
+
+import io.github.rosemoe.sora.langs.textmate.TextMateAnalyzer;
+import io.github.rosemoe.sora.langs.textmate.TextMateLanguage;
+import io.github.rosemoe.sora.text.ContentReference;
+import io.github.rosemoe.sora.widget.CodeEditor;
+
+/**
+ * A text mate analyzer which does not use a TextMateLanguage
+ */
+public class BaseTextmateAnalyzer extends TextMateAnalyzer {
+
+ private static final Field THEME_FIELD;
+
+ public BaseTextmateAnalyzer(TextMateLanguage language, Editor editor,
+ String grammarName,
+ InputStream grammarIns,
+ Reader languageConfiguration,
+ IRawTheme theme) throws Exception {
+ super(language, grammarName, grammarIns,
+ languageConfiguration, theme);
+ }
+
+ @Override
+ public void reset(@NonNull ContentReference content, @NonNull Bundle extraArguments) {
+ if (!extraArguments.getBoolean("loaded", false)) {
+ return;
+ }
+ super.reset(content, extraArguments);
+ }
+
+ public Theme getTheme() {
+ try {
+ return (Theme) THEME_FIELD.get(this);
+ } catch (IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ static {
+ try {
+ THEME_FIELD = TextMateAnalyzer.class.getDeclaredField("theme");
+ THEME_FIELD.setAccessible(true);
+ } catch (ReflectiveOperationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/analyzer/semantic/SemanticHighlighter.java b/app/src/main/java/com/tyron/code/analyzer/semantic/SemanticHighlighter.java
new file mode 100644
index 000000000..e2ea859e7
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/analyzer/semantic/SemanticHighlighter.java
@@ -0,0 +1,48 @@
+package com.tyron.code.analyzer.semantic;
+
+import com.sun.source.tree.Tree;
+import com.sun.source.util.TreePath;
+import com.sun.source.util.TreePathScanner;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class SemanticHighlighter extends TreePathScanner {
+
+ private final AtomicBoolean mCancelFlag = new AtomicBoolean(false);
+
+ public void cancel() {
+ mCancelFlag.set(true);
+ }
+
+ @Override
+ public Void scan(Tree tree, Void unused) {
+ if (mCancelFlag.get()) {
+ return null;
+ }
+ return super.scan(tree, unused);
+ }
+
+ @Override
+ public Void scan(Iterable iterable, Void unused) {
+ if (mCancelFlag.get()) {
+ return null;
+ }
+ return super.scan(iterable, unused);
+ }
+
+ @Override
+ public Void scan(TreePath treePath, Void unused) {
+ if (mCancelFlag.get()) {
+ return null;
+ }
+ return super.scan(treePath, unused);
+ }
+
+ @Override
+ public Void reduce(Void unused, Void r1) {
+ if (mCancelFlag.get()) {
+ return null;
+ }
+ return super.reduce(unused, r1);
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/analyzer/semantic/SemanticToken.java b/app/src/main/java/com/tyron/code/analyzer/semantic/SemanticToken.java
new file mode 100644
index 000000000..9f3aeadf0
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/analyzer/semantic/SemanticToken.java
@@ -0,0 +1,48 @@
+package com.tyron.code.analyzer.semantic;
+
+import androidx.annotation.NonNull;
+
+public class SemanticToken {
+ private final TokenType tokenType;
+ private final int tokenModifiers;
+ private final int offset;
+ private final int length;
+
+ public SemanticToken(int offset, int length, TokenType tokenType, int tokenModifiers) {
+ this.offset = offset;
+ this.length = length;
+ this.tokenType = tokenType;
+ this.tokenModifiers = tokenModifiers;
+ }
+
+ public TokenType getTokenType() {
+ return tokenType;
+ }
+
+ public int getTokenModifiers() {
+ return tokenModifiers;
+ }
+
+ public int getOffset() {
+ return offset;
+ }
+
+ public int getLength() {
+ return length;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return "SemanticToken{" +
+ "tokenType=" +
+ tokenType +
+ ", tokenModifiers=" +
+ tokenModifiers +
+ ", offset=" +
+ offset +
+ ", length=" +
+ length +
+ '}';
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/analyzer/semantic/TokenType.java b/app/src/main/java/com/tyron/code/analyzer/semantic/TokenType.java
new file mode 100644
index 000000000..627946160
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/analyzer/semantic/TokenType.java
@@ -0,0 +1,35 @@
+package com.tyron.code.analyzer.semantic;
+
+import androidx.annotation.NonNull;
+
+public class TokenType {
+
+ public static final TokenType UNKNOWN = create("token.error-token");
+
+ public static TokenType create(String scope, String... fallbackScopes) {
+ return new TokenType(scope, fallbackScopes);
+ }
+
+ private final String scope;
+ private final String[] fallbackScopes;
+
+ public TokenType(@NonNull String scope, String[] fallbackScopes) {
+ this.scope = scope;
+ this.fallbackScopes = fallbackScopes;
+ }
+
+ public String getScope() {
+ return scope;
+ }
+
+ public String[] getFallbackScopes() {
+ return fallbackScopes;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return scope;
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/event/FileCreatedEvent.java b/app/src/main/java/com/tyron/code/event/FileCreatedEvent.java
new file mode 100644
index 000000000..f9d931dd5
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/event/FileCreatedEvent.java
@@ -0,0 +1,19 @@
+package com.tyron.code.event;
+
+import java.io.File;
+
+/**
+ * Called when a new file has been created through the file manager UI
+ */
+public class FileCreatedEvent extends Event {
+
+ private final File file;
+
+ public FileCreatedEvent(File file) {
+ this.file = file;
+ }
+
+ public File getFile() {
+ return file;
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/event/FileDeletedEvent.java b/app/src/main/java/com/tyron/code/event/FileDeletedEvent.java
new file mode 100644
index 000000000..7a8127baf
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/event/FileDeletedEvent.java
@@ -0,0 +1,17 @@
+package com.tyron.code.event;
+
+import java.io.File;
+
+public class FileDeletedEvent extends Event {
+
+
+ private final File deletedFile;
+
+ public FileDeletedEvent(File deletedFile) {
+ this.deletedFile = deletedFile;
+ }
+
+ public File getDeletedFile() {
+ return deletedFile;
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/event/PerformShortcutEvent.java b/app/src/main/java/com/tyron/code/event/PerformShortcutEvent.java
new file mode 100644
index 000000000..4927031a1
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/event/PerformShortcutEvent.java
@@ -0,0 +1,23 @@
+package com.tyron.code.event;
+
+import com.tyron.code.ui.editor.shortcuts.ShortcutItem;
+import com.tyron.fileeditor.api.FileEditor;
+
+public class PerformShortcutEvent extends Event {
+
+ private final ShortcutItem item;
+ private final FileEditor editor;
+
+ public PerformShortcutEvent(ShortcutItem item, FileEditor editor) {
+ this.item = item;
+ this.editor = editor;
+ }
+
+ public ShortcutItem getItem() {
+ return item;
+ }
+
+ public FileEditor getEditor() {
+ return editor;
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/gradle/util/GradleLaunchUtil.java b/app/src/main/java/com/tyron/code/gradle/util/GradleLaunchUtil.java
new file mode 100644
index 000000000..7a757ea9d
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/gradle/util/GradleLaunchUtil.java
@@ -0,0 +1,134 @@
+package com.tyron.code.gradle.util;
+
+import static com.tyron.builder.model.AndroidProject.MODEL_LEVEL_3_VARIANT_OUTPUT_POST_BUILD;
+import static com.tyron.builder.model.AndroidProject.PROPERTY_BUILD_MODEL_DISABLE_SRC_DOWNLOAD;
+import static com.tyron.builder.model.AndroidProject.PROPERTY_BUILD_MODEL_ONLY;
+import static com.tyron.builder.model.AndroidProject.PROPERTY_BUILD_MODEL_ONLY_ADVANCED;
+import static com.tyron.builder.model.AndroidProject.PROPERTY_BUILD_MODEL_ONLY_VERSIONED;
+import static com.tyron.builder.model.InjectedProperties.PROPERTY_INVOKED_FROM_IDE;
+
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.tyron.code.ApplicationLoader;
+import com.tyron.common.SharedPreferenceKeys;
+
+import org.apache.commons.io.FileUtils;
+import org.gradle.tooling.ConfigurableLauncher;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+public class GradleLaunchUtil {
+
+
+ private static void addIdeProperties(ConfigurableLauncher launcher) {
+ launcher.addArguments(createProjectProperty(PROPERTY_BUILD_MODEL_ONLY, true));
+ launcher.addArguments(createProjectProperty(PROPERTY_BUILD_MODEL_ONLY_ADVANCED, true));
+ launcher.addArguments(createProjectProperty(PROPERTY_INVOKED_FROM_IDE, true));
+ // Sent to plugin starting with Studio 3.0
+ launcher.addArguments(createProjectProperty(PROPERTY_BUILD_MODEL_ONLY_VERSIONED, MODEL_LEVEL_3_VARIANT_OUTPUT_POST_BUILD));
+
+ // Skip download of source and javadoc jars during Gradle sync, this flag only has effect on AGP 3.5.
+ //noinspection deprecation AGP 3.6 and above do not download sources at all.
+ launcher.addArguments(createProjectProperty(PROPERTY_BUILD_MODEL_DISABLE_SRC_DOWNLOAD, true));
+ }
+
+ /**
+ * Configures the given launcher to align with the preferences set in the build settings
+ */
+ public static void configureLauncher(ConfigurableLauncher launcher) {
+ addIdeProperties(launcher);
+
+ SharedPreferences preferences = ApplicationLoader.getDefaultPreferences();
+
+ String logLevel = preferences.getString(SharedPreferenceKeys.GRADLE_LOG_LEVEL, "LIFECYCLE");
+ switch (logLevel) {
+ case "QUIET":
+ launcher.addArguments("--quiet");
+ break;
+ case "WARN":
+ launcher.addArguments("--warn");
+ break;
+ case "INFO":
+ launcher.addArguments("--info");
+ break;
+ case "DEBUG":
+ launcher.addArguments("--debug");
+ break;
+ default:
+ case "LIFECYCLE":
+ // intentionally empty
+ }
+
+ String stacktrace = preferences.getString(SharedPreferenceKeys.GRADLE_STACKTRACE_MODE,
+ "INTERNAL_EXCEPTIONS");
+ switch (stacktrace) {
+ case "ALWAYS":
+ launcher.addArguments("--stacktrace");
+ break;
+ case "ALWAYS_FULL":
+ launcher.addArguments("--full-stacktrace");
+ break;
+ default:
+ case "INTERNAL_EXCEPTIONS":
+ // intentionally empty
+ }
+ }
+
+ public static void addCodeAssistInitScript(ConfigurableLauncher launcher) {
+ try {
+ launcher.addArguments("--init-script", getOrCreateInitScript().getAbsolutePath());
+ } catch (IOException e) {
+ // this should not happen under normal circumstances.
+ // throw just in case
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static File getOrCreateInitScript() throws IOException {
+ File initScript = new File(ApplicationLoader.getInstance().getFilesDir(), "init_scripts/init_script.gradle");
+ //noinspection ResultOfMethodCallIgnored
+ Objects.requireNonNull(initScript.getParentFile()).mkdirs();
+ if (!initScript.exists() && !initScript.createNewFile()) {
+ throw new IOException();
+ }
+
+ //language=Groovy
+ String initScriptCode = "rootProject.buildscript.configurations.classpath {\n" +
+ " resolutionStrategy.eachDependency {\n" +
+ " if (it.requested.name == \"gradle\" && it.requested" +
+ ".group == \"com.android.tools.build\") {\n" +
+ " throw new GradleException(\"The Android Gradle " +
+ "Plugin has been applied but is not supported. CodeAssist " +
+ "maintains its own\" +\n" +
+ " \"version of the Android Gradle Plugin so " +
+ "you don't have to include it in the build script's\" +\n" +
+ " \"classpath.\")\n" +
+ " }\n" +
+ " }\n" +
+ "}\n";
+ FileUtils.writeStringToFile(initScript, initScriptCode, StandardCharsets.UTF_8);
+ return initScript;
+ }
+
+ private static final String PROJECT_PROPERTY_FORMAT = "-P%1$s=%2$s";
+
+ @NonNull
+ public static String createProjectProperty(@NonNull String name, boolean value) {
+ return createProjectProperty(name, String.valueOf(value));
+ }
+
+ @NonNull
+ public static String createProjectProperty(@NonNull String name, int value) {
+ return createProjectProperty(name, String.valueOf(value));
+ }
+
+ @NonNull
+ public static String createProjectProperty(@NonNull String name, @NonNull String value) {
+ return String.format(PROJECT_PROPERTY_FORMAT, name, value);
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/AbstractAutoCompleteProvider.java b/app/src/main/java/com/tyron/code/language/AbstractAutoCompleteProvider.java
new file mode 100644
index 000000000..6df3095d9
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/AbstractAutoCompleteProvider.java
@@ -0,0 +1,27 @@
+package com.tyron.code.language;
+
+import com.tyron.completion.model.CompletionList;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import io.github.rosemoe.sora.lang.completion.CompletionItem;
+
+/**
+ * An auto complete provider that supports cancellation as the user types
+ */
+public abstract class AbstractAutoCompleteProvider {
+
+ public final List getAutoCompleteItems(String prefix, int line, int column) {
+ CompletionList list = getCompletionList(prefix, line, column);
+ if (list == null) {
+ return null;
+ }
+
+ return list.items.stream()
+ .map(CompletionItemWrapper::new)
+ .collect(Collectors.toList());
+ }
+
+ public abstract CompletionList getCompletionList(String prefix, int line, int column);
+}
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/AbstractCodeAnalyzer.java b/app/src/main/java/com/tyron/code/language/AbstractCodeAnalyzer.java
similarity index 76%
rename from app/src/main/java/com/tyron/code/ui/editor/language/AbstractCodeAnalyzer.java
rename to app/src/main/java/com/tyron/code/language/AbstractCodeAnalyzer.java
index aedc613a4..27c4f4e0d 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/AbstractCodeAnalyzer.java
+++ b/app/src/main/java/com/tyron/code/language/AbstractCodeAnalyzer.java
@@ -1,4 +1,4 @@
-package com.tyron.code.ui.editor.language;
+package com.tyron.code.language;
import android.os.Bundle;
@@ -6,7 +6,6 @@
import androidx.annotation.Nullable;
import com.tyron.builder.model.DiagnosticWrapper;
-import com.tyron.code.ui.main.MainViewModel;
import com.tyron.editor.Editor;
import org.antlr.v4.runtime.CharStream;
@@ -21,14 +20,12 @@
import java.util.List;
import java.util.Map;
-import io.github.rosemoe.sora.lang.analysis.SimpleAnalyzeManager;
import io.github.rosemoe.sora.lang.analysis.StyleReceiver;
import io.github.rosemoe.sora.lang.styling.MappedSpans;
import io.github.rosemoe.sora.lang.styling.Styles;
import io.github.rosemoe.sora.text.CharPosition;
import io.github.rosemoe.sora.text.ContentReference;
import io.github.rosemoe.sora.widget.schemes.EditorColorScheme;
-import io.github.rosemoe.sora2.text.DiagnosticSpanMapUpdater;
public abstract class AbstractCodeAnalyzer extends DiagnosticAnalyzeManager {
@@ -37,14 +34,14 @@ public abstract class AbstractCodeAnalyzer extends DiagnosticAnalyzeManager mDiagnostics = new ArrayList<>();
+ protected List mDiagnostics = new ArrayList<>();
public AbstractCodeAnalyzer() {
setup();
}
@Override
- public void setReceiver(@NonNull StyleReceiver receiver) {
+ public void setReceiver(@Nullable StyleReceiver receiver) {
super.setReceiver(receiver);
mReceiver = receiver;
@@ -52,46 +49,12 @@ public void setReceiver(@NonNull StyleReceiver receiver) {
@Override
public void insert(CharPosition start, CharPosition end, CharSequence insertedContent) {
- super.insert(start, end, insertedContent);
-
- if (start.getLine() != end.getLine()) {
- DiagnosticSpanMapUpdater.shiftDiagnosticsOnMultiLineInsert(
- mDiagnostics,
- start.getLine(),
- start.getColumn(),
- end.getLine(),
- end.getColumn()
- );
- } else {
- DiagnosticSpanMapUpdater.shiftDiagnosticsOnSingleLineInsert(
- mDiagnostics,
- start.getLine(),
- start.getColumn(),
- end.getColumn()
- );
- }
+ rerunWithBg();
}
@Override
public void delete(CharPosition start, CharPosition end, CharSequence deletedContent) {
- super.delete(start, end, deletedContent);
-
- if (start.getLine() != end.getLine()) {
- DiagnosticSpanMapUpdater.shiftDiagnosticsOnMultiLineInsert(
- mDiagnostics,
- start.getLine(),
- start.getColumn(),
- end.getLine(),
- end.getColumn()
- );
- } else {
- DiagnosticSpanMapUpdater.shiftDiagnosticsOnSingleLineInsert(
- mDiagnostics,
- start.getLine(),
- start.getColumn(),
- end.getColumn()
- );
- }
+ rerunWithBg();
}
@Override
@@ -101,8 +64,7 @@ public void reset(@NonNull ContentReference content, @NonNull Bundle extraArgume
@Override
public void setDiagnostics(Editor editor, List diagnostics) {
- mDiagnostics.clear();
- mDiagnostics.addAll(diagnostics);
+ mDiagnostics = diagnostics;
}
public void setup() {
@@ -150,9 +112,13 @@ protected void beforeAnalyze() {
@Override
protected Styles analyze(StringBuilder text, Delegate delegate) {
+ Styles styles = new Styles();
+ boolean loaded = getExtraArguments().getBoolean("loaded", false);
+ if (!loaded) {
+ return styles;
+ }
beforeAnalyze();
- Styles styles = new Styles();
MappedSpans.Builder result = new MappedSpans.Builder(1024);
try {
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/CompletionItemWrapper.java b/app/src/main/java/com/tyron/code/language/CompletionItemWrapper.java
similarity index 88%
rename from app/src/main/java/com/tyron/code/ui/editor/language/CompletionItemWrapper.java
rename to app/src/main/java/com/tyron/code/language/CompletionItemWrapper.java
index a5faec1c8..37fd64d20 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/CompletionItemWrapper.java
+++ b/app/src/main/java/com/tyron/code/language/CompletionItemWrapper.java
@@ -1,9 +1,6 @@
-package com.tyron.code.ui.editor.language;
-
-import android.graphics.drawable.Drawable;
+package com.tyron.code.language;
import com.tyron.completion.java.drawable.CircleDrawable;
-import com.tyron.completion.model.DrawableKind;
import com.tyron.editor.Editor;
import io.github.rosemoe.sora.lang.completion.CompletionItem;
diff --git a/app/src/main/java/com/tyron/code/language/DiagnosticAnalyzeManager.java b/app/src/main/java/com/tyron/code/language/DiagnosticAnalyzeManager.java
new file mode 100644
index 000000000..289981b73
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/DiagnosticAnalyzeManager.java
@@ -0,0 +1,54 @@
+package com.tyron.code.language;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+
+import com.tyron.builder.model.DiagnosticWrapper;
+import com.tyron.editor.Editor;
+
+import java.util.List;
+
+import io.github.rosemoe.sora.lang.analysis.SimpleAnalyzeManager;
+import io.github.rosemoe.sora.text.ContentReference;
+
+public abstract class DiagnosticAnalyzeManager extends SimpleAnalyzeManager {
+
+ protected boolean mShouldAnalyzeInBg = false;
+
+ public abstract void setDiagnostics(Editor editor, List diagnostics);
+
+ public void rerunWithoutBg() {
+ mShouldAnalyzeInBg = false;
+ super.rerun();
+ }
+
+ public void rerunWithBg() {
+ mShouldAnalyzeInBg = true;
+ super.rerun();
+ }
+
+ @Override
+ public void rerun() {
+ mShouldAnalyzeInBg = false;
+ super.rerun();
+ }
+
+ @Override
+ public void reset(@NonNull ContentReference content, @NonNull Bundle extraArguments) {
+ if (extraArguments == null) {
+ extraArguments = new Bundle();
+ }
+ mShouldAnalyzeInBg = extraArguments.getBoolean("bg", false);
+ super.reset(content, extraArguments);
+ }
+
+ @Override
+ public Bundle getExtraArguments() {
+ Bundle extraArguments = super.getExtraArguments();
+ if (extraArguments == null) {
+ extraArguments = new Bundle();
+ }
+ return extraArguments;
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/DiagnosticSpanMapUpdater.java b/app/src/main/java/com/tyron/code/language/DiagnosticSpanMapUpdater.java
new file mode 100644
index 000000000..bd66061e3
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/DiagnosticSpanMapUpdater.java
@@ -0,0 +1,85 @@
+package com.tyron.code.language;
+
+import com.tyron.builder.model.DiagnosticWrapper;
+
+import java.util.List;
+
+import io.github.rosemoe.sora.text.CharPosition;
+import io.github.rosemoe.sora.text.ContentReference;
+
+public class DiagnosticSpanMapUpdater {
+
+ public static void shiftDiagnosticsOnSingleLineInsert(List diagnostics,
+ ContentReference ref,
+ CharPosition start,
+ CharPosition end) {
+ int length = end.index - start.index;
+ for (DiagnosticWrapper diagnostic : diagnostics) {
+ if (!isValid(diagnostic)) {
+ continue;
+ }
+ // diagnostic is located before the insertion index, its not included
+ if (diagnostic.getEndPosition() <= end.index) {
+ continue;
+ }
+ diagnostic.setStartPosition(diagnostic.getStartPosition() + length);
+ diagnostic.setEndPosition(diagnostic.getEndPosition() + length);
+ }
+ }
+
+ public static void shiftDiagnosticsOnSingleLineDelete(List diagnostics,
+ ContentReference ref,
+ CharPosition start,
+ CharPosition end) {
+ int length = end.index - start.index;
+ for (DiagnosticWrapper diagnostic : diagnostics) {
+ if (!isValid(diagnostic)) {
+ continue;
+ }
+ if (diagnostic.getStartPosition() > start.index) {
+ diagnostic.setStartPosition(diagnostic.getStartPosition() - length);
+ }
+ if (diagnostic.getEndPosition() > end.index) {
+ diagnostic.setEndPosition(diagnostic.getEndPosition() - length);
+ }
+ }
+ }
+
+ public static void shiftDiagnosticsOnMultiLineDelete(List diagnostics,
+ ContentReference ref,
+ CharPosition start,
+ CharPosition end) {
+ int length = end.index - start.index;
+ for (DiagnosticWrapper diagnostic : diagnostics) {
+ if (!isValid(diagnostic)) {
+ continue;
+ }
+ if (diagnostic.getStartPosition() < end.index) {
+ continue;
+ }
+ diagnostic.setStartPosition(diagnostic.getStartPosition() - length);
+ diagnostic.setEndPosition(diagnostic.getEndPosition() - length);
+ }
+ }
+
+ public static void shiftDiagnosticsOnMultiLineInsert(List diagnostics,
+ ContentReference ref,
+ CharPosition start,
+ CharPosition end) {
+ int length = end.index - start.index;
+ for (DiagnosticWrapper diagnostic : diagnostics) {
+ if (!isValid(diagnostic)) {
+ continue;
+ }
+ if (diagnostic.getEndPosition() < end.index) {
+ continue;
+ }
+ diagnostic.setStartPosition(diagnostic.getStartPosition() + length);
+ diagnostic.setEndPosition(diagnostic.getEndPosition() + length);
+ }
+ }
+
+ public static boolean isValid(DiagnosticWrapper d) {
+ return d.getStartPosition() >= 0 && d.getEndPosition() >= 0;
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/EditorFormatter.java b/app/src/main/java/com/tyron/code/language/EditorFormatter.java
new file mode 100644
index 000000000..f7c41bc3f
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/EditorFormatter.java
@@ -0,0 +1,19 @@
+package com.tyron.code.language;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Marker interface for languages that support formatting
+ */
+public interface EditorFormatter {
+
+ /**
+ * Formats the given CharSequence on the specified start and end indices.
+ * @param text The text to format.
+ * @param startIndex The 0-based index of where the format starts
+ * @param endIndex The 0-based index of where the format ends
+ * @return The formatted text
+ */
+ @NonNull
+ CharSequence format(@NonNull CharSequence text, int startIndex, int endIndex);
+}
diff --git a/app/src/main/java/com/tyron/code/language/HighlightUtil.java b/app/src/main/java/com/tyron/code/language/HighlightUtil.java
new file mode 100644
index 000000000..f2aa5a661
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/HighlightUtil.java
@@ -0,0 +1,199 @@
+package com.tyron.code.language;
+
+import android.util.Log;
+
+import com.tyron.builder.model.DiagnosticWrapper;
+import com.tyron.completion.progress.ProgressManager;
+import com.tyron.editor.CharPosition;
+import com.tyron.editor.Editor;
+
+import javax.tools.Diagnostic;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.github.rosemoe.sora.lang.styling.Span;
+import io.github.rosemoe.sora.lang.styling.Spans;
+import io.github.rosemoe.sora.lang.styling.Styles;
+import io.github.rosemoe.sora2.BuildConfig;
+
+public class HighlightUtil {
+
+ public static void replaceSpan(Styles styles, Span newSpan, int startLine, int startColumn, int endLine, int endColumn) {
+ for (int line = startLine; line <= endLine; line++) {
+ ProgressManager.checkCanceled();
+ int start = (line == startLine ? startColumn : 0);
+ int end = (line == endLine ? endColumn : Integer.MAX_VALUE);
+ Spans.Reader read = styles.getSpans().read();
+ List spans = new ArrayList<>(read.getSpansOnLine(line));
+ int increment;
+ for (int i = 0; i < spans.size(); i += increment) {
+ ProgressManager.checkCanceled();
+ io.github.rosemoe.sora.lang.styling.Span span = spans.get(i);
+ increment = 1;
+ if (span.column >= end) {
+ break;
+ }
+ int spanEnd = (i + 1 >= spans.size() ? Integer.MAX_VALUE : spans.get(i + 1).column);
+ if (spanEnd >= start) {
+ int regionStartInSpan = Math.max(span.column, start);
+ int regionEndInSpan = Math.min(end, spanEnd);
+ if (regionStartInSpan == span.column) {
+ if (regionEndInSpan != spanEnd) {
+ increment = 2;
+ io.github.rosemoe.sora.lang.styling.Span nSpan = span.copy();
+ nSpan.column = regionEndInSpan;
+ spans.add(i + 1, nSpan);
+ }
+ span.underlineColor = newSpan.underlineColor;
+ span.style = newSpan.style;
+ span.renderer = newSpan.renderer;
+ } else {
+ //regionStartInSpan > span.column
+ if (regionEndInSpan == spanEnd - 1) {
+ increment = 2;
+ io.github.rosemoe.sora.lang.styling.Span nSpan = span.copy();
+ nSpan.column = regionStartInSpan;
+ spans.add(i + 1, nSpan);
+ span.underlineColor = newSpan.underlineColor;
+ span.style = newSpan.style;
+ span.renderer = newSpan.renderer;
+ } else {
+ increment = 3;
+ io.github.rosemoe.sora.lang.styling.Span span1 = span.copy();
+ span1.column = regionStartInSpan;
+ span1.underlineColor = newSpan.underlineColor;
+ span1.style = newSpan.style;
+ span1.renderer = newSpan.renderer;
+ io.github.rosemoe.sora.lang.styling.Span span2 = span.copy();
+ span2.column = regionEndInSpan;
+ spans.add(i + 1, span1);
+ spans.add(i + 2, span2);
+ }
+ }
+ }
+ }
+
+ Spans.Modifier modify = styles.getSpans().modify();
+ modify.setSpansOnLine(line, spans);
+ }
+ }
+
+ public static void markProblemRegion(Styles styles, int newFlag, int startLine, int startColumn, int endLine, int endColumn) {
+ for (int line = startLine; line <= endLine; line++) {
+ ProgressManager.checkCanceled();
+ int start = (line == startLine ? startColumn : 0);
+ int end = (line == endLine ? endColumn : Integer.MAX_VALUE);
+ Spans.Reader read = styles.getSpans().read();
+ List spans = new ArrayList<>(read.getSpansOnLine(line));
+ int increment;
+ for (int i = 0; i < spans.size(); i += increment) {
+ ProgressManager.checkCanceled();
+ io.github.rosemoe.sora.lang.styling.Span span = spans.get(i);
+ increment = 1;
+ if (span.column >= end) {
+ break;
+ }
+ int spanEnd = (i + 1 >= spans.size() ? Integer.MAX_VALUE : spans.get(i + 1).column);
+ if (spanEnd >= start) {
+ int regionStartInSpan = Math.max(span.column, start);
+ int regionEndInSpan = Math.min(end, spanEnd);
+ if (regionStartInSpan == span.column) {
+ if (regionEndInSpan != spanEnd) {
+ increment = 2;
+ io.github.rosemoe.sora.lang.styling.Span nSpan = span.copy();
+ nSpan.column = regionEndInSpan;
+ spans.add(i + 1, nSpan);
+ }
+ } else {
+ //regionStartInSpan > span.column
+ if (regionEndInSpan == spanEnd) {
+ increment = 2;
+ io.github.rosemoe.sora.lang.styling.Span nSpan = span.copy();
+ nSpan.column = regionStartInSpan;
+ spans.add(i + 1, nSpan);
+ } else {
+ increment = 3;
+ io.github.rosemoe.sora.lang.styling.Span span1 = span.copy();
+ span1.column = regionStartInSpan;
+ io.github.rosemoe.sora.lang.styling.Span span2 = span.copy();
+ span2.column = regionEndInSpan;
+ spans.add(i + 1, span1);
+ spans.add(i + 2, span2);
+ }
+ }
+ }
+ }
+
+ Spans.Modifier modify = styles.getSpans().modify();
+ modify.setSpansOnLine(line, spans);
+ }
+ }
+
+
+ /**
+ * Highlights the list of given diagnostics, taking care of conversion between 1-based offsets
+ * to 0-based offsets.
+ * It also makes the Diagnostic eligible for shifting as the user types.
+ */
+ public static void markDiagnostics(Editor editor, List diagnostics,
+ Styles styles) {
+ diagnostics.forEach(it -> {
+ ProgressManager.checkCanceled();
+ try {
+ int startLine;
+ int startColumn;
+ int endLine;
+ int endColumn;
+ if (it.getPosition() != DiagnosticWrapper.USE_LINE_POS) {
+ if (it.getStartPosition() == -1) {
+ it.setStartPosition(it.getPosition());
+ }
+ if (it.getEndPosition() == -1) {
+ it.setEndPosition(it.getPosition());
+ }
+
+ if (it.getStartPosition() > editor.getContent().length()) {
+ return;
+ }
+ if (it.getEndPosition() > editor.getContent().length()) {
+ return;
+ }
+ CharPosition start = editor.getCharPosition((int) it.getStartPosition());
+ CharPosition end = editor.getCharPosition((int) it.getEndPosition());
+
+ int sLine = start.getLine();
+ int sColumn = start.getColumn();
+ int eLine = end.getLine();
+ int eColumn = end.getColumn();
+
+ // the editor does not support marking underline spans for the same start and end
+ // index
+ // to work around this, we just subtract one to the start index
+ if (sLine == eLine && eColumn == sColumn) {
+ sColumn--;
+ eColumn++;
+ }
+
+ it.setStartLine(sLine);
+ it.setEndLine(eLine);
+ it.setStartColumn(sColumn);
+ it.setEndColumn(eColumn);
+ }
+ startLine = it.getStartLine();
+ startColumn = it.getStartColumn();
+ endLine = it.getEndLine();
+ endColumn = it.getEndColumn();
+
+ } catch (IllegalArgumentException | IndexOutOfBoundsException e) {
+ if (BuildConfig.DEBUG) {
+ Log.d("HighlightUtil", "Failed to mark diagnostics", e);
+ }
+ }
+ });
+ }
+
+ public static void clearDiagnostics(Styles styles) {
+
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/Language.java b/app/src/main/java/com/tyron/code/language/Language.java
new file mode 100644
index 000000000..222c893dd
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/Language.java
@@ -0,0 +1,32 @@
+package com.tyron.code.language;
+
+import com.tyron.editor.Editor;
+
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystem;
+import org.apache.commons.vfs2.provider.local.LocalFile;
+import org.apache.commons.vfs2.provider.local.LocalFileSystem;
+
+import java.io.File;
+
+public interface Language {
+
+ /**
+ * Subclasses return whether they support this file extension
+ */
+ boolean isApplicable(File ext);
+
+ default boolean isApplicable(FileObject fileObject) {
+ if (fileObject instanceof LocalFile) {
+ return isApplicable(new File(fileObject.getURI()));
+ }
+ return false;
+ }
+
+ /**
+ *
+ * @param editor the editor instance
+ * @return The specific language instance for this editor
+ */
+ io.github.rosemoe.sora.lang.Language get(Editor editor);
+}
diff --git a/app/src/main/java/com/tyron/code/language/LanguageManager.java b/app/src/main/java/com/tyron/code/language/LanguageManager.java
new file mode 100644
index 000000000..c7ba41aa5
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/LanguageManager.java
@@ -0,0 +1,93 @@
+package com.tyron.code.language;
+
+import android.content.res.AssetManager;
+
+import com.tyron.code.ApplicationLoader;
+import com.tyron.code.language.groovy.Groovy;
+import com.tyron.code.language.java.Java;
+import com.tyron.code.language.json.Json;
+import com.tyron.code.language.kotlin.Kotlin;
+import com.tyron.code.language.xml.Xml;
+import com.tyron.editor.Editor;
+
+import org.apache.commons.vfs2.FileObject;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import io.github.rosemoe.sora.langs.textmate.TextMateColorScheme;
+import io.github.rosemoe.sora.langs.textmate.TextMateLanguage;
+import io.github.rosemoe.sora.widget.CodeEditor;
+
+public class LanguageManager {
+
+ private static LanguageManager Instance = null;
+
+ public static LanguageManager getInstance() {
+ if (Instance == null) {
+ Instance = new LanguageManager();
+ }
+ return Instance;
+ }
+
+ private final Set mLanguages = new HashSet<>();
+
+ private LanguageManager() {
+ initLanguages();
+ }
+
+ private void initLanguages() {
+ mLanguages.addAll(
+ Arrays.asList(
+ new Xml(),
+ new Java(),
+ new Kotlin(),
+ new Groovy(),
+ new Json()));
+ }
+
+ public boolean supports(File file) {
+ for (Language language : mLanguages) {
+ if (language.isApplicable(file)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public io.github.rosemoe.sora.lang.Language get(Editor editor, FileObject file) {
+ for (Language lang : mLanguages) {
+ if (lang.isApplicable(file)) {
+ return lang.get(editor);
+ }
+ }
+ return null;
+ }
+
+ public io.github.rosemoe.sora.lang.Language get(Editor editor, File file) {
+ for (Language lang : mLanguages) {
+ if (lang.isApplicable(file)) {
+ return lang.get(editor);
+ }
+ }
+ return null;
+ }
+
+ public static TextMateLanguage createTextMateLanguage(String grammarName, String grammarPath, String configurationPath, Editor editor) {
+ AssetManager assets = ApplicationLoader.getInstance().getAssets();
+ try {
+ return TextMateLanguage.createNoCompletion(
+ grammarName,
+ assets.open(grammarPath),
+ new InputStreamReader(assets.open(configurationPath)),
+ ((TextMateColorScheme) ((CodeEditor) editor).getColorScheme()).getRawTheme());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/groovy/AndroidDelegate.java b/app/src/main/java/com/tyron/code/language/groovy/AndroidDelegate.java
new file mode 100644
index 000000000..1e59b5beb
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/groovy/AndroidDelegate.java
@@ -0,0 +1,18 @@
+package com.tyron.code.language.groovy;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class AndroidDelegate {
+
+ // Here to support different versions of delegate types. The values of delegate
+ // types are sorted by priority
+ private static final Map> delegateMap;
+
+ static {
+ delegateMap = new HashMap<>();
+
+ //plugins
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/groovy/CompletionHandler.java b/app/src/main/java/com/tyron/code/language/groovy/CompletionHandler.java
new file mode 100644
index 000000000..63c7aa697
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/groovy/CompletionHandler.java
@@ -0,0 +1,181 @@
+package com.tyron.code.language.groovy;
+
+import com.tyron.code.language.java.Java;
+import com.tyron.completion.java.provider.JavaSortCategory;
+import com.tyron.completion.model.CompletionItem;
+import com.tyron.completion.model.DrawableKind;
+
+import org.codehaus.groovy.ast.expr.MethodCallExpression;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class CompletionHandler {
+
+ private static final String BUILD_GRADLE = "build.gradle";
+ private static final String SETTING_GRADLE = "settings.gradle";
+ private static final String DEPENDENCYHANDLER_CLASS = "org.gradle.api.artifacts.dsl.DependencyHandler";
+ private static final List CONFIGURATIONS = List.of("implementation", "compileOnly", "runtimeOnly", "classpath", "api");
+
+ public List getCompletionItems(MethodCallExpression containingCall, String fileName, String projectPath, Set plugins) {
+ Set resultSet = new HashSet<>();
+ List results = new ArrayList<>();
+ List delegateClassNames = new ArrayList<>();
+
+ if (containingCall == null) {
+ if (BUILD_GRADLE.equals(fileName)) {
+ delegateClassNames.add(GradleDelegate.getDefault());
+ } else if (SETTING_GRADLE.equals(fileName)) {
+ delegateClassNames.add(GradleDelegate.getSettings());
+ }
+ results.addAll(getCompletionItemsFromExtClosures(projectPath, resultSet));
+ } else {
+ String methodName = containingCall.getMethodAsString();
+ List delegates = GradleDelegate.getDelegateMap().get(methodName);
+ if (delegates == null) {
+ return results;
+ }
+ delegateClassNames.addAll(delegates);
+ }
+ if (delegateClassNames.isEmpty()) {
+ return Collections.emptyList();
+ }
+ for (String delegateClassName : delegateClassNames) {
+ Class delegateClass;
+ try {
+ delegateClass = Class.forName(delegateClassName);
+ } catch (ClassNotFoundException e) {
+ delegateClass = null;
+ }
+ if (delegateClass == null) {
+ continue;
+ }
+ results.addAll(getCompletionItemsFromClass(delegateClass, plugins, resultSet));
+ break;
+ }
+
+
+ return results;
+ }
+
+ private List getCompletionItemsFromClass(Class javaClass, Set plugins, Set resultSet) {
+ List results = new ArrayList<>();
+ for (Class superInterface : javaClass.getInterfaces()) {
+ results.addAll(getCompletionItemsFromClass(superInterface, plugins, resultSet));
+ }
+ Class superclass = javaClass.getSuperclass();
+ if (superclass != null) {
+ results.addAll(getCompletionItemsFromClass(superclass, plugins, resultSet));
+ }
+
+ Method[] methods = javaClass.getMethods();
+ for (Method method : methods) {
+ boolean isMethodDeprecated = isDeprecated(method);
+ String methodName = method.getName();
+
+ // When parsing a abstract class, we'll get a "" method which can't be
+ // called directly,
+ // So we filter it here.
+ if (methodName.equals("")) {
+ continue;
+ }
+ List arguments = new ArrayList<>();
+ Arrays.asList(method.getParameterTypes()).forEach(type ->
+ arguments.add(type.getName()));
+ CompletionItem item = generateCompletionItemForMethod(methodName, arguments, isMethodDeprecated);
+ if (resultSet.add(item.getLabel())) {
+ results.add(item);
+ }
+ int modifiers = method.getModifiers();
+ // See:
+ // https://docs.gradle.org/current/userguide/custom_gradle_types.html#managed_properties
+ // we offer managed properties for an abstract getter method;
+ if (methodName.startsWith("get") && methodName.length() > 3 && Modifier.isPublic(modifiers)
+ && Modifier.isAbstract(modifiers)) {
+ String propertyName = methodName.substring(3, 4).toLowerCase() + methodName.substring(4);
+ CompletionItem property = new CompletionItem(propertyName);
+ property.commitText = propertyName;
+ property.detail = "Property";
+ property.iconKind = DrawableKind.Attribute;
+ property.setSortText(JavaSortCategory.ACCESSIBLE_SYMBOL.toString());
+ property.addFilterText(propertyName);
+ if (resultSet.add(propertyName)) {
+ results.add(property);
+ }
+ }
+ }
+ boolean shouldAddConfigurations = !Collections.disjoint(
+ plugins,
+ List.of("com.android.application", "application", "java", "java-library")
+ );
+ if (shouldAddConfigurations && javaClass.getName().equals(DEPENDENCYHANDLER_CLASS)) {
+ for (String configuration : CONFIGURATIONS) {
+ String builder = configuration + "(Object... o)";
+ String insertBuilder = configuration + "()";
+ CompletionItem item = new CompletionItem(builder);
+ item.iconKind = DrawableKind.Method;
+ item.commitText = insertBuilder;
+ item.addFilterText(configuration);
+ item.setSortText(JavaSortCategory.ACCESSIBLE_SYMBOL.toString());
+ results.add(item);
+ }
+ }
+ return results;
+ }
+
+ private List getCompletionItemsFromExtClosures(String projectPath,
+ Set resultSet) {
+ return Collections.emptyList();
+ }
+
+ private static CompletionItem generateCompletionItemForMethod(String name, List arguments,
+ boolean deprecated) {
+ StringBuilder labelBuilder = new StringBuilder();
+ labelBuilder.append(name);
+ labelBuilder.append("(");
+ for (int i = 0; i < arguments.size(); i++) {
+ String type = arguments.get(i);
+ String[] classNameSplits = type.split("\\.");
+ String className = classNameSplits[classNameSplits.length - 1];
+ String variableName = className.substring(0, 1).toLowerCase();
+ labelBuilder.append(className);
+ labelBuilder.append(" ");
+ labelBuilder.append(variableName);
+ if (i != arguments.size() - 1) {
+ labelBuilder.append(", ");
+ }
+ }
+ labelBuilder.append(")");
+ String label = labelBuilder.toString();
+ CompletionItem item = new CompletionItem(label);
+ item.addFilterText(name);
+ item.setSortText(JavaSortCategory.ACCESSIBLE_SYMBOL.toString());
+ item.iconKind = DrawableKind.Method;
+
+ StringBuilder builder = new StringBuilder();
+ builder.append(name);
+ if (label.endsWith("(Closure c)")) {
+ // for single closure, we offer curly brackets
+ builder.append(" {}");
+ } else {
+ builder.append("()");
+ }
+ item.commitText = builder.toString();
+ return item;
+ }
+
+ private static boolean isDeprecated(Method object) {
+ try {
+ Deprecated annotation = object.getAnnotation(Deprecated.class);
+ return annotation != null;
+ } catch (Throwable t) {
+ return false;
+ }
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/groovy/CompletionVisitor.java b/app/src/main/java/com/tyron/code/language/groovy/CompletionVisitor.java
new file mode 100644
index 000000000..729459cbf
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/groovy/CompletionVisitor.java
@@ -0,0 +1,247 @@
+package com.tyron.code.language.groovy;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.codehaus.groovy.ast.ClassCodeVisitorSupport;
+import org.codehaus.groovy.ast.ModuleNode;
+import org.codehaus.groovy.ast.expr.ArgumentListExpression;
+import org.codehaus.groovy.ast.expr.ClosureExpression;
+import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.GStringExpression;
+import org.codehaus.groovy.ast.expr.MapEntryExpression;
+import org.codehaus.groovy.ast.expr.MethodCallExpression;
+import org.codehaus.groovy.ast.expr.NamedArgumentListExpression;
+import org.codehaus.groovy.ast.expr.TupleExpression;
+import org.codehaus.groovy.ast.stmt.BlockStatement;
+import org.codehaus.groovy.ast.stmt.ExpressionStatement;
+import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.control.CompilationUnit;
+import org.codehaus.groovy.control.SourceUnit;
+import org.eclipse.lsp4j.Range;
+
+public class CompletionVisitor extends ClassCodeVisitorSupport {
+
+ @Override
+ protected SourceUnit getSourceUnit() {
+ return sourceUnit;
+ }
+
+ public class DependencyItem {
+ private String text;
+ private Range range;
+
+ public DependencyItem(String text, Range range) {
+ this.text = text;
+ this.range = range;
+ }
+
+ public String getText() {
+ return this.text;
+ }
+
+ public Range getRange() {
+ return this.range;
+ }
+ }
+
+ private URI currentUri;
+ private final Map> dependencies = new HashMap<>();
+ private final Map> methodCalls = new HashMap<>();
+ private final Map> statements = new HashMap<>();
+ private final Map> constants = new HashMap<>();
+ private final Map> plugins = new HashMap<>();
+
+ public List getDependencies(URI uri) {
+ return this.dependencies.get(uri);
+ }
+
+ public Set getMethodCalls(URI uri) {
+ return this.methodCalls.get(uri);
+ }
+
+ public List getStatements(URI uri) {
+ return this.statements.get(uri);
+ }
+
+ public List getConstants(URI uri) {
+ return this.constants.get(uri);
+ }
+
+ public Set getPlugins(URI uri) {
+ return this.plugins.get(uri);
+ }
+
+ public void visitCompilationUnit(URI uri, CompilationUnit compilationUnit) {
+ this.currentUri = uri;
+ compilationUnit.iterator().forEachRemaining(this::visitSourceUnit);
+ }
+
+ SourceUnit sourceUnit;
+
+ public void visitSourceUnit(SourceUnit unit) {
+ this.sourceUnit = unit;
+ ModuleNode moduleNode = unit.getAST();
+ if (moduleNode != null) {
+ this.dependencies.put(this.currentUri, new ArrayList<>());
+ this.methodCalls.put(this.currentUri, new HashSet<>());
+ this.statements.put(this.currentUri, new ArrayList<>());
+ this.constants.put(this.currentUri, new ArrayList<>());
+ this.plugins.put(this.currentUri, new HashSet<>());
+ visitModule(moduleNode);
+ }
+ }
+
+ public void visitModule(ModuleNode node) {
+ BlockStatement blockStatement = node.getStatementBlock();
+ this.statements.put(currentUri, blockStatement.getStatements());
+ node.getClasses().forEach(super::visitClass);
+ }
+
+ @Override
+ public void visitMethodCallExpression(MethodCallExpression node) {
+ this.methodCalls.get(this.currentUri).add(node);
+ if (node.getMethodAsString().equals("dependencies")) {
+ this.dependencies.get(this.currentUri).addAll(getDependencies(node));
+ } else if (node.getMethodAsString().equals("plugins")) {
+ // match plugins { id: ${id} }
+ List plugins = getPluginFromPlugins(node);
+ this.plugins.get(this.currentUri).addAll(plugins);
+ } else if (node.getMethodAsString().equals("apply")) {
+ // match apply plugins: '${id}'
+ String plugin = getPluginFromApply(node);
+ if (plugin != null) {
+ this.plugins.get(this.currentUri).add(plugin);
+ }
+ }
+ super.visitMethodCallExpression(node);
+ }
+
+ private List getDependencies(MethodCallExpression expression) {
+ Expression argument = expression.getArguments();
+ if (argument instanceof ArgumentListExpression) {
+ return getDependencies((ArgumentListExpression) argument);
+ }
+ return Collections.emptyList();
+ }
+
+ private List getDependencies(ArgumentListExpression argumentListExpression) {
+ List expressions = argumentListExpression.getExpressions();
+ List symbols = new ArrayList<>();
+ for (Expression expression : expressions) {
+ if (expression instanceof ClosureExpression) {
+ symbols.addAll(getDependencies((ClosureExpression) expression));
+ } else if (expression instanceof GStringExpression || expression instanceof ConstantExpression) {
+ // GStringExp: implementation
+ // "org.gradle:gradle-tooling-api:${gradleToolingApi}"
+ // ConstantExp: implementation "org.gradle:gradle-tooling-api:6.8.0"
+ symbols.add(new DependencyItem(expression.getText(), GroovyUtils.toDependencyRange(expression)));
+ } else if (expression instanceof MethodCallExpression) {
+ symbols.addAll(getDependencies((MethodCallExpression) expression));
+ }
+ }
+ return symbols;
+ }
+
+ private List getDependencies(ClosureExpression expression) {
+ Statement code = expression.getCode();
+ if (code instanceof BlockStatement) {
+ return getDependencies((BlockStatement) code);
+ }
+ return Collections.emptyList();
+ }
+
+ private List getDependencies(BlockStatement blockStatement) {
+ List statements = blockStatement.getStatements();
+ List results = new ArrayList<>();
+ for (Statement statement : statements) {
+ if (statement instanceof ExpressionStatement) {
+ results.addAll(getDependencies((ExpressionStatement) statement));
+ }
+ }
+ return results;
+ }
+
+ private List getDependencies(ExpressionStatement expressionStatement) {
+ Expression expression = expressionStatement.getExpression();
+ if (expression instanceof MethodCallExpression) {
+ return getDependencies((MethodCallExpression) expression);
+ }
+ return Collections.emptyList();
+ }
+
+ private String getPluginFromApply(MethodCallExpression node) {
+ Expression argument = node.getArguments();
+ if (argument instanceof TupleExpression) {
+ List expressions = ((TupleExpression) argument).getExpressions();
+ for (Expression expression : expressions) {
+ if (expression instanceof NamedArgumentListExpression) {
+ List mapEntryExpressions = ((NamedArgumentListExpression) expression)
+ .getMapEntryExpressions();
+ for (MapEntryExpression mapEntryExp : mapEntryExpressions) {
+ Expression keyExpression = mapEntryExp.getKeyExpression();
+ if (keyExpression instanceof ConstantExpression && keyExpression.getText().equals("plugin")) {
+ return mapEntryExp.getValueExpression().getText();
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ private List getPluginFromPlugins(MethodCallExpression node) {
+ Expression objectExpression = node.getObjectExpression();
+ if (objectExpression instanceof MethodCallExpression) {
+ return getPluginFromPlugins((MethodCallExpression) objectExpression);
+ }
+ List results = new ArrayList<>();
+ Expression argument = node.getArguments();
+ if (argument instanceof ArgumentListExpression) {
+ List expressions = ((ArgumentListExpression) argument).getExpressions();
+ for (Expression expression : expressions) {
+ if (expression instanceof ConstantExpression && node.getMethodAsString().equals("id")) {
+ results.add(expression.getText());
+ } else if (expression instanceof ClosureExpression) {
+ Statement code = ((ClosureExpression) expression).getCode();
+ if (code instanceof BlockStatement) {
+ results.addAll(getPluginFromPlugins((BlockStatement) code));
+ }
+ }
+ }
+ }
+ return results;
+ }
+
+ private List getPluginFromPlugins(BlockStatement code) {
+ List results = new ArrayList<>();
+ List statements = code.getStatements();
+ for (Statement statement : statements) {
+ if (statement instanceof ExpressionStatement) {
+ Expression expression = ((ExpressionStatement) statement).getExpression();
+ if (expression instanceof MethodCallExpression) {
+ results.addAll(getPluginFromPlugins((MethodCallExpression) expression));
+ }
+ }
+ }
+ return results;
+ }
+
+ @Override
+ public void visitConstantExpression(ConstantExpression expression) {
+ this.constants.get(currentUri).add(expression);
+ super.visitConstantExpression(expression);
+ }
+
+ @Override
+ public void visitGStringExpression(GStringExpression expression) {
+ this.constants.get(currentUri).add(expression);
+ super.visitGStringExpression(expression);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/language/groovy/GradleDelegate.java b/app/src/main/java/com/tyron/code/language/groovy/GradleDelegate.java
new file mode 100644
index 000000000..57e98f0be
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/groovy/GradleDelegate.java
@@ -0,0 +1,57 @@
+package com.tyron.code.language.groovy;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class GradleDelegate {
+ private static final String PROJECT = "org.gradle.api.Project";
+ private static final String SETTINGS = "org.gradle.api.initialization.Settings";
+ // Here to support different versions of delegate types. The values of delegate
+ // types are sorted by priority
+ private static final Map> delegateMap;
+
+ static {
+ delegateMap = new HashMap<>();
+ // plugins
+ delegateMap.put("application", List.of("org.gradle.api.plugins.JavaApplication",
+ "org.gradle.api.plugins.ApplicationPluginConvention"));
+ delegateMap.put("base", List.of("org.gradle.api.plugins.BasePluginExtension",
+ "org.gradle.api.plugins.BasePluginConvention"));
+ delegateMap.put("java", List.of("org.gradle.api.plugins.JavaPluginExtension",
+ "org.gradle.api.plugins.JavaPluginConvention"));
+ delegateMap.put("war", List.of("org.gradle.api.plugins.WarPluginConvention"));
+ // basic closures
+ delegateMap.put("plugins", List.of("org.gradle.plugin.use.PluginDependenciesSpec"));
+ delegateMap.put("configurations", List.of("org.gradle.api.artifacts.Configuration"));
+ delegateMap.put("dependencySubstitution", List.of("org.gradle.api.artifacts.DependencySubstitutions"));
+ delegateMap.put("resolutionStrategy", List.of("org.gradle.api.artifacts.ResolutionStrategy"));
+ delegateMap.put("artifacts", List.of("org.gradle.api.artifacts.dsl.ArtifactHandler"));
+ delegateMap.put("components", List.of("org.gradle.api.artifacts.dsl.ComponentMetadataHandler"));
+ delegateMap.put("modules", List.of("org.gradle.api.artifacts.dsl.ComponentModuleMetadataHandler"));
+ delegateMap.put("dependencies", List.of("org.gradle.api.artifacts.dsl.DependencyHandler"));
+ delegateMap.put("repositories", List.of("org.gradle.api.artifacts.dsl.RepositoryHandler"));
+ delegateMap.put("publishing", List.of("org.gradle.api.publish.PublishingExtension"));
+ delegateMap.put("publications", List.of("org.gradle.api.publish.PublicationContainer"));
+ delegateMap.put("sourceSets", List.of("org.gradle.api.tasks.SourceSet"));
+ delegateMap.put("distributions", List.of("org.gradle.api.distribution.Distribution"));
+ delegateMap.put("fileTree", List.of("org.gradle.api.file.ConfigurableFileTree"));
+ delegateMap.put("copySpec", List.of("org.gradle.api.file.CopySpec"));
+ delegateMap.put("exec", List.of("org.gradle.process.ExecSpec"));
+ delegateMap.put("files", List.of("org.gradle.api.file.ConfigurableFileCollection"));
+ delegateMap.put("task", List.of("org.gradle.api.Task"));
+ }
+
+ public static Map> getDelegateMap() {
+ return delegateMap;
+ }
+
+ public static String getDefault() {
+ return PROJECT;
+ }
+
+ public static String getSettings() {
+ return SETTINGS;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/language/groovy/Groovy.java b/app/src/main/java/com/tyron/code/language/groovy/Groovy.java
new file mode 100644
index 000000000..8583866ed
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/groovy/Groovy.java
@@ -0,0 +1,31 @@
+package com.tyron.code.language.groovy;
+
+import com.tyron.code.language.Language;
+import com.tyron.code.language.LanguageManager;
+import com.tyron.editor.Editor;
+
+import org.apache.commons.vfs2.FileObject;
+
+import java.io.File;
+
+public class Groovy implements Language {
+
+
+
+ @Override
+ public boolean isApplicable(File ext) {
+ return ext.getName().endsWith(".groovy") || ext.getName().endsWith(".gradle");
+ }
+
+ @Override
+ public boolean isApplicable(FileObject fileObject) {
+ String extension = fileObject.getName().getExtension();
+ return "groovy".equals(extension) || "gradle".equals(extension);
+ }
+
+ @Override
+ public io.github.rosemoe.sora.lang.Language get(Editor editor) {
+ return new GroovyLanguage(editor);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/language/groovy/GroovyLanguage.java b/app/src/main/java/com/tyron/code/language/groovy/GroovyLanguage.java
new file mode 100644
index 000000000..200f598ec
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/groovy/GroovyLanguage.java
@@ -0,0 +1,278 @@
+package com.tyron.code.language.groovy;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tyron.code.language.CompletionItemWrapper;
+import com.tyron.code.language.LanguageManager;
+import com.tyron.completion.model.CompletionItem;
+import com.tyron.completion.model.CompletionList;
+import com.tyron.editor.Editor;
+
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.Token;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.MethodCallExpression;
+import org.codehaus.groovy.control.CompilationUnit;
+import org.codehaus.groovy.control.CompilerConfiguration;
+import org.codehaus.groovy.control.Phases;
+import org.codehaus.groovy.control.SourceUnit;
+import org.eclipse.lsp4j.Position;
+import org.eclipse.lsp4j.Range;
+import org.eclipse.lsp4j.util.Ranges;
+
+import java.io.File;
+import java.net.URI;
+import java.util.List;
+import java.util.Set;
+
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyCodeSource;
+import io.github.rosemoe.sora.lang.Language;
+import io.github.rosemoe.sora.lang.analysis.AnalyzeManager;
+import io.github.rosemoe.sora.lang.completion.CompletionCancelledException;
+import io.github.rosemoe.sora.lang.completion.CompletionHelper;
+import io.github.rosemoe.sora.lang.completion.CompletionPublisher;
+import io.github.rosemoe.sora.lang.format.Formatter;
+import io.github.rosemoe.sora.lang.smartEnter.NewlineHandleResult;
+import io.github.rosemoe.sora.lang.smartEnter.NewlineHandler;
+import io.github.rosemoe.sora.langs.textmate.TextMateLanguage;
+import io.github.rosemoe.sora.text.CharPosition;
+import io.github.rosemoe.sora.text.ContentReference;
+import io.github.rosemoe.sora.text.TextUtils;
+import io.github.rosemoe.sora.util.MyCharacter;
+import io.github.rosemoe.sora.widget.SymbolPairMatch;
+
+public class GroovyLanguage implements Language {
+
+ private static final String GRAMMAR_NAME = "groovy.tmLanguage";
+ private static final String LANGUAGE_PATH = "textmate/groovy/syntaxes/groovy.tmLanguage";
+ private static final String CONFIG_PATH = "textmate/groovy/language-configuration.json";
+
+ private final Editor editor;
+ private final TextMateLanguage delegate;
+
+
+ public GroovyLanguage(Editor editor) {
+ this.editor = editor;
+ delegate = LanguageManager.createTextMateLanguage(GRAMMAR_NAME, LANGUAGE_PATH, CONFIG_PATH, editor);
+ }
+
+ @NonNull
+ @Override
+ public AnalyzeManager getAnalyzeManager() {
+ return delegate.getAnalyzeManager();
+ }
+
+ @Override
+ public int getInterruptionLevel() {
+ return delegate.getInterruptionLevel();
+ }
+
+ @Override
+ public void requireAutoComplete(@NonNull ContentReference content,
+ @NonNull CharPosition position,
+ @NonNull CompletionPublisher publisher,
+ @NonNull Bundle extraArguments) throws CompletionCancelledException {
+ String prefix = CompletionHelper.computePrefix(content, position, MyCharacter::isJavaIdentifierPart);
+
+ if (true) {
+ return;
+ }
+ try {
+ File currentFile = editor.getCurrentFile();
+ URI uri = currentFile.toURI();
+ Position pos = new Position(position.getLine(), position.getColumn());
+
+ CompilerConfiguration compilerConfiguration = new CompilerConfiguration();
+ GroovyClassLoader classLoader = new GroovyClassLoader(getClass().getClassLoader(), compilerConfiguration);
+ CompilationUnit unit = new CompilationUnit(compilerConfiguration, null, classLoader);
+ SourceUnit source = new SourceUnit(
+ currentFile.getName(),
+ content.getReference().toString(),
+ unit.getConfiguration(),
+ classLoader,
+ unit.getErrorCollector()
+ );
+ unit.addSource(source);
+
+ unit.compile(Phases.CANONICALIZATION);
+
+ CompletionVisitor completionVisitor = new CompletionVisitor();
+ completionVisitor.visitCompilationUnit(uri,
+ unit
+ );
+
+ Set methodCalls = completionVisitor.getMethodCalls(uri);
+ MethodCallExpression containingCall = null;
+ for (MethodCallExpression call : methodCalls) {
+ Expression expression = call.getArguments();
+ Range range = GroovyUtils.toRange(expression);
+ if (Ranges.containsPosition(range, pos)
+ && (containingCall == null || Ranges.containsRange(GroovyUtils.toRange(containingCall.getArguments()),
+ GroovyUtils.toRange(call.getArguments())))) {
+ // find inner containing call
+ containingCall = call;
+ }
+ }
+
+ if (containingCall != null) {
+ CompletionHandler completionHandler = new CompletionHandler();
+ List completionItems = completionHandler.getCompletionItems(
+ containingCall,
+ currentFile.getName(),
+ editor.getProject().getRootFile().getAbsolutePath(),
+ completionVisitor.getPlugins(uri));
+ CompletionList.Builder builder = new CompletionList.Builder(prefix);
+ completionItems.forEach(builder::addItem);
+ builder.build().getItems().forEach(it -> {
+ publisher.addItem(new CompletionItemWrapper(it));
+ });
+ }
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+
+ @Override
+ public int getIndentAdvance(@NonNull ContentReference content, int line, int column) {
+ return delegate.getIndentAdvance(content, line, column);
+ }
+
+ @Override
+ public boolean useTab() {
+ return false;
+ }
+
+ @NonNull
+ @Override
+ public Formatter getFormatter() {
+ return delegate.getFormatter();
+ }
+
+ @Override
+ public SymbolPairMatch getSymbolPairs() {
+ return delegate.getSymbolPairs();
+ }
+
+ @Nullable
+ @Override
+ public NewlineHandler[] getNewlineHandlers() {
+ return new NewlineHandler[]{
+ new BraceHandler(),
+ new JavaDocHandler(),
+ new TwoIndentHandler()
+ };
+ }
+
+ @Override
+ public void destroy() {
+ delegate.destroy();
+ }
+
+ public int getIndentAdvance(String p1) {
+ GroovyLexer groovyLexer = new GroovyLexer(CharStreams.fromString(p1));
+ Token token;
+ int advance = 0;
+ while ((token = groovyLexer.nextToken()).getType() != Token.EOF) {
+ if (token.getType() == GroovyLexer.LBRACK) {
+ advance++;
+ }
+ }
+ return (advance * delegate.getTabSize());
+ }
+
+ class TwoIndentHandler implements NewlineHandler {
+
+ @Override
+ public boolean matchesRequirement(String beforeText, String afterText) {
+ Log.d("BeforeText", beforeText);
+ if (beforeText.replace("\r", "").trim().startsWith(".")) {
+ return false;
+ }
+ return beforeText.endsWith(")") && !afterText.startsWith(";");
+ }
+
+ @Override
+ public NewlineHandleResult handleNewline(String beforeText, String afterText, int tabSize) {
+ int count = TextUtils.countLeadingSpaceCount(beforeText, tabSize);
+ int advanceAfter = getIndentAdvance(afterText) + (4 * 2);
+ String text;
+ StringBuilder sb = new StringBuilder().append('\n')
+ .append(text = TextUtils.createIndent(count + advanceAfter, tabSize, useTab()));
+ int shiftLeft = 0;
+ return new NewlineHandleResult(sb, shiftLeft);
+ }
+
+
+ }
+
+ class BraceHandler implements NewlineHandler {
+
+ @Override
+ public boolean matchesRequirement(String beforeText, String afterText) {
+ return beforeText.endsWith("{") && afterText.startsWith("}");
+ }
+
+ @Override
+ public NewlineHandleResult handleNewline(String beforeText, String afterText, int tabSize) {
+ int count = TextUtils.countLeadingSpaceCount(beforeText, tabSize);
+ int advanceBefore = getIndentAdvance(beforeText);
+ int advanceAfter = getIndentAdvance(afterText);
+ String text;
+ StringBuilder sb = new StringBuilder("\n").append(
+ TextUtils.createIndent(count + advanceBefore, tabSize, useTab())).append('\n')
+ .append(text = TextUtils.createIndent(count + advanceAfter, tabSize, useTab()));
+ int shiftLeft = text.length() + 1;
+ return new NewlineHandleResult(sb, shiftLeft);
+ }
+ }
+
+ class JavaDocStartHandler implements NewlineHandler {
+
+ private boolean shouldCreateEnd = true;
+
+ @Override
+ public boolean matchesRequirement(String beforeText, String afterText) {
+ return beforeText.trim().startsWith("/**");
+ }
+
+ @Override
+ public NewlineHandleResult handleNewline(String beforeText, String afterText, int tabSize) {
+ int count = TextUtils.countLeadingSpaceCount(beforeText, tabSize);
+ int advanceAfter = getIndentAdvance(afterText);
+ String text = "";
+ StringBuilder sb = new StringBuilder().append("\n")
+ .append(TextUtils.createIndent(count + advanceAfter, tabSize, useTab()))
+ .append(" * ");
+ if (shouldCreateEnd) {
+ sb.append("\n").append(
+ text = TextUtils.createIndent(count + advanceAfter, tabSize,
+ useTab()))
+ .append(" */");
+ }
+ return new NewlineHandleResult(sb, text.length() + 4);
+ }
+ }
+
+ class JavaDocHandler implements NewlineHandler {
+
+ @Override
+ public boolean matchesRequirement(String beforeText, String afterText) {
+ return beforeText.trim().startsWith("*") && !beforeText.trim().startsWith("*/");
+ }
+
+ @Override
+ public NewlineHandleResult handleNewline(String beforeText, String afterText, int tabSize) {
+ int count = TextUtils.countLeadingSpaceCount(beforeText, tabSize);
+ int advanceAfter = getIndentAdvance(afterText);
+ StringBuilder sb = new StringBuilder().append("\n")
+ .append(TextUtils.createIndent(count + advanceAfter, tabSize, useTab()))
+ .append("* ");
+ return new NewlineHandleResult(sb, 0);
+ }
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/groovy/GroovyLexer.g4 b/app/src/main/java/com/tyron/code/language/groovy/GroovyLexer.g4
similarity index 100%
rename from app/src/main/java/com/tyron/code/ui/editor/language/groovy/GroovyLexer.g4
rename to app/src/main/java/com/tyron/code/language/groovy/GroovyLexer.g4
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/groovy/GroovyLexer.java b/app/src/main/java/com/tyron/code/language/groovy/GroovyLexer.java
similarity index 99%
rename from app/src/main/java/com/tyron/code/ui/editor/language/groovy/GroovyLexer.java
rename to app/src/main/java/com/tyron/code/language/groovy/GroovyLexer.java
index 3f489ba59..bd90d8258 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/groovy/GroovyLexer.java
+++ b/app/src/main/java/com/tyron/code/language/groovy/GroovyLexer.java
@@ -1,5 +1,5 @@
// Generated from C:/Users/bounc/AndroidStudioProjects/CodeAssist/app/src/main/java/com/tyron/code/ui/editor/language/groovy\GroovyLexer.g4 by ANTLR 4.9.1
-package com.tyron.code.ui.editor.language.groovy;
+package com.tyron.code.language.groovy;
import java.util.ArrayDeque;
import java.util.Arrays;
@@ -10,11 +10,9 @@
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.*;
+ import org.antlr.v4.runtime.*;
import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.misc.*;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class GroovyLexer extends Lexer {
diff --git a/app/src/main/java/com/tyron/code/language/groovy/GroovyUtils.java b/app/src/main/java/com/tyron/code/language/groovy/GroovyUtils.java
new file mode 100644
index 000000000..cc804df4d
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/groovy/GroovyUtils.java
@@ -0,0 +1,34 @@
+package com.tyron.code.language.groovy;
+
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.syntax.SyntaxException;
+import org.eclipse.lsp4j.Position;
+import org.eclipse.lsp4j.Range;
+
+public class GroovyUtils {
+
+ public static Range toRange(SyntaxException exp) {
+ // LSP Range start from 0, while groovy classes start from 1
+ return new Range(new Position(exp.getStartLine() - 1, exp.getStartColumn() - 1),
+ new Position(exp.getEndLine() - 1, exp.getEndColumn() - 1));
+ }
+
+ public static Range toRange(Expression expression) {
+ // LSP Range start from 0, while groovy expressions start from 1
+ return new Range(new Position(expression.getLineNumber() - 1, expression.getColumnNumber() - 1),
+ new Position(expression.getLastLineNumber() - 1, expression.getLastColumnNumber() - 1));
+ }
+
+ public static Range toRange(Statement statement) {
+ // LSP Range start from 0, while groovy expressions start from 1
+ return new Range(new Position(statement.getLineNumber() - 1, statement.getColumnNumber() - 1),
+ new Position(statement.getLastLineNumber() - 1, statement.getLastColumnNumber() - 1));
+ }
+
+ public static Range toDependencyRange(Expression expression) {
+ // For dependency, the string includes open/close quotes should be excluded
+ return new Range(new Position(expression.getLineNumber() - 1, expression.getColumnNumber()),
+ new Position(expression.getLastLineNumber() - 1, expression.getLastColumnNumber() - 2));
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/java/Java.java b/app/src/main/java/com/tyron/code/language/java/Java.java
new file mode 100644
index 000000000..eddc2a7ff
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/java/Java.java
@@ -0,0 +1,27 @@
+package com.tyron.code.language.java;
+
+import com.tyron.code.language.Language;
+import com.tyron.editor.Editor;
+
+import org.apache.commons.vfs2.FileObject;
+
+import java.io.File;
+
+public class Java implements Language {
+
+
+ @Override
+ public boolean isApplicable(File ext) {
+ return ext.getName().endsWith(".java");
+ }
+
+ @Override
+ public boolean isApplicable(FileObject fileObject) {
+ return fileObject.getName().getExtension().equals("java");
+ }
+
+ @Override
+ public io.github.rosemoe.sora.lang.Language get(Editor editor) {
+ return new JavaLanguage(editor);
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/java/JavaAutoCompleteProvider.java b/app/src/main/java/com/tyron/code/language/java/JavaAutoCompleteProvider.java
new file mode 100644
index 000000000..fa0d3d384
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/java/JavaAutoCompleteProvider.java
@@ -0,0 +1,62 @@
+package com.tyron.code.language.java;
+
+import android.content.SharedPreferences;
+
+import androidx.annotation.Nullable;
+
+import com.tyron.builder.project.Project;
+import com.tyron.builder.project.api.JavaModule;
+import com.tyron.builder.project.api.Module;
+import com.tyron.code.ApplicationLoader;
+import com.tyron.code.language.AbstractAutoCompleteProvider;
+import com.tyron.code.ui.project.ProjectManager;
+import com.tyron.common.SharedPreferenceKeys;
+import com.tyron.completion.main.CompletionEngine;
+import com.tyron.completion.model.CompletionList;
+import com.tyron.editor.Content;
+import com.tyron.editor.Editor;
+
+import java.util.Optional;
+
+public class JavaAutoCompleteProvider extends AbstractAutoCompleteProvider {
+
+ private final Editor mEditor;
+ private final SharedPreferences mPreferences;
+
+ public JavaAutoCompleteProvider(Editor editor) {
+ mEditor = editor;
+ mPreferences = ApplicationLoader.getDefaultPreferences();
+ }
+
+
+ @Nullable
+ @Override
+ public CompletionList getCompletionList(String prefix, int line, int column) {
+ if (!mPreferences.getBoolean(SharedPreferenceKeys.JAVA_CODE_COMPLETION, true)) {
+ return null;
+ }
+
+ Project project = ProjectManager.getInstance().getCurrentProject();
+
+ if (project == null) {
+ return null;
+ }
+
+ Module currentModule = project.getModule(mEditor.getCurrentFile());
+
+ if (currentModule instanceof JavaModule) {
+ Content content = mEditor.getContent();
+ return CompletionEngine.getInstance()
+ .complete(project,
+ currentModule,
+ mEditor,
+ mEditor.getCurrentFile(),
+ content.toString(),
+ prefix,
+ line,
+ column,
+ mEditor.getCaret().getStart());
+ }
+ return null;
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/java/JavaLanguage.java b/app/src/main/java/com/tyron/code/language/java/JavaLanguage.java
new file mode 100644
index 000000000..d53a47773
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/java/JavaLanguage.java
@@ -0,0 +1,332 @@
+package com.tyron.code.language.java;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.sun.tools.javac.util.JCDiagnostic;
+import com.tyron.builder.project.Project;
+import com.tyron.code.language.CompletionItemWrapper;
+import com.tyron.code.language.EditorFormatter;
+import com.tyron.code.language.LanguageManager;
+import com.tyron.completion.CompletionParameters;
+import com.tyron.completion.java.JavaCompletionProvider;
+import com.tyron.completion.java.compiler.services.NBLog;
+import com.tyron.completion.java.parse.CompilationInfo;
+import com.tyron.completion.model.CompletionList;
+import com.tyron.editor.Editor;
+import com.tyron.language.api.CodeAssistLanguage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import javax.tools.Diagnostic;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+
+import io.github.rosemoe.editor.langs.java.JavaTextTokenizer;
+import io.github.rosemoe.editor.langs.java.Tokens;
+import io.github.rosemoe.sora.lang.EmptyLanguage;
+import io.github.rosemoe.sora.lang.Language;
+import io.github.rosemoe.sora.lang.analysis.AnalyzeManager;
+import io.github.rosemoe.sora.lang.completion.CompletionCancelledException;
+import io.github.rosemoe.sora.lang.completion.CompletionHelper;
+import io.github.rosemoe.sora.lang.completion.CompletionPublisher;
+import io.github.rosemoe.sora.lang.diagnostic.DiagnosticRegion;
+import io.github.rosemoe.sora.lang.format.AsyncFormatter;
+import io.github.rosemoe.sora.lang.format.Formatter;
+import io.github.rosemoe.sora.lang.smartEnter.NewlineHandleResult;
+import io.github.rosemoe.sora.lang.smartEnter.NewlineHandler;
+import io.github.rosemoe.sora.langs.textmate.TextMateLanguage;
+import io.github.rosemoe.sora.text.CharPosition;
+import io.github.rosemoe.sora.text.Content;
+import io.github.rosemoe.sora.text.ContentReference;
+import io.github.rosemoe.sora.text.TextRange;
+import io.github.rosemoe.sora.text.TextUtils;
+import io.github.rosemoe.sora.util.MyCharacter;
+import io.github.rosemoe.sora.widget.SymbolPairMatch;
+
+public class JavaLanguage implements Language, EditorFormatter, CodeAssistLanguage {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(JavaLanguage.class);
+
+ private static final String GRAMMAR_NAME = "java.tmLanguage.json";
+ private static final String LANGUAGE_PATH = "textmate/java/syntaxes/java.tmLanguage.json";
+ private static final String CONFIG_PATH = "textmate/java/language-configuration.json";
+
+ private final Editor editor;
+ private final TextMateLanguage delegate;
+ private final Formatter formatter = new AsyncFormatter() {
+ @Nullable
+ @Override
+ public TextRange formatAsync(@NonNull Content text, @NonNull TextRange cursorRange) {
+ String format = com.tyron.eclipse.formatter.Formatter.format(text.toString(),
+ cursorRange.getStartIndex(),
+ cursorRange.getEndIndex() - cursorRange.getStartIndex());
+ if (!text.toString().equals(format)) {
+ text.delete(0, text.getLineCount() - 1);
+ text.insert(0, 0, format);
+ }
+ return cursorRange;
+ }
+
+ @Nullable
+ @Override
+ public TextRange formatRegionAsync(@NonNull Content text,
+ @NonNull TextRange rangeToFormat,
+ @NonNull TextRange cursorRange) {
+ return null;
+ }
+ };
+
+
+ public JavaLanguage(Editor editor) {
+ this.editor = editor;
+ delegate = LanguageManager.createTextMateLanguage(GRAMMAR_NAME, LANGUAGE_PATH, CONFIG_PATH, editor);
+ }
+
+
+ public boolean isAutoCompleteChar(char p1) {
+ return p1 == '.' || MyCharacter.isJavaIdentifierPart(p1);
+ }
+
+ public int getIndentAdvance(String p1) {
+ JavaTextTokenizer tokenizer = new JavaTextTokenizer(p1);
+ Tokens token;
+ int advance = 0;
+ while ((token = tokenizer.directNextToken()) != Tokens.EOF) {
+ switch (token) {
+ case LBRACE:
+ advance++;
+ break;
+ }
+ }
+ return (advance * getTabWidth());
+ }
+
+ public int getFormatIndent(String line) {
+ JavaTextTokenizer tokenizer = new JavaTextTokenizer(line);
+ Tokens token;
+ int advance = 0;
+ while ((token = tokenizer.directNextToken()) != Tokens.EOF) {
+ switch (token) {
+ case LBRACE:
+ advance++;
+ break;
+ case RBRACE:
+ advance--;
+ }
+ }
+ return (advance * getTabWidth());
+ }
+
+ @NonNull
+ @Override
+ public AnalyzeManager getAnalyzeManager() {
+ return delegate.getAnalyzeManager();
+ }
+
+ @Override
+ public int getInterruptionLevel() {
+ return INTERRUPTION_LEVEL_SLIGHT;
+ }
+
+ @Override
+ public void requireAutoComplete(@NonNull ContentReference content,
+ @NonNull CharPosition position,
+ @NonNull CompletionPublisher publisher,
+ @NonNull Bundle extraArguments) throws CompletionCancelledException {
+ String prefix = CompletionHelper.computePrefix(content, position, MyCharacter::isJavaIdentifierPart);
+ CompletionParameters parameters = CompletionParameters.builder()
+ .setColumn(position.getColumn())
+ .setLine(position.getLine())
+ .setIndex(position.getIndex())
+ .setEditor(editor)
+ .setFile(editor.getCurrentFile())
+ .setProject(editor.getProject())
+ .setModule(editor.getProject().getMainModule())
+ .setContents(content.getReference().toString())
+ .setPrefix(prefix)
+ .build();
+ JavaCompletionProvider provider = new JavaCompletionProvider();
+ CompletionList list = provider.complete(parameters);
+
+ publisher.setUpdateThreshold(0);
+ publisher.addItems(list.getItems().stream().map(CompletionItemWrapper::new)
+ .collect(Collectors.toList()));
+ }
+
+ @Override
+ public int getIndentAdvance(@NonNull ContentReference content, int line, int column) {
+ String text = content.getLine(line).substring(0, column);
+ return getIndentAdvance(text);
+ }
+
+ @Override
+ public boolean useTab() {
+ return true;
+ }
+
+ @NonNull
+ @Override
+ public Formatter getFormatter() {
+ return formatter;
+ }
+
+ public int getTabWidth() {
+ return 4;
+ }
+
+ public CharSequence format(CharSequence p1) {
+ return format(p1, 0, p1.length());
+ }
+
+ @NonNull
+ @Override
+ public CharSequence format(@NonNull CharSequence contents, int start, int end) {
+ return com.tyron.eclipse.formatter.Formatter.format(contents.toString(), start,
+ end - start);
+ }
+
+ @Override
+ public SymbolPairMatch getSymbolPairs() {
+ return delegate.getSymbolPairs();
+ }
+
+ private final NewlineHandler[] newLineHandlers =
+ new NewlineHandler[]{new BraceHandler(), new TwoIndentHandler(),
+ new JavaDocStartHandler(), new JavaDocHandler()};
+
+ @Override
+ public NewlineHandler[] getNewlineHandlers() {
+ return newLineHandlers;
+ }
+
+ @Override
+ public void destroy() {
+ delegate.destroy();
+ }
+
+ @Override
+ public void onContentChange(File file, CharSequence content) {
+ Project project = editor.getProject();
+ if (project == null) {
+ return;
+ }
+ CompilationInfo compilationInfo = CompilationInfo.get(project, editor.getCurrentFile());
+ if (compilationInfo == null) {
+ return;
+ }
+ JavaFileObject fileObject = new SimpleJavaFileObject(editor.getCurrentFile().toURI(),
+ JavaFileObject.Kind.SOURCE) {
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return content;
+ }
+ };
+ try {
+ compilationInfo.update(fileObject);
+ } catch (Throwable t) {
+ LOGGER.error("Failed to update compilation unit", t);
+ }
+ }
+
+ class TwoIndentHandler implements NewlineHandler {
+
+ @Override
+ public boolean matchesRequirement(String beforeText, String afterText) {
+ Log.d("BeforeText", beforeText);
+ if (beforeText.replace("\r", "").trim().startsWith(".")) {
+ return false;
+ }
+ return beforeText.endsWith(")") && !afterText.startsWith(";");
+ }
+
+ @Override
+ public NewlineHandleResult handleNewline(String beforeText, String afterText, int tabSize) {
+ int count = TextUtils.countLeadingSpaceCount(beforeText, tabSize);
+ int advanceAfter = getIndentAdvance(afterText) + (4 * 2);
+ String text;
+ StringBuilder sb = new StringBuilder().append('\n')
+ .append(text = TextUtils.createIndent(count + advanceAfter, tabSize, useTab()));
+ int shiftLeft = 0;
+ return new NewlineHandleResult(sb, shiftLeft);
+ }
+
+
+ }
+
+ class BraceHandler implements NewlineHandler {
+
+ @Override
+ public boolean matchesRequirement(String beforeText, String afterText) {
+ return beforeText.endsWith("{") && afterText.startsWith("}");
+ }
+
+ @Override
+ public NewlineHandleResult handleNewline(String beforeText, String afterText, int tabSize) {
+ int count = TextUtils.countLeadingSpaceCount(beforeText, tabSize);
+ int advanceBefore = getIndentAdvance(beforeText);
+ int advanceAfter = getIndentAdvance(afterText);
+ String text;
+ StringBuilder sb = new StringBuilder("\n").append(
+ TextUtils.createIndent(count + advanceBefore, tabSize, useTab())).append('\n')
+ .append(text = TextUtils.createIndent(count + advanceAfter, tabSize, useTab()));
+ int shiftLeft = text.length() + 1;
+ return new NewlineHandleResult(sb, shiftLeft);
+ }
+ }
+
+ class JavaDocStartHandler implements NewlineHandler {
+
+ private boolean shouldCreateEnd = true;
+
+ @Override
+ public boolean matchesRequirement(String beforeText, String afterText) {
+ return beforeText.trim().startsWith("/**");
+ }
+
+ @Override
+ public NewlineHandleResult handleNewline(String beforeText, String afterText, int tabSize) {
+ int count = TextUtils.countLeadingSpaceCount(beforeText, tabSize);
+ int advanceAfter = getIndentAdvance(afterText);
+ String text = "";
+ StringBuilder sb = new StringBuilder().append("\n")
+ .append(TextUtils.createIndent(count + advanceAfter, tabSize, useTab()))
+ .append(" * ");
+ if (shouldCreateEnd) {
+ sb.append("\n").append(
+ text = TextUtils.createIndent(count + advanceAfter, tabSize,
+ useTab()))
+ .append(" */");
+ }
+ return new NewlineHandleResult(sb, text.length() + 4);
+ }
+ }
+
+ class JavaDocHandler implements NewlineHandler {
+
+ @Override
+ public boolean matchesRequirement(String beforeText, String afterText) {
+ return beforeText.trim().startsWith("*") && !beforeText.trim().startsWith("*/");
+ }
+
+ @Override
+ public NewlineHandleResult handleNewline(String beforeText, String afterText, int tabSize) {
+ int count = TextUtils.countLeadingSpaceCount(beforeText, tabSize);
+ int advanceAfter = getIndentAdvance(afterText);
+ StringBuilder sb = new StringBuilder().append("\n")
+ .append(TextUtils.createIndent(count + advanceAfter, tabSize, useTab()))
+ .append("* ");
+ return new NewlineHandleResult(sb, 0);
+ }
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/language/java/JavaTokenTypes.java b/app/src/main/java/com/tyron/code/language/java/JavaTokenTypes.java
new file mode 100644
index 000000000..20daea507
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/java/JavaTokenTypes.java
@@ -0,0 +1,58 @@
+package com.tyron.code.language.java;
+
+import com.tyron.code.analyzer.semantic.TokenType;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.VariableElement;
+import com.sun.tools.javac.code.Symbol;
+
+public class JavaTokenTypes {
+
+ public static final TokenType FIELD = TokenType.create("variable.other.object.property.java");
+ public static final TokenType CONSTANT = TokenType.create("variable.other.constant");
+ public static final TokenType PARAMETER = TokenType.create("variable.parameter");
+ public static final TokenType CLASS = TokenType.create("entity.name.type.class");
+ public static final TokenType METHOD_CALL = TokenType.create("meta.method-call");
+ public static final TokenType METHOD_DECLARATION = TokenType.create("entity.name.function.member");
+ public static final TokenType VARIABLE = TokenType.create("entity.name.variable");
+ public static final TokenType CONSTRUCTOR = TokenType.create("class.instance.constructor");
+ public static final TokenType ANNOTATION = TokenType.create("storage.type.annotation");
+
+ public static TokenType getApplicableType(Element element) {
+ if (element == null) {
+ return null;
+ }
+
+ switch (element.getKind()) {
+ case LOCAL_VARIABLE:
+ Symbol.VarSymbol varSymbol = (Symbol.VarSymbol) element;
+ if (varSymbol.getModifiers().contains(Modifier.FINAL)) {
+ return CONSTANT;
+ }
+ return VARIABLE;
+ case METHOD:
+ Symbol.MethodSymbol methodSymbol = ((Symbol.MethodSymbol) element);
+ if (methodSymbol.isConstructor()) {
+ return getApplicableType(methodSymbol.getEnclosingElement());
+ }
+ return METHOD_DECLARATION;
+ case FIELD:
+ VariableElement variableElement = ((VariableElement) element);
+ if (variableElement.getModifiers().contains(Modifier.FINAL)) {
+ return CONSTANT;
+ }
+ return FIELD;
+ case CLASS:
+ return CLASS;
+ case CONSTRUCTOR:
+ return CONSTRUCTOR;
+ case PARAMETER:
+ return PARAMETER;
+ case ANNOTATION_TYPE:
+ return ANNOTATION;
+ default:
+ return null;
+ }
+ }
+}
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4 b/app/src/main/java/com/tyron/code/language/json/JSON.g4
similarity index 86%
rename from app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4
rename to app/src/main/java/com/tyron/code/language/json/JSON.g4
index ae970bec3..2f11b8b3f 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4
+++ b/app/src/main/java/com/tyron/code/language/json/JSON.g4
@@ -8,8 +8,8 @@ json
;
obj
- : LBRACKET pair (',' pair)* RBRACKET
- | LBRACKET RBRACKET
+ : LBRACE pair (',' pair)* RBRACE
+ | LBRACE RBRACE
;
pair
@@ -17,8 +17,8 @@ pair
;
arr
- : '[' value (COMMA value)* ']'
- | '[' ']'
+ : LBRACKET value (COMMA value)* RBRACKET
+ | LBRACKET RBRACKET
;
value
@@ -50,14 +50,23 @@ STRING
: '"' (ESC | SAFECODEPOINT)* '"'
;
-LBRACKET
+LBRACE
: '{'
;
-RBRACKET
+RBRACE
: '}'
;
+
+LBRACKET
+ : '['
+ ;
+
+RBRACKET
+ : ']'
+ ;
+
COMMA
: ','
;
diff --git a/app/src/main/java/com/tyron/code/language/json/JSON.interp b/app/src/main/java/com/tyron/code/language/json/JSON.interp
new file mode 100644
index 000000000..2b38429fe
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/json/JSON.interp
@@ -0,0 +1,40 @@
+token literal names:
+null
+'true'
+'false'
+'null'
+':'
+null
+'{'
+'}'
+'['
+']'
+','
+null
+null
+
+token symbolic names:
+null
+TRUE
+FALSE
+NULL
+COLON
+STRING
+LBRACE
+RBRACE
+LBRACKET
+RBRACKET
+COMMA
+NUMBER
+WS
+
+rule names:
+json
+obj
+pair
+arr
+value
+
+
+atn:
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 14, 58, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 7, 3, 19, 10, 3, 12, 3, 14, 3, 22, 11, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 28, 10, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 7, 5, 38, 10, 5, 12, 5, 14, 5, 41, 11, 5, 3, 5, 3, 5, 3, 5, 3, 5, 5, 5, 47, 10, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 56, 10, 6, 3, 6, 2, 2, 7, 2, 4, 6, 8, 10, 2, 2, 2, 62, 2, 12, 3, 2, 2, 2, 4, 27, 3, 2, 2, 2, 6, 29, 3, 2, 2, 2, 8, 46, 3, 2, 2, 2, 10, 55, 3, 2, 2, 2, 12, 13, 5, 10, 6, 2, 13, 3, 3, 2, 2, 2, 14, 15, 7, 8, 2, 2, 15, 20, 5, 6, 4, 2, 16, 17, 7, 12, 2, 2, 17, 19, 5, 6, 4, 2, 18, 16, 3, 2, 2, 2, 19, 22, 3, 2, 2, 2, 20, 18, 3, 2, 2, 2, 20, 21, 3, 2, 2, 2, 21, 23, 3, 2, 2, 2, 22, 20, 3, 2, 2, 2, 23, 24, 7, 9, 2, 2, 24, 28, 3, 2, 2, 2, 25, 26, 7, 8, 2, 2, 26, 28, 7, 9, 2, 2, 27, 14, 3, 2, 2, 2, 27, 25, 3, 2, 2, 2, 28, 5, 3, 2, 2, 2, 29, 30, 7, 7, 2, 2, 30, 31, 7, 6, 2, 2, 31, 32, 5, 10, 6, 2, 32, 7, 3, 2, 2, 2, 33, 34, 7, 10, 2, 2, 34, 39, 5, 10, 6, 2, 35, 36, 7, 12, 2, 2, 36, 38, 5, 10, 6, 2, 37, 35, 3, 2, 2, 2, 38, 41, 3, 2, 2, 2, 39, 37, 3, 2, 2, 2, 39, 40, 3, 2, 2, 2, 40, 42, 3, 2, 2, 2, 41, 39, 3, 2, 2, 2, 42, 43, 7, 11, 2, 2, 43, 47, 3, 2, 2, 2, 44, 45, 7, 10, 2, 2, 45, 47, 7, 11, 2, 2, 46, 33, 3, 2, 2, 2, 46, 44, 3, 2, 2, 2, 47, 9, 3, 2, 2, 2, 48, 56, 7, 7, 2, 2, 49, 56, 7, 13, 2, 2, 50, 56, 5, 4, 3, 2, 51, 56, 5, 8, 5, 2, 52, 56, 7, 3, 2, 2, 53, 56, 7, 4, 2, 2, 54, 56, 7, 5, 2, 2, 55, 48, 3, 2, 2, 2, 55, 49, 3, 2, 2, 2, 55, 50, 3, 2, 2, 2, 55, 51, 3, 2, 2, 2, 55, 52, 3, 2, 2, 2, 55, 53, 3, 2, 2, 2, 55, 54, 3, 2, 2, 2, 56, 11, 3, 2, 2, 2, 7, 20, 27, 39, 46, 55]
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/language/json/JSON.tokens b/app/src/main/java/com/tyron/code/language/json/JSON.tokens
new file mode 100644
index 000000000..44a91db05
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/json/JSON.tokens
@@ -0,0 +1,21 @@
+TRUE=1
+FALSE=2
+NULL=3
+COLON=4
+STRING=5
+LBRACE=6
+RBRACE=7
+LBRACKET=8
+RBRACKET=9
+COMMA=10
+NUMBER=11
+WS=12
+'true'=1
+'false'=2
+'null'=3
+':'=4
+'{'=6
+'}'=7
+'['=8
+']'=9
+','=10
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONBaseListener.java b/app/src/main/java/com/tyron/code/language/json/JSONBaseListener.java
similarity index 98%
rename from app/src/main/java/com/tyron/code/ui/editor/language/json/JSONBaseListener.java
rename to app/src/main/java/com/tyron/code/language/json/JSONBaseListener.java
index f1525f738..0f2740e35 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONBaseListener.java
+++ b/app/src/main/java/com/tyron/code/language/json/JSONBaseListener.java
@@ -1,5 +1,5 @@
// Generated from /home/tyron/AndroidStudioProjects/CodeAssist/app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4 by ANTLR 4.9.2
-package com.tyron.code.ui.editor.language.json;
+package com.tyron.code.language.json;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.tree.ErrorNode;
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONBaseVisitor.java b/app/src/main/java/com/tyron/code/language/json/JSONBaseVisitor.java
similarity index 97%
rename from app/src/main/java/com/tyron/code/ui/editor/language/json/JSONBaseVisitor.java
rename to app/src/main/java/com/tyron/code/language/json/JSONBaseVisitor.java
index 82553f681..38842f071 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONBaseVisitor.java
+++ b/app/src/main/java/com/tyron/code/language/json/JSONBaseVisitor.java
@@ -1,5 +1,5 @@
// Generated from /home/tyron/AndroidStudioProjects/CodeAssist/app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4 by ANTLR 4.9.2
-package com.tyron.code.ui.editor.language.json;
+package com.tyron.code.language.json;
import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
/**
diff --git a/app/src/main/java/com/tyron/code/language/json/JSONLexer.interp b/app/src/main/java/com/tyron/code/language/json/JSONLexer.interp
new file mode 100644
index 000000000..d8aa9bf91
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/json/JSONLexer.interp
@@ -0,0 +1,59 @@
+token literal names:
+null
+'true'
+'false'
+'null'
+':'
+null
+'{'
+'}'
+'['
+']'
+','
+null
+null
+
+token symbolic names:
+null
+TRUE
+FALSE
+NULL
+COLON
+STRING
+LBRACE
+RBRACE
+LBRACKET
+RBRACKET
+COMMA
+NUMBER
+WS
+
+rule names:
+TRUE
+FALSE
+NULL
+COLON
+STRING
+LBRACE
+RBRACE
+LBRACKET
+RBRACKET
+COMMA
+ESC
+UNICODE
+HEX
+SAFECODEPOINT
+NUMBER
+INT
+EXP
+WS
+
+channel names:
+DEFAULT_TOKEN_CHANNEL
+HIDDEN
+
+mode names:
+DEFAULT_MODE
+
+atn:
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 14, 130, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 7, 6, 61, 10, 6, 12, 6, 14, 6, 64, 11, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 5, 12, 81, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 16, 5, 16, 94, 10, 16, 3, 16, 3, 16, 3, 16, 6, 16, 99, 10, 16, 13, 16, 14, 16, 100, 5, 16, 103, 10, 16, 3, 16, 5, 16, 106, 10, 16, 3, 17, 3, 17, 3, 17, 7, 17, 111, 10, 17, 12, 17, 14, 17, 114, 11, 17, 5, 17, 116, 10, 17, 3, 18, 3, 18, 5, 18, 120, 10, 18, 3, 18, 3, 18, 3, 19, 6, 19, 125, 10, 19, 13, 19, 14, 19, 126, 3, 19, 3, 19, 2, 2, 20, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 2, 25, 2, 27, 2, 29, 2, 31, 13, 33, 2, 35, 2, 37, 14, 3, 2, 10, 10, 2, 36, 36, 49, 49, 94, 94, 100, 100, 104, 104, 112, 112, 116, 116, 118, 118, 5, 2, 50, 59, 67, 72, 99, 104, 5, 2, 2, 33, 36, 36, 94, 94, 3, 2, 50, 59, 3, 2, 51, 59, 4, 2, 71, 71, 103, 103, 4, 2, 45, 45, 47, 47, 5, 2, 11, 12, 15, 15, 34, 34, 2, 134, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 3, 39, 3, 2, 2, 2, 5, 44, 3, 2, 2, 2, 7, 50, 3, 2, 2, 2, 9, 55, 3, 2, 2, 2, 11, 57, 3, 2, 2, 2, 13, 67, 3, 2, 2, 2, 15, 69, 3, 2, 2, 2, 17, 71, 3, 2, 2, 2, 19, 73, 3, 2, 2, 2, 21, 75, 3, 2, 2, 2, 23, 77, 3, 2, 2, 2, 25, 82, 3, 2, 2, 2, 27, 88, 3, 2, 2, 2, 29, 90, 3, 2, 2, 2, 31, 93, 3, 2, 2, 2, 33, 115, 3, 2, 2, 2, 35, 117, 3, 2, 2, 2, 37, 124, 3, 2, 2, 2, 39, 40, 7, 118, 2, 2, 40, 41, 7, 116, 2, 2, 41, 42, 7, 119, 2, 2, 42, 43, 7, 103, 2, 2, 43, 4, 3, 2, 2, 2, 44, 45, 7, 104, 2, 2, 45, 46, 7, 99, 2, 2, 46, 47, 7, 110, 2, 2, 47, 48, 7, 117, 2, 2, 48, 49, 7, 103, 2, 2, 49, 6, 3, 2, 2, 2, 50, 51, 7, 112, 2, 2, 51, 52, 7, 119, 2, 2, 52, 53, 7, 110, 2, 2, 53, 54, 7, 110, 2, 2, 54, 8, 3, 2, 2, 2, 55, 56, 7, 60, 2, 2, 56, 10, 3, 2, 2, 2, 57, 62, 7, 36, 2, 2, 58, 61, 5, 23, 12, 2, 59, 61, 5, 29, 15, 2, 60, 58, 3, 2, 2, 2, 60, 59, 3, 2, 2, 2, 61, 64, 3, 2, 2, 2, 62, 60, 3, 2, 2, 2, 62, 63, 3, 2, 2, 2, 63, 65, 3, 2, 2, 2, 64, 62, 3, 2, 2, 2, 65, 66, 7, 36, 2, 2, 66, 12, 3, 2, 2, 2, 67, 68, 7, 125, 2, 2, 68, 14, 3, 2, 2, 2, 69, 70, 7, 127, 2, 2, 70, 16, 3, 2, 2, 2, 71, 72, 7, 93, 2, 2, 72, 18, 3, 2, 2, 2, 73, 74, 7, 95, 2, 2, 74, 20, 3, 2, 2, 2, 75, 76, 7, 46, 2, 2, 76, 22, 3, 2, 2, 2, 77, 80, 7, 94, 2, 2, 78, 81, 9, 2, 2, 2, 79, 81, 5, 25, 13, 2, 80, 78, 3, 2, 2, 2, 80, 79, 3, 2, 2, 2, 81, 24, 3, 2, 2, 2, 82, 83, 7, 119, 2, 2, 83, 84, 5, 27, 14, 2, 84, 85, 5, 27, 14, 2, 85, 86, 5, 27, 14, 2, 86, 87, 5, 27, 14, 2, 87, 26, 3, 2, 2, 2, 88, 89, 9, 3, 2, 2, 89, 28, 3, 2, 2, 2, 90, 91, 10, 4, 2, 2, 91, 30, 3, 2, 2, 2, 92, 94, 7, 47, 2, 2, 93, 92, 3, 2, 2, 2, 93, 94, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 102, 5, 33, 17, 2, 96, 98, 7, 48, 2, 2, 97, 99, 9, 5, 2, 2, 98, 97, 3, 2, 2, 2, 99, 100, 3, 2, 2, 2, 100, 98, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 103, 3, 2, 2, 2, 102, 96, 3, 2, 2, 2, 102, 103, 3, 2, 2, 2, 103, 105, 3, 2, 2, 2, 104, 106, 5, 35, 18, 2, 105, 104, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 32, 3, 2, 2, 2, 107, 116, 7, 50, 2, 2, 108, 112, 9, 6, 2, 2, 109, 111, 9, 5, 2, 2, 110, 109, 3, 2, 2, 2, 111, 114, 3, 2, 2, 2, 112, 110, 3, 2, 2, 2, 112, 113, 3, 2, 2, 2, 113, 116, 3, 2, 2, 2, 114, 112, 3, 2, 2, 2, 115, 107, 3, 2, 2, 2, 115, 108, 3, 2, 2, 2, 116, 34, 3, 2, 2, 2, 117, 119, 9, 7, 2, 2, 118, 120, 9, 8, 2, 2, 119, 118, 3, 2, 2, 2, 119, 120, 3, 2, 2, 2, 120, 121, 3, 2, 2, 2, 121, 122, 5, 33, 17, 2, 122, 36, 3, 2, 2, 2, 123, 125, 9, 9, 2, 2, 124, 123, 3, 2, 2, 2, 125, 126, 3, 2, 2, 2, 126, 124, 3, 2, 2, 2, 126, 127, 3, 2, 2, 2, 127, 128, 3, 2, 2, 2, 128, 129, 8, 19, 2, 2, 129, 38, 3, 2, 2, 2, 14, 2, 60, 62, 80, 93, 100, 102, 105, 112, 115, 119, 126, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/language/json/JSONLexer.java b/app/src/main/java/com/tyron/code/language/json/JSONLexer.java
new file mode 100644
index 000000000..1bfa98663
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/json/JSONLexer.java
@@ -0,0 +1,150 @@
+// Generated from /home/tyron/AndroidStudioProjects/CodeAssist/app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4 by ANTLR 4.9.2
+package com.tyron.code.language.json;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.atn.*;
+import org.antlr.v4.runtime.dfa.DFA;
+
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+public class JSONLexer extends Lexer {
+ static { RuntimeMetaData.checkVersion("4.9.2", RuntimeMetaData.VERSION); }
+
+ protected static final DFA[] _decisionToDFA;
+ protected static final PredictionContextCache _sharedContextCache =
+ new PredictionContextCache();
+ public static final int
+ TRUE=1, FALSE=2, NULL=3, COLON=4, STRING=5, LBRACE=6, RBRACE=7, LBRACKET=8,
+ RBRACKET=9, COMMA=10, NUMBER=11, WS=12;
+ public static String[] channelNames = {
+ "DEFAULT_TOKEN_CHANNEL", "HIDDEN"
+ };
+
+ public static String[] modeNames = {
+ "DEFAULT_MODE"
+ };
+
+ private static String[] makeRuleNames() {
+ return new String[] {
+ "TRUE", "FALSE", "NULL", "COLON", "STRING", "LBRACE", "RBRACE", "LBRACKET",
+ "RBRACKET", "COMMA", "ESC", "UNICODE", "HEX", "SAFECODEPOINT", "NUMBER",
+ "INT", "EXP", "WS"
+ };
+ }
+ public static final String[] ruleNames = makeRuleNames();
+
+ private static String[] makeLiteralNames() {
+ return new String[] {
+ null, "'true'", "'false'", "'null'", "':'", null, "'{'", "'}'", "'['",
+ "']'", "','"
+ };
+ }
+ private static final String[] _LITERAL_NAMES = makeLiteralNames();
+ private static String[] makeSymbolicNames() {
+ return new String[] {
+ null, "TRUE", "FALSE", "NULL", "COLON", "STRING", "LBRACE", "RBRACE",
+ "LBRACKET", "RBRACKET", "COMMA", "NUMBER", "WS"
+ };
+ }
+ private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+ public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+
+ /**
+ * @deprecated Use {@link #VOCABULARY} instead.
+ */
+ @Deprecated
+ public static final String[] tokenNames;
+ static {
+ tokenNames = new String[_SYMBOLIC_NAMES.length];
+ for (int i = 0; i < tokenNames.length; i++) {
+ tokenNames[i] = VOCABULARY.getLiteralName(i);
+ if (tokenNames[i] == null) {
+ tokenNames[i] = VOCABULARY.getSymbolicName(i);
+ }
+
+ if (tokenNames[i] == null) {
+ tokenNames[i] = "";
+ }
+ }
+ }
+
+ @Override
+ @Deprecated
+ public String[] getTokenNames() {
+ return tokenNames;
+ }
+
+ @Override
+
+ public Vocabulary getVocabulary() {
+ return VOCABULARY;
+ }
+
+
+ public JSONLexer(CharStream input) {
+ super(input);
+ _interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+ }
+
+ @Override
+ public String getGrammarFileName() { return "JSON.g4"; }
+
+ @Override
+ public String[] getRuleNames() { return ruleNames; }
+
+ @Override
+ public String getSerializedATN() { return _serializedATN; }
+
+ @Override
+ public String[] getChannelNames() { return channelNames; }
+
+ @Override
+ public String[] getModeNames() { return modeNames; }
+
+ @Override
+ public ATN getATN() { return _ATN; }
+
+ public static final String _serializedATN =
+ "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\16\u0082\b\1\4\2"+
+ "\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4"+
+ "\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22"+
+ "\t\22\4\23\t\23\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\4\3\4\3"+
+ "\4\3\4\3\4\3\5\3\5\3\6\3\6\3\6\7\6=\n\6\f\6\16\6@\13\6\3\6\3\6\3\7\3\7"+
+ "\3\b\3\b\3\t\3\t\3\n\3\n\3\13\3\13\3\f\3\f\3\f\5\fQ\n\f\3\r\3\r\3\r\3"+
+ "\r\3\r\3\r\3\16\3\16\3\17\3\17\3\20\5\20^\n\20\3\20\3\20\3\20\6\20c\n"+
+ "\20\r\20\16\20d\5\20g\n\20\3\20\5\20j\n\20\3\21\3\21\3\21\7\21o\n\21\f"+
+ "\21\16\21r\13\21\5\21t\n\21\3\22\3\22\5\22x\n\22\3\22\3\22\3\23\6\23}"+
+ "\n\23\r\23\16\23~\3\23\3\23\2\2\24\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n"+
+ "\23\13\25\f\27\2\31\2\33\2\35\2\37\r!\2#\2%\16\3\2\n\n\2$$\61\61^^ddh"+
+ "hppttvv\5\2\62;CHch\5\2\2!$$^^\3\2\62;\3\2\63;\4\2GGgg\4\2--//\5\2\13"+
+ "\f\17\17\"\"\2\u0086\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2"+
+ "\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3"+
+ "\2\2\2\2\37\3\2\2\2\2%\3\2\2\2\3\'\3\2\2\2\5,\3\2\2\2\7\62\3\2\2\2\t\67"+
+ "\3\2\2\2\139\3\2\2\2\rC\3\2\2\2\17E\3\2\2\2\21G\3\2\2\2\23I\3\2\2\2\25"+
+ "K\3\2\2\2\27M\3\2\2\2\31R\3\2\2\2\33X\3\2\2\2\35Z\3\2\2\2\37]\3\2\2\2"+
+ "!s\3\2\2\2#u\3\2\2\2%|\3\2\2\2\'(\7v\2\2()\7t\2\2)*\7w\2\2*+\7g\2\2+\4"+
+ "\3\2\2\2,-\7h\2\2-.\7c\2\2./\7n\2\2/\60\7u\2\2\60\61\7g\2\2\61\6\3\2\2"+
+ "\2\62\63\7p\2\2\63\64\7w\2\2\64\65\7n\2\2\65\66\7n\2\2\66\b\3\2\2\2\67"+
+ "8\7<\2\28\n\3\2\2\29>\7$\2\2:=\5\27\f\2;=\5\35\17\2<:\3\2\2\2<;\3\2\2"+
+ "\2=@\3\2\2\2><\3\2\2\2>?\3\2\2\2?A\3\2\2\2@>\3\2\2\2AB\7$\2\2B\f\3\2\2"+
+ "\2CD\7}\2\2D\16\3\2\2\2EF\7\177\2\2F\20\3\2\2\2GH\7]\2\2H\22\3\2\2\2I"+
+ "J\7_\2\2J\24\3\2\2\2KL\7.\2\2L\26\3\2\2\2MP\7^\2\2NQ\t\2\2\2OQ\5\31\r"+
+ "\2PN\3\2\2\2PO\3\2\2\2Q\30\3\2\2\2RS\7w\2\2ST\5\33\16\2TU\5\33\16\2UV"+
+ "\5\33\16\2VW\5\33\16\2W\32\3\2\2\2XY\t\3\2\2Y\34\3\2\2\2Z[\n\4\2\2[\36"+
+ "\3\2\2\2\\^\7/\2\2]\\\3\2\2\2]^\3\2\2\2^_\3\2\2\2_f\5!\21\2`b\7\60\2\2"+
+ "ac\t\5\2\2ba\3\2\2\2cd\3\2\2\2db\3\2\2\2de\3\2\2\2eg\3\2\2\2f`\3\2\2\2"+
+ "fg\3\2\2\2gi\3\2\2\2hj\5#\22\2ih\3\2\2\2ij\3\2\2\2j \3\2\2\2kt\7\62\2"+
+ "\2lp\t\6\2\2mo\t\5\2\2nm\3\2\2\2or\3\2\2\2pn\3\2\2\2pq\3\2\2\2qt\3\2\2"+
+ "\2rp\3\2\2\2sk\3\2\2\2sl\3\2\2\2t\"\3\2\2\2uw\t\7\2\2vx\t\b\2\2wv\3\2"+
+ "\2\2wx\3\2\2\2xy\3\2\2\2yz\5!\21\2z$\3\2\2\2{}\t\t\2\2|{\3\2\2\2}~\3\2"+
+ "\2\2~|\3\2\2\2~\177\3\2\2\2\177\u0080\3\2\2\2\u0080\u0081\b\23\2\2\u0081"+
+ "&\3\2\2\2\16\2<>P]dfipsw~\3\b\2\2";
+ public static final ATN _ATN =
+ new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+ static {
+ _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
+ for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
+ _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/language/json/JSONLexer.tokens b/app/src/main/java/com/tyron/code/language/json/JSONLexer.tokens
new file mode 100644
index 000000000..44a91db05
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/json/JSONLexer.tokens
@@ -0,0 +1,21 @@
+TRUE=1
+FALSE=2
+NULL=3
+COLON=4
+STRING=5
+LBRACE=6
+RBRACE=7
+LBRACKET=8
+RBRACKET=9
+COMMA=10
+NUMBER=11
+WS=12
+'true'=1
+'false'=2
+'null'=3
+':'=4
+'{'=6
+'}'=7
+'['=8
+']'=9
+','=10
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONListener.java b/app/src/main/java/com/tyron/code/language/json/JSONListener.java
similarity index 97%
rename from app/src/main/java/com/tyron/code/ui/editor/language/json/JSONListener.java
rename to app/src/main/java/com/tyron/code/language/json/JSONListener.java
index 97e99d964..6336e40b7 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONListener.java
+++ b/app/src/main/java/com/tyron/code/language/json/JSONListener.java
@@ -1,5 +1,5 @@
// Generated from /home/tyron/AndroidStudioProjects/CodeAssist/app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4 by ANTLR 4.9.2
-package com.tyron.code.ui.editor.language.json;
+package com.tyron.code.language.json;
import org.antlr.v4.runtime.tree.ParseTreeListener;
/**
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONParser.java b/app/src/main/java/com/tyron/code/language/json/JSONParser.java
similarity index 92%
rename from app/src/main/java/com/tyron/code/ui/editor/language/json/JSONParser.java
rename to app/src/main/java/com/tyron/code/language/json/JSONParser.java
index c76017e58..425748e39 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONParser.java
+++ b/app/src/main/java/com/tyron/code/language/json/JSONParser.java
@@ -1,13 +1,10 @@
// Generated from /home/tyron/AndroidStudioProjects/CodeAssist/app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4 by ANTLR 4.9.2
-package com.tyron.code.ui.editor.language.json;
+package com.tyron.code.language.json;
import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.misc.*;
import org.antlr.v4.runtime.tree.*;
import java.util.List;
-import java.util.Iterator;
-import java.util.ArrayList;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class JSONParser extends Parser {
@@ -17,7 +14,7 @@ public class JSONParser extends Parser {
protected static final PredictionContextCache _sharedContextCache =
new PredictionContextCache();
public static final int
- T__0=1, T__1=2, TRUE=3, FALSE=4, NULL=5, COLON=6, STRING=7, LBRACKET=8,
+ TRUE=1, FALSE=2, NULL=3, COLON=4, STRING=5, LBRACE=6, RBRACE=7, LBRACKET=8,
RBRACKET=9, COMMA=10, NUMBER=11, WS=12;
public static final int
RULE_json = 0, RULE_obj = 1, RULE_pair = 2, RULE_arr = 3, RULE_value = 4;
@@ -30,15 +27,15 @@ private static String[] makeRuleNames() {
private static String[] makeLiteralNames() {
return new String[] {
- null, "'['", "']'", "'true'", "'false'", "'null'", "':'", null, "'{'",
- "'}'", "','"
+ null, "'true'", "'false'", "'null'", "':'", null, "'{'", "'}'", "'['",
+ "']'", "','"
};
}
private static final String[] _LITERAL_NAMES = makeLiteralNames();
private static String[] makeSymbolicNames() {
return new String[] {
- null, null, null, "TRUE", "FALSE", "NULL", "COLON", "STRING", "LBRACKET",
- "RBRACKET", "COMMA", "NUMBER", "WS"
+ null, "TRUE", "FALSE", "NULL", "COLON", "STRING", "LBRACE", "RBRACE",
+ "LBRACKET", "RBRACKET", "COMMA", "NUMBER", "WS"
};
}
private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -137,14 +134,14 @@ public final JsonContext json() throws RecognitionException {
}
public static class ObjContext extends ParserRuleContext {
- public TerminalNode LBRACKET() { return getToken(JSONParser.LBRACKET, 0); }
+ public TerminalNode LBRACE() { return getToken(JSONParser.LBRACE, 0); }
public List pair() {
return getRuleContexts(PairContext.class);
}
public PairContext pair(int i) {
return getRuleContext(PairContext.class,i);
}
- public TerminalNode RBRACKET() { return getToken(JSONParser.RBRACKET, 0); }
+ public TerminalNode RBRACE() { return getToken(JSONParser.RBRACE, 0); }
public List COMMA() { return getTokens(JSONParser.COMMA); }
public TerminalNode COMMA(int i) {
return getToken(JSONParser.COMMA, i);
@@ -180,7 +177,7 @@ public final ObjContext obj() throws RecognitionException {
enterOuterAlt(_localctx, 1);
{
setState(12);
- match(LBRACKET);
+ match(LBRACE);
setState(13);
pair();
setState(18);
@@ -200,16 +197,16 @@ public final ObjContext obj() throws RecognitionException {
_la = _input.LA(1);
}
setState(21);
- match(RBRACKET);
+ match(RBRACE);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
setState(23);
- match(LBRACKET);
+ match(LBRACE);
setState(24);
- match(RBRACKET);
+ match(RBRACE);
}
break;
}
@@ -276,12 +273,14 @@ public final PairContext pair() throws RecognitionException {
}
public static class ArrContext extends ParserRuleContext {
+ public TerminalNode LBRACKET() { return getToken(JSONParser.LBRACKET, 0); }
public List value() {
return getRuleContexts(ValueContext.class);
}
public ValueContext value(int i) {
return getRuleContext(ValueContext.class,i);
}
+ public TerminalNode RBRACKET() { return getToken(JSONParser.RBRACKET, 0); }
public List COMMA() { return getTokens(JSONParser.COMMA); }
public TerminalNode COMMA(int i) {
return getToken(JSONParser.COMMA, i);
@@ -317,7 +316,7 @@ public final ArrContext arr() throws RecognitionException {
enterOuterAlt(_localctx, 1);
{
setState(31);
- match(T__0);
+ match(LBRACKET);
setState(32);
value();
setState(37);
@@ -337,16 +336,16 @@ public final ArrContext arr() throws RecognitionException {
_la = _input.LA(1);
}
setState(40);
- match(T__1);
+ match(RBRACKET);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
setState(42);
- match(T__0);
+ match(LBRACKET);
setState(43);
- match(T__1);
+ match(RBRACKET);
}
break;
}
@@ -414,14 +413,14 @@ public final ValueContext value() throws RecognitionException {
match(NUMBER);
}
break;
- case LBRACKET:
+ case LBRACE:
enterOuterAlt(_localctx, 3);
{
setState(48);
obj();
}
break;
- case T__0:
+ case LBRACKET:
enterOuterAlt(_localctx, 4);
{
setState(49);
@@ -470,15 +469,15 @@ public final ValueContext value() throws RecognitionException {
"\26\13\3\3\3\3\3\3\3\3\3\5\3\34\n\3\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\7"+
"\5&\n\5\f\5\16\5)\13\5\3\5\3\5\3\5\3\5\5\5/\n\5\3\6\3\6\3\6\3\6\3\6\3"+
"\6\3\6\5\68\n\6\3\6\2\2\7\2\4\6\b\n\2\2\2>\2\f\3\2\2\2\4\33\3\2\2\2\6"+
- "\35\3\2\2\2\b.\3\2\2\2\n\67\3\2\2\2\f\r\5\n\6\2\r\3\3\2\2\2\16\17\7\n"+
+ "\35\3\2\2\2\b.\3\2\2\2\n\67\3\2\2\2\f\r\5\n\6\2\r\3\3\2\2\2\16\17\7\b"+
"\2\2\17\24\5\6\4\2\20\21\7\f\2\2\21\23\5\6\4\2\22\20\3\2\2\2\23\26\3\2"+
- "\2\2\24\22\3\2\2\2\24\25\3\2\2\2\25\27\3\2\2\2\26\24\3\2\2\2\27\30\7\13"+
- "\2\2\30\34\3\2\2\2\31\32\7\n\2\2\32\34\7\13\2\2\33\16\3\2\2\2\33\31\3"+
- "\2\2\2\34\5\3\2\2\2\35\36\7\t\2\2\36\37\7\b\2\2\37 \5\n\6\2 \7\3\2\2\2"+
- "!\"\7\3\2\2\"\'\5\n\6\2#$\7\f\2\2$&\5\n\6\2%#\3\2\2\2&)\3\2\2\2\'%\3\2"+
- "\2\2\'(\3\2\2\2(*\3\2\2\2)\'\3\2\2\2*+\7\4\2\2+/\3\2\2\2,-\7\3\2\2-/\7"+
- "\4\2\2.!\3\2\2\2.,\3\2\2\2/\t\3\2\2\2\608\7\t\2\2\618\7\r\2\2\628\5\4"+
- "\3\2\638\5\b\5\2\648\7\5\2\2\658\7\6\2\2\668\7\7\2\2\67\60\3\2\2\2\67"+
+ "\2\2\24\22\3\2\2\2\24\25\3\2\2\2\25\27\3\2\2\2\26\24\3\2\2\2\27\30\7\t"+
+ "\2\2\30\34\3\2\2\2\31\32\7\b\2\2\32\34\7\t\2\2\33\16\3\2\2\2\33\31\3\2"+
+ "\2\2\34\5\3\2\2\2\35\36\7\7\2\2\36\37\7\6\2\2\37 \5\n\6\2 \7\3\2\2\2!"+
+ "\"\7\n\2\2\"\'\5\n\6\2#$\7\f\2\2$&\5\n\6\2%#\3\2\2\2&)\3\2\2\2\'%\3\2"+
+ "\2\2\'(\3\2\2\2(*\3\2\2\2)\'\3\2\2\2*+\7\13\2\2+/\3\2\2\2,-\7\n\2\2-/"+
+ "\7\13\2\2.!\3\2\2\2.,\3\2\2\2/\t\3\2\2\2\608\7\7\2\2\618\7\r\2\2\628\5"+
+ "\4\3\2\638\5\b\5\2\648\7\3\2\2\658\7\4\2\2\668\7\5\2\2\67\60\3\2\2\2\67"+
"\61\3\2\2\2\67\62\3\2\2\2\67\63\3\2\2\2\67\64\3\2\2\2\67\65\3\2\2\2\67"+
"\66\3\2\2\28\13\3\2\2\2\7\24\33\'.\67";
public static final ATN _ATN =
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONVisitor.java b/app/src/main/java/com/tyron/code/language/json/JSONVisitor.java
similarity index 96%
rename from app/src/main/java/com/tyron/code/ui/editor/language/json/JSONVisitor.java
rename to app/src/main/java/com/tyron/code/language/json/JSONVisitor.java
index e273f38d0..6cf9add5b 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/json/JSONVisitor.java
+++ b/app/src/main/java/com/tyron/code/language/json/JSONVisitor.java
@@ -1,5 +1,5 @@
// Generated from /home/tyron/AndroidStudioProjects/CodeAssist/app/src/main/java/com/tyron/code/ui/editor/language/json/JSON.g4 by ANTLR 4.9.2
-package com.tyron.code.ui.editor.language.json;
+package com.tyron.code.language.json;
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
/**
diff --git a/app/src/main/java/com/tyron/code/language/json/Json.java b/app/src/main/java/com/tyron/code/language/json/Json.java
new file mode 100644
index 000000000..ada6c514a
--- /dev/null
+++ b/app/src/main/java/com/tyron/code/language/json/Json.java
@@ -0,0 +1,22 @@
+package com.tyron.code.language.json;
+
+import com.tyron.code.language.Language;
+import com.tyron.code.language.LanguageManager;
+import com.tyron.editor.Editor;
+
+import java.io.File;
+
+public class Json implements Language {
+ @Override
+ public boolean isApplicable(File ext) {
+ return ext.getName().endsWith(".json");
+ }
+
+ @Override
+ public io.github.rosemoe.sora.lang.Language get(Editor editor) {
+ return LanguageManager.createTextMateLanguage("json.tmLanguage.json",
+ "textmate/json" + "/syntaxes/json" + ".tmLanguage.json",
+ "textmate/json/language-configuration.json", editor);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tyron/code/ui/editor/language/json/JsonAnalyzer.java b/app/src/main/java/com/tyron/code/language/json/JsonAnalyzer.java
similarity index 89%
rename from app/src/main/java/com/tyron/code/ui/editor/language/json/JsonAnalyzer.java
rename to app/src/main/java/com/tyron/code/language/json/JsonAnalyzer.java
index fab008a25..a0aa49fa0 100644
--- a/app/src/main/java/com/tyron/code/ui/editor/language/json/JsonAnalyzer.java
+++ b/app/src/main/java/com/tyron/code/language/json/JsonAnalyzer.java
@@ -1,6 +1,6 @@
-package com.tyron.code.ui.editor.language.json;
+package com.tyron.code.language.json;
-import com.tyron.code.ui.editor.language.AbstractCodeAnalyzer;
+import com.tyron.code.language.AbstractCodeAnalyzer;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Lexer;
@@ -11,9 +11,7 @@
import io.github.rosemoe.sora.lang.styling.CodeBlock;
import io.github.rosemoe.sora.lang.styling.MappedSpans;
import io.github.rosemoe.sora.lang.styling.Styles;
-import io.github.rosemoe.sora2.data.BlockLine;
-import io.github.rosemoe.sora2.text.TextAnalyzeResult;
-import io.github.rosemoe.sora2.widget.EditorColorScheme;
+import io.github.rosemoe.sora.widget.schemes.EditorColorScheme;
public class JsonAnalyzer extends AbstractCodeAnalyzer