diff --git a/.tools/google-java-format-1.15.0-all-deps.jar b/.tools/google-java-format-1.15.0-all-deps.jar new file mode 100644 index 000000000..5c28f149f Binary files /dev/null and b/.tools/google-java-format-1.15.0-all-deps.jar differ diff --git a/app/src/main/java/com/itsaky/androidide/AboutActivity.java b/app/src/main/java/com/itsaky/androidide/AboutActivity.java index 58412f46e..35cd4114b 100755 --- a/app/src/main/java/com/itsaky/androidide/AboutActivity.java +++ b/app/src/main/java/com/itsaky/androidide/AboutActivity.java @@ -21,12 +21,15 @@ import android.os.Bundle; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.View; + import androidx.appcompat.widget.TooltipCompat; import androidx.core.util.Pair; + import com.itsaky.androidide.app.StudioActivity; import com.itsaky.androidide.databinding.ActivityAboutBinding; import com.itsaky.androidide.databinding.LayoutAboutItemsBinding; import com.itsaky.androidide.models.License; + import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/CrashHandlerActivity.java b/app/src/main/java/com/itsaky/androidide/CrashHandlerActivity.java index b9359f7d3..4e88ad6dc 100644 --- a/app/src/main/java/com/itsaky/androidide/CrashHandlerActivity.java +++ b/app/src/main/java/com/itsaky/androidide/CrashHandlerActivity.java @@ -19,6 +19,7 @@ package com.itsaky.androidide; import android.os.Bundle; import android.view.View; + import com.itsaky.androidide.app.StudioActivity; import com.itsaky.androidide.databinding.ActivityCrashHandlerBinding; import com.itsaky.androidide.fragments.CrashReportFragment; diff --git a/app/src/main/java/com/itsaky/androidide/DesignerActivity.java b/app/src/main/java/com/itsaky/androidide/DesignerActivity.java index 100a0e809..0de23d8dc 100755 --- a/app/src/main/java/com/itsaky/androidide/DesignerActivity.java +++ b/app/src/main/java/com/itsaky/androidide/DesignerActivity.java @@ -41,6 +41,7 @@ import android.widget.RelativeLayout; import android.widget.SeekBar; import android.widget.Spinner; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.core.content.ContextCompat; @@ -50,6 +51,7 @@ import androidx.transition.Fade; import androidx.transition.Slide; import androidx.transition.TransitionManager; import androidx.transition.TransitionSet; + import com.blankj.utilcode.util.DeviceUtils; import com.blankj.utilcode.util.ThreadUtils; import com.blankj.utilcode.util.ThrowableUtils; @@ -74,6 +76,9 @@ import com.itsaky.inflater.IView; import com.itsaky.inflater.IViewGroup; import com.itsaky.inflater.LayoutInflaterConfiguration; import com.itsaky.inflater.impl.BaseView; + +import org.jetbrains.annotations.Contract; + import java.io.File; import java.util.ArrayList; import java.util.List; @@ -81,7 +86,6 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import org.jetbrains.annotations.Contract; public class DesignerActivity extends StudioActivity implements WidgetItemAdapter.OnDragStartListener, diff --git a/app/src/main/java/com/itsaky/androidide/DownloadActivity.java b/app/src/main/java/com/itsaky/androidide/DownloadActivity.java index ee602714e..ad06f6f6c 100755 --- a/app/src/main/java/com/itsaky/androidide/DownloadActivity.java +++ b/app/src/main/java/com/itsaky/androidide/DownloadActivity.java @@ -17,15 +17,18 @@ */ package com.itsaky.androidide; -import abhishekti7.unicorn.filepicker.UnicornFilePicker; import android.content.Intent; import android.content.res.ColorStateList; import android.os.Bundle; import android.view.Gravity; import android.view.View; import android.view.View.OnClickListener; + import androidx.core.content.ContextCompat; import androidx.transition.TransitionManager; + +import abhishekti7.unicorn.filepicker.UnicornFilePicker; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.SizeUtils; import com.blankj.utilcode.util.ThreadUtils; @@ -45,6 +48,7 @@ import com.itsaky.androidide.utils.Environment; import com.itsaky.androidide.utils.FileUtil; import com.itsaky.androidide.utils.InputStreamLineReader; import com.itsaky.toaster.Toaster; + import java.io.File; import java.io.FileFilter; import java.io.IOException; diff --git a/app/src/main/java/com/itsaky/androidide/EditorActivity.java b/app/src/main/java/com/itsaky/androidide/EditorActivity.java index cc0c53a45..478c31ccb 100755 --- a/app/src/main/java/com/itsaky/androidide/EditorActivity.java +++ b/app/src/main/java/com/itsaky/androidide/EditorActivity.java @@ -35,6 +35,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.LinearLayout; + import androidx.activity.result.ActivityResult; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; @@ -50,6 +51,7 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.transition.Slide; import androidx.transition.TransitionManager; + import com.blankj.utilcode.util.ClipboardUtils; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.IntentUtils; @@ -114,8 +116,15 @@ import com.itsaky.lsp.models.InitializeParams; import com.itsaky.lsp.models.Range; import com.itsaky.toaster.Toaster; import com.unnamed.b.atv.model.TreeNode; + import io.github.rosemoe.sora.event.ContentChangeEvent; import io.github.rosemoe.sora.event.Unsubscribe; + +import me.piruin.quickaction.ActionItem; +import me.piruin.quickaction.QuickAction; + +import org.jetbrains.annotations.Contract; + import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; @@ -129,9 +138,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.regex.Pattern; import java.util.stream.Collectors; -import me.piruin.quickaction.ActionItem; -import me.piruin.quickaction.QuickAction; -import org.jetbrains.annotations.Contract; public class EditorActivity extends StudioActivity implements FileTreeFragment.FileActionListener, diff --git a/app/src/main/java/com/itsaky/androidide/MainActivity.java b/app/src/main/java/com/itsaky/androidide/MainActivity.java index 34de3070b..fdf28a768 100755 --- a/app/src/main/java/com/itsaky/androidide/MainActivity.java +++ b/app/src/main/java/com/itsaky/androidide/MainActivity.java @@ -20,12 +20,15 @@ package com.itsaky.androidide; -import abhishekti7.unicorn.filepicker.UnicornFilePicker; import android.content.Intent; import android.os.Bundle; import android.os.Environment; import android.view.View; + import androidx.transition.TransitionManager; + +import abhishekti7.unicorn.filepicker.UnicornFilePicker; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.transition.MaterialContainerTransform; import com.itsaky.androidide.app.StudioActivity; @@ -45,6 +48,7 @@ import com.itsaky.androidide.utils.DialogUtils; import com.itsaky.androidide.utils.ProjectFinder; import com.itsaky.androidide.utils.TransformUtils; import com.itsaky.toaster.Toaster; + import java.io.File; import java.util.ArrayList; import java.util.Objects; diff --git a/app/src/main/java/com/itsaky/androidide/PreferencesActivity.java b/app/src/main/java/com/itsaky/androidide/PreferencesActivity.java index 6d829aa37..a3e99d7a1 100755 --- a/app/src/main/java/com/itsaky/androidide/PreferencesActivity.java +++ b/app/src/main/java/com/itsaky/androidide/PreferencesActivity.java @@ -22,7 +22,9 @@ package com.itsaky.androidide; import android.os.Bundle; import android.view.View; + import androidx.fragment.app.Fragment; + import com.itsaky.androidide.app.StudioActivity; import com.itsaky.androidide.databinding.ActivityPreferencesBinding; import com.itsaky.androidide.fragments.preferences.IDEPreferences; diff --git a/app/src/main/java/com/itsaky/androidide/SplashActivity.java b/app/src/main/java/com/itsaky/androidide/SplashActivity.java index 2fb02a097..bdbe13296 100755 --- a/app/src/main/java/com/itsaky/androidide/SplashActivity.java +++ b/app/src/main/java/com/itsaky/androidide/SplashActivity.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.view.View; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.itsaky.androidide.app.StudioActivity; import com.itsaky.androidide.app.StudioApp; diff --git a/app/src/main/java/com/itsaky/androidide/TerminalActivity.java b/app/src/main/java/com/itsaky/androidide/TerminalActivity.java index 132761491..5e22e49a4 100755 --- a/app/src/main/java/com/itsaky/androidide/TerminalActivity.java +++ b/app/src/main/java/com/itsaky/androidide/TerminalActivity.java @@ -29,7 +29,9 @@ import android.view.MotionEvent; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.ClipboardUtils; import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.SizeUtils; @@ -54,10 +56,12 @@ import com.itsaky.terminal.TerminalSessionClient; import com.itsaky.terminal.TextStyle; import com.itsaky.terminal.view.TerminalView; import com.itsaky.terminal.view.TerminalViewClient; + +import org.json.JSONException; + import java.io.File; import java.io.FileOutputStream; import java.util.Map; -import org.json.JSONException; public class TerminalActivity extends StudioActivity { diff --git a/app/src/main/java/com/itsaky/androidide/adapters/AttrListAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/AttrListAdapter.java index c368d5b19..de3f2c998 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/AttrListAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/AttrListAdapter.java @@ -18,8 +18,10 @@ package com.itsaky.androidide.adapters; import androidx.annotation.NonNull; + import com.itsaky.androidide.R; import com.itsaky.attrinfo.models.Attr; + import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/AttrValueCompletionAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/AttrValueCompletionAdapter.java index 4fedfed9c..371ae4082 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/AttrValueCompletionAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/AttrValueCompletionAdapter.java @@ -25,7 +25,9 @@ import android.widget.BaseAdapter; import android.widget.Filter; import android.widget.Filterable; import android.widget.TextView; + import androidx.annotation.NonNull; + import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java index 49448b999..32c914c0e 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java @@ -18,14 +18,17 @@ package com.itsaky.androidide.adapters; import android.os.Bundle; import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; + import com.itsaky.androidide.fragments.attr.BaseValueEditorFragment; import com.itsaky.androidide.models.XMLAttribute; import com.itsaky.androidide.utils.Logger; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java index 3736cf9a6..69cf10ef4 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java @@ -25,7 +25,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import androidx.core.content.ContextCompat; + import com.blankj.utilcode.util.ThreadUtils; import com.google.gson.Gson; import com.google.gson.JsonArray; @@ -43,8 +45,10 @@ import com.itsaky.apiinfo.models.Info; import com.itsaky.apiinfo.models.MethodInfo; import com.itsaky.lsp.models.CompletionItem; import com.itsaky.lsp.models.CompletionItemKind; + import io.github.rosemoe.sora.widget.component.EditorAutoCompletion; import io.github.rosemoe.sora.widget.component.EditorCompletionAdapter; + import java.util.List; public class CompletionListAdapter extends EditorCompletionAdapter { diff --git a/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticItemAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticItemAdapter.java index 0e2d3a8c9..d38bc038f 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticItemAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticItemAdapter.java @@ -20,14 +20,17 @@ package com.itsaky.androidide.adapters; import android.graphics.PorterDuff; import android.view.LayoutInflater; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.R; import com.itsaky.androidide.databinding.LayoutDiagnosticItemBinding; import com.itsaky.androidide.interfaces.DiagnosticClickListener; import com.itsaky.lsp.models.DiagnosticItem; import com.itsaky.lsp.models.DiagnosticSeverity; + import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticsAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticsAdapter.java index 1b4751d78..81a605593 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticsAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticsAdapter.java @@ -21,13 +21,16 @@ package com.itsaky.androidide.adapters; import android.graphics.PorterDuff; import android.view.LayoutInflater; import android.view.ViewGroup; + import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.R; import com.itsaky.androidide.databinding.LayoutDiagnosticGroupBinding; import com.itsaky.androidide.interfaces.DiagnosticClickListener; import com.itsaky.androidide.models.DiagnosticGroup; + import java.util.List; public class DiagnosticsAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java index e18db1b5e..f6dfa4769 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java @@ -23,6 +23,7 @@ import androidx.collection.LongSparseArray; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; + import com.itsaky.androidide.R; import com.itsaky.androidide.fragments.DiagnosticsListFragment; import com.itsaky.androidide.fragments.IDELogFragment; @@ -30,6 +31,7 @@ import com.itsaky.androidide.fragments.LogViewFragment; import com.itsaky.androidide.fragments.SearchResultFragment; import com.itsaky.androidide.fragments.SimpleOutputFragment; import com.itsaky.androidide.utils.Logger; + import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/IconTextAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/IconTextAdapter.java index 172b29bb7..0b1b92bde 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/IconTextAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/IconTextAdapter.java @@ -20,8 +20,10 @@ package com.itsaky.androidide.adapters; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.databinding.LayoutSimpleIconTextBinding; /** diff --git a/app/src/main/java/com/itsaky/androidide/adapters/OptionsSheetAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/OptionsSheetAdapter.java index dbf2301d9..a3425a86d 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/OptionsSheetAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/OptionsSheetAdapter.java @@ -22,9 +22,12 @@ package com.itsaky.androidide.adapters; import android.view.LayoutInflater; import android.view.ViewGroup; + import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.databinding.LayoutOptionssheetItemBinding; import com.itsaky.androidide.models.SheetOption; + import java.util.List; public class OptionsSheetAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/itsaky/androidide/adapters/ProjectsListAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/ProjectsListAdapter.java index c0c4e9471..3db235826 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/ProjectsListAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/ProjectsListAdapter.java @@ -24,9 +24,11 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.recyclerview.widget.RecyclerView; import androidx.transition.ChangeBounds; import androidx.transition.TransitionManager; + import com.blankj.utilcode.util.FileUtils; import com.bumptech.glide.Glide; import com.itsaky.androidide.R; @@ -35,6 +37,7 @@ import com.itsaky.androidide.databinding.LayoutProjectsItemBinding; import com.itsaky.androidide.project.AndroidProject; import com.itsaky.androidide.tasks.TaskExecutor; import com.itsaky.toaster.Toaster; + import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/SearchListAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/SearchListAdapter.java index 88ee7b9a5..fd3868eed 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/SearchListAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/SearchListAdapter.java @@ -24,14 +24,17 @@ import android.graphics.PorterDuff; import android.text.SpannableStringBuilder; import android.view.LayoutInflater; import android.view.ViewGroup; + import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.blankj.utilcode.util.ThreadUtils; import com.itsaky.androidide.databinding.LayoutSearchResultGroupBinding; import com.itsaky.androidide.databinding.LayoutSearchResultItemBinding; import com.itsaky.androidide.models.SearchResult; import com.itsaky.androidide.syntax.highlighters.JavaHighlighter; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/SimpleIconTextAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/SimpleIconTextAdapter.java index 6d7aa84a0..be64d6d00 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/SimpleIconTextAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/SimpleIconTextAdapter.java @@ -18,7 +18,9 @@ package com.itsaky.androidide.adapters; import androidx.annotation.NonNull; + import com.itsaky.androidide.models.IconTextListItem; + import java.util.List; /** diff --git a/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java index e4f49a237..b9a254ec6 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java @@ -20,11 +20,14 @@ package com.itsaky.androidide.adapters; import android.annotation.SuppressLint; import android.view.LayoutInflater; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.databinding.LayoutSymbolItemBinding; import com.itsaky.androidide.views.SymbolInputView.Symbol; import com.itsaky.androidide.views.editor.IDEEditor; + import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/TextActionItemAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/TextActionItemAdapter.java index a8fc518e4..3e83d7893 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/TextActionItemAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/TextActionItemAdapter.java @@ -19,10 +19,13 @@ package com.itsaky.androidide.adapters; import android.view.LayoutInflater; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.databinding.LayoutTextActionItemBinding; import com.itsaky.androidide.views.editor.IDEEditor; + import java.util.List; import java.util.Objects; import java.util.function.Consumer; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/WidgetGroupItemAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/WidgetGroupItemAdapter.java index 38e0728a2..5c1d85431 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/WidgetGroupItemAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/WidgetGroupItemAdapter.java @@ -18,12 +18,15 @@ package com.itsaky.androidide.adapters; import android.graphics.Color; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; + import com.itsaky.androidide.R; import com.itsaky.androidide.models.IconTextListItem; import com.itsaky.androidide.models.UIWidgetGroup; + import java.util.List; public class WidgetGroupItemAdapter extends SimpleIconTextAdapter diff --git a/app/src/main/java/com/itsaky/androidide/adapters/WidgetItemAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/WidgetItemAdapter.java index 380087ac5..62502ed49 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/WidgetItemAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/WidgetItemAdapter.java @@ -19,12 +19,15 @@ package com.itsaky.androidide.adapters; import android.content.ClipData; import android.view.View; + import androidx.annotation.NonNull; + import com.itsaky.androidide.DesignerActivity; import com.itsaky.androidide.models.IconTextListItem; import com.itsaky.androidide.models.UIWidget; import com.itsaky.androidide.ui.WidgetDragData; import com.itsaky.androidide.ui.WidgetDragShadowBuilder; + import java.util.List; public class WidgetItemAdapter extends SimpleIconTextAdapter diff --git a/app/src/main/java/com/itsaky/androidide/adapters/XMLAttributeListAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/XMLAttributeListAdapter.java index ae3ee4c60..060504b47 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/XMLAttributeListAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/XMLAttributeListAdapter.java @@ -24,12 +24,15 @@ import android.text.style.ForegroundColorSpan; import android.text.style.StyleSpan; import android.view.LayoutInflater; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.R; import com.itsaky.androidide.databinding.LayoutAttrEditorSheetItemBinding; import com.itsaky.androidide.models.XMLAttribute; + import java.util.List; public class XMLAttributeListAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/itsaky/androidide/adapters/viewholders/FileTreeViewHolder.java b/app/src/main/java/com/itsaky/androidide/adapters/viewholders/FileTreeViewHolder.java index 02e58261b..8462d8183 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/viewholders/FileTreeViewHolder.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/viewholders/FileTreeViewHolder.java @@ -26,12 +26,15 @@ import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; + import androidx.core.content.ContextCompat; + import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioActivity; import com.itsaky.androidide.databinding.LayoutFiletreeItemBinding; import com.itsaky.androidide.utils.Environment; import com.unnamed.b.atv.model.TreeNode; + import java.io.File; public class FileTreeViewHolder extends TreeNode.BaseNodeViewHolder { diff --git a/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java b/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java index 1248944d5..3575ffa8b 100755 --- a/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java +++ b/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java @@ -22,12 +22,14 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.util.TypedValue; import android.view.View; + import androidx.annotation.AttrRes; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; + import com.itsaky.androidide.R; import com.itsaky.androidide.utils.Logger; diff --git a/app/src/main/java/com/itsaky/androidide/app/StudioApp.java b/app/src/main/java/com/itsaky/androidide/app/StudioApp.java index 237d72cce..3300be099 100755 --- a/app/src/main/java/com/itsaky/androidide/app/StudioApp.java +++ b/app/src/main/java/com/itsaky/androidide/app/StudioApp.java @@ -18,7 +18,9 @@ package com.itsaky.androidide.app; import android.content.Intent; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.ThrowableUtils; import com.google.firebase.messaging.FirebaseMessaging; import com.itsaky.androidide.CrashHandlerActivity; @@ -36,6 +38,7 @@ import com.itsaky.lsp.java.JavaLanguageServer; import com.itsaky.lsp.xml.XMLLanguageServer; import com.itsaky.sdk.SDKInfo; import com.itsaky.widgets.WidgetInfo; + import java.io.File; import java.util.Set; import java.util.concurrent.CompletableFuture; diff --git a/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java b/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java index e65e9e9c4..38c56676a 100644 --- a/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java +++ b/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java @@ -27,10 +27,13 @@ import android.provider.DocumentsContract.Document; import android.provider.DocumentsContract.Root; import android.provider.DocumentsProvider; import android.webkit.MimeTypeMap; + import androidx.annotation.NonNull; + import com.itsaky.androidide.R; import com.itsaky.androidide.utils.Environment; import com.itsaky.androidide.utils.Logger; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/BaseFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/BaseFragment.java index e070a1ce2..7319e9287 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/BaseFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/BaseFragment.java @@ -21,6 +21,7 @@ package com.itsaky.androidide.fragments; import androidx.fragment.app.Fragment; + import com.itsaky.androidide.app.StudioActivity; public class BaseFragment extends Fragment { diff --git a/app/src/main/java/com/itsaky/androidide/fragments/CrashReportFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/CrashReportFragment.java index 7b1a6f9df..1d5ed9524 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/CrashReportFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/CrashReportFragment.java @@ -27,9 +27,11 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; + import com.blankj.utilcode.util.ClipboardUtils; import com.itsaky.androidide.R; import com.itsaky.androidide.app.BaseApplication; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.java index f04a1d36a..58e7cb9b4 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.java @@ -22,13 +22,16 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.adapters.DiagnosticsAdapter; import com.itsaky.androidide.views.EmptyView; + import java.util.ArrayList; public class DiagnosticsListFragment extends Fragment { diff --git a/app/src/main/java/com/itsaky/androidide/fragments/FileTreeFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/FileTreeFragment.java index 6b936a6ac..019f8d430 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/FileTreeFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/FileTreeFragment.java @@ -26,9 +26,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.HorizontalScrollView; import android.widget.ProgressBar; + import androidx.annotation.NonNull; import androidx.transition.ChangeBounds; import androidx.transition.TransitionManager; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.IntentUtils; @@ -45,6 +47,7 @@ import com.itsaky.androidide.views.editor.CodeEditorView; import com.itsaky.toaster.Toaster; import com.unnamed.b.atv.model.TreeNode; import com.unnamed.b.atv.view.AndroidTreeView; + import java.io.File; import java.util.Arrays; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/LogViewFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/LogViewFragment.java index 50740bcac..2c05531e9 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/LogViewFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/LogViewFragment.java @@ -19,12 +19,16 @@ package com.itsaky.androidide.fragments; import android.os.Bundle; import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.blankj.utilcode.util.ThreadUtils; import com.itsaky.androidide.language.logs.LogLanguageImpl; import com.itsaky.androidide.models.LogLine; + import io.github.rosemoe.sora.lang.Language; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java index 4491e4442..eeb50f0d4 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java @@ -21,14 +21,17 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; + import com.itsaky.androidide.databinding.FragmentNonEditableEditorBinding; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; import com.itsaky.androidide.utils.Logger; import com.itsaky.androidide.utils.TypefaceUtils; import com.itsaky.androidide.views.editor.IDEEditor; + import io.github.rosemoe.sora.lang.EmptyLanguage; public abstract class NonEditableEditorFragment extends Fragment { diff --git a/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.java index 508e950bc..551587a49 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.java @@ -22,11 +22,13 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.adapters.SearchListAdapter; import com.itsaky.androidide.views.EmptyView; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/SimpleOutputFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/SimpleOutputFragment.java index 921bac5e1..19c848477 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/SimpleOutputFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/SimpleOutputFragment.java @@ -19,9 +19,12 @@ package com.itsaky.androidide.fragments; import android.os.Bundle; import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.blankj.utilcode.util.ThreadUtils; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/AbstractReferenceEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/AbstractReferenceEditor.java index 9be396c29..b19be999f 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/AbstractReferenceEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/AbstractReferenceEditor.java @@ -19,12 +19,15 @@ package com.itsaky.androidide.fragments.attr; import android.text.Editable; import android.text.TextUtils; import android.widget.AutoCompleteTextView; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.ThreadUtils; import com.google.android.material.textfield.MaterialAutoCompleteTextView; import com.itsaky.androidide.adapters.AttrValueCompletionAdapter; import com.itsaky.androidide.utils.Logger; import com.itsaky.androidide.utils.TextWatcherAdapter; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/BaseValueEditorFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/BaseValueEditorFragment.java index 2c349a2b3..ed38c0153 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/BaseValueEditorFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/BaseValueEditorFragment.java @@ -20,11 +20,14 @@ package com.itsaky.androidide.fragments.attr; import android.content.Context; import android.os.Bundle; import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; + import com.itsaky.androidide.models.XMLAttribute; import com.itsaky.inflater.IAttribute; + import java.util.Objects; /** diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/BooleanEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/BooleanEditor.java index 58c5185b2..fe613b12a 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/BooleanEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/BooleanEditor.java @@ -23,12 +23,15 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RadioButton; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.android.material.textfield.MaterialAutoCompleteTextView; import com.itsaky.androidide.databinding.LayoutBooleanAttrEditorBinding; import com.itsaky.inflater.values.FrameworkValues; import com.itsaky.inflater.values.ValuesTableFactory; + import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/ColorEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/ColorEditor.java index ca762cb67..9a08704c0 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/ColorEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/ColorEditor.java @@ -23,8 +23,10 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.android.material.textfield.MaterialAutoCompleteTextView; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.colorpicker.ColorPickerView; @@ -32,6 +34,7 @@ import com.itsaky.androidide.databinding.LayoutColorAttrEditorBinding; import com.itsaky.androidide.utils.DialogUtils; import com.itsaky.inflater.values.FrameworkValues; import com.itsaky.inflater.values.ValuesTableFactory; + import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/DimensionEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/DimensionEditor.java index 7a5fde079..b86c008ed 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/DimensionEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/DimensionEditor.java @@ -24,8 +24,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.android.material.textfield.MaterialAutoCompleteTextView; import com.itsaky.androidide.R; import com.itsaky.androidide.databinding.LayoutDimensionAttrEditorBinding; @@ -33,6 +35,7 @@ import com.itsaky.androidide.utils.Logger; import com.itsaky.androidide.utils.TextWatcherAdapter; import com.itsaky.inflater.values.FrameworkValues; import com.itsaky.inflater.values.ValuesTableFactory; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/EnumEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/EnumEditor.java index 63cf7bba8..cc9be31cf 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/EnumEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/EnumEditor.java @@ -19,8 +19,10 @@ package com.itsaky.androidide.fragments.attr; import android.os.Bundle; import android.text.TextUtils; import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.android.material.chip.Chip; import com.google.android.material.chip.ChipGroup; import com.itsaky.androidide.utils.Logger; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/FixedValueEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/FixedValueEditor.java index ea050be11..780ee7498 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/FixedValueEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/FixedValueEditor.java @@ -22,12 +22,15 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; + import com.google.android.material.chip.Chip; import com.google.android.material.chip.ChipGroup; import com.itsaky.androidide.R; + import java.util.Objects; /** diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/FlagEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/FlagEditor.java index 921d1231a..d41e58af9 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/FlagEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/FlagEditor.java @@ -21,11 +21,14 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.View; import android.widget.CompoundButton; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.android.material.chip.Chip; import com.google.android.material.chip.ChipGroup; import com.itsaky.androidide.utils.Logger; + import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/ReferenceEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/ReferenceEditor.java index 4a11b1b57..20ce81937 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/ReferenceEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/ReferenceEditor.java @@ -21,13 +21,16 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.android.material.textfield.MaterialAutoCompleteTextView; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.databinding.LayoutReferenceAttrEditorBinding; import com.itsaky.inflater.values.FrameworkValues; import com.itsaky.inflater.values.ValuesTableFactory; + import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/StringEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/StringEditor.java index ec1a2c9e7..6bb5a922a 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/StringEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/StringEditor.java @@ -21,13 +21,16 @@ import android.text.Editable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.android.material.textfield.MaterialAutoCompleteTextView; import com.itsaky.androidide.databinding.LayoutStringAttrEditorBinding; import com.itsaky.androidide.utils.TextWatcherAdapter; import com.itsaky.inflater.values.FrameworkValues; import com.itsaky.inflater.values.ValuesTableFactory; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/preferences/BasePreferenceFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/preferences/BasePreferenceFragment.java index f46e031f8..3a0b1da3f 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/preferences/BasePreferenceFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/preferences/BasePreferenceFragment.java @@ -21,9 +21,11 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.preference.PreferenceFragmentCompat; + import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.managers.PreferenceManager; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/preferences/BuildPreferences.java b/app/src/main/java/com/itsaky/androidide/fragments/preferences/BuildPreferences.java index 2cca027bf..c89cee221 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/preferences/BuildPreferences.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/preferences/BuildPreferences.java @@ -21,9 +21,11 @@ package com.itsaky.androidide.fragments.preferences; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; + import com.blankj.utilcode.util.FileUtils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.itsaky.androidide.R; @@ -31,6 +33,7 @@ import com.itsaky.androidide.fragments.sheets.ProgressSheet; import com.itsaky.androidide.tasks.TaskExecutor; import com.itsaky.androidide.utils.DialogUtils; import com.itsaky.androidide.utils.Environment; + import java.io.File; public class BuildPreferences extends BasePreferenceFragment diff --git a/app/src/main/java/com/itsaky/androidide/fragments/preferences/EditorPreferences.java b/app/src/main/java/com/itsaky/androidide/fragments/preferences/EditorPreferences.java index 7fa6ee9d7..df9d1dd2c 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/preferences/EditorPreferences.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/preferences/EditorPreferences.java @@ -35,10 +35,12 @@ import static com.itsaky.lsp.java.models.JavaServerSettings.KEY_JAVA_PREF_GOOGLE import android.os.Bundle; import android.view.LayoutInflater; + import androidx.annotation.NonNull; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.SwitchPreference; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.itsaky.androidide.R; import com.itsaky.androidide.databinding.LayoutTextSizeSliderBinding; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/preferences/GeneralPreferences.java b/app/src/main/java/com/itsaky/androidide/fragments/preferences/GeneralPreferences.java index 6eb631030..f5e8f5d97 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/preferences/GeneralPreferences.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/preferences/GeneralPreferences.java @@ -20,10 +20,12 @@ package com.itsaky.androidide.fragments.preferences; import static com.itsaky.androidide.managers.PreferenceManager.*; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; + import com.itsaky.androidide.R; public class GeneralPreferences extends BasePreferenceFragment diff --git a/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java b/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java index 5e89c2d35..30690adf2 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java @@ -20,9 +20,11 @@ package com.itsaky.androidide.fragments.preferences; import android.content.Intent; import android.net.Uri; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; + import com.itsaky.androidide.AboutActivity; import com.itsaky.androidide.BuildConfig; import com.itsaky.androidide.R; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrEditorSheet.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrEditorSheet.java index 7757b72a5..d06e58bb5 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrEditorSheet.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrEditorSheet.java @@ -22,9 +22,11 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.transition.TransitionManager; + import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.itsaky.androidide.R; import com.itsaky.androidide.adapters.SimpleIconTextAdapter; @@ -42,6 +44,9 @@ import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IView; import com.itsaky.inflater.impl.UiAttribute; import com.itsaky.toaster.Toaster; + +import org.jetbrains.annotations.Contract; + import java.io.File; import java.util.ArrayList; import java.util.Collections; @@ -51,7 +56,6 @@ import java.util.Objects; import java.util.TreeSet; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.jetbrains.annotations.Contract; public class AttrEditorSheet extends BottomSheetDialogFragment implements SimpleIconTextAdapter.OnBindListener, diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrValueEditorSheet.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrValueEditorSheet.java index 7c4e1360a..fecaec1e5 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrValueEditorSheet.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrValueEditorSheet.java @@ -34,8 +34,10 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.itsaky.androidide.adapters.AttrValueFormatTabAdapter; import com.itsaky.androidide.databinding.LayoutAttrValueEditorBinding; @@ -53,9 +55,11 @@ import com.itsaky.androidide.fragments.attr.StringEditor; import com.itsaky.androidide.models.XMLAttribute; import com.itsaky.attrinfo.models.Attr; import com.itsaky.inflater.IAttribute; -import java.util.Objects; + import org.jetbrains.annotations.Contract; +import java.util.Objects; + /** * Sheet for editing value of an attribute. * diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttributeListSheet.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttributeListSheet.java index ee4147e61..ecf5c440e 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttributeListSheet.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttributeListSheet.java @@ -23,15 +23,18 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.SearchView; import androidx.fragment.app.DialogFragment; + import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.itsaky.androidide.R; import com.itsaky.androidide.adapters.AttrListAdapter; import com.itsaky.androidide.databinding.LayoutAddAttrSheetBinding; import com.itsaky.attrinfo.models.Attr; + import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/BaseBottomSheetFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/BaseBottomSheetFragment.java index 17d2de107..b663ad0e8 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/BaseBottomSheetFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/BaseBottomSheetFragment.java @@ -23,7 +23,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; + import androidx.annotation.NonNull; + import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.itsaky.androidide.databinding.LayoutSheetBinding; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/OptionsListFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/OptionsListFragment.java index 5022c2765..8d284cd89 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/OptionsListFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/OptionsListFragment.java @@ -24,11 +24,14 @@ import android.content.Context; import android.os.Bundle; import android.view.View; import android.widget.LinearLayout; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.adapters.OptionsSheetAdapter; import com.itsaky.androidide.models.SheetOption; + import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java index 8e1e95ce5..0007a9587 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java @@ -26,7 +26,9 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.RelativeLayout; + import androidx.annotation.NonNull; + import com.itsaky.androidide.databinding.LayoutProgressSheetBinding; import com.itsaky.androidide.utils.Logger; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java index 7a84aaafe..ad49bbe6d 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java @@ -22,10 +22,13 @@ import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.view.ViewGroup; import android.widget.LinearLayout; + import androidx.annotation.NonNull; + import com.itsaky.androidide.R; import com.itsaky.androidide.utils.TypefaceUtils; import com.itsaky.androidide.views.editor.IDEEditor; + import io.github.rosemoe.sora.lang.EmptyLanguage; public class TextSheetFragment extends BaseBottomSheetFragment { diff --git a/app/src/main/java/com/itsaky/androidide/handlers/BuildServiceHandler.java b/app/src/main/java/com/itsaky/androidide/handlers/BuildServiceHandler.java index efbc4bb80..ce8f2e193 100755 --- a/app/src/main/java/com/itsaky/androidide/handlers/BuildServiceHandler.java +++ b/app/src/main/java/com/itsaky/androidide/handlers/BuildServiceHandler.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.handlers; import android.view.View; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.itsaky.androidide.R; import com.itsaky.androidide.managers.PreferenceManager; @@ -30,6 +31,7 @@ import com.itsaky.androidide.tasks.GradleTask; import com.itsaky.androidide.tasks.gradle.build.ApkGeneratingTask; import com.itsaky.androidide.utils.DialogUtils; import com.itsaky.androidide.utils.Environment; + import java.io.File; import java.util.ArrayList; import java.util.Collection; diff --git a/app/src/main/java/com/itsaky/androidide/handlers/FileOptionsHandler.java b/app/src/main/java/com/itsaky/androidide/handlers/FileOptionsHandler.java index 27708abef..bdc0035da 100755 --- a/app/src/main/java/com/itsaky/androidide/handlers/FileOptionsHandler.java +++ b/app/src/main/java/com/itsaky/androidide/handlers/FileOptionsHandler.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.handlers; import android.view.LayoutInflater; + import com.blankj.utilcode.util.ClipboardUtils; import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; @@ -33,6 +34,7 @@ import com.itsaky.androidide.utils.Environment; import com.itsaky.androidide.utils.ProjectWriter; import com.itsaky.toaster.Toaster; import com.unnamed.b.atv.model.TreeNode; + import java.io.File; import java.util.Objects; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/itsaky/androidide/interfaces/DiagnosticClickListener.java b/app/src/main/java/com/itsaky/androidide/interfaces/DiagnosticClickListener.java index 2d0f61922..6d347055d 100755 --- a/app/src/main/java/com/itsaky/androidide/interfaces/DiagnosticClickListener.java +++ b/app/src/main/java/com/itsaky/androidide/interfaces/DiagnosticClickListener.java @@ -19,6 +19,7 @@ package com.itsaky.androidide.interfaces; import com.itsaky.androidide.models.DiagnosticGroup; import com.itsaky.lsp.models.DiagnosticItem; + import java.io.File; public interface DiagnosticClickListener { diff --git a/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java b/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java index 46abb541b..d959fe660 100644 --- a/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java +++ b/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.language; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.api.ICompletionProvider; import com.itsaky.lsp.api.ILanguageServer; @@ -25,11 +26,15 @@ import com.itsaky.lsp.models.CompletionItem; import com.itsaky.lsp.models.CompletionParams; import com.itsaky.lsp.models.CompletionResult; import com.itsaky.lsp.models.Position; + import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; import io.github.rosemoe.sora.lang.completion.CompletionHelper; import io.github.rosemoe.sora.text.CharPosition; import io.github.rosemoe.sora.text.ContentReference; import io.github.rosemoe.sora.util.MyCharacter; + +import org.jetbrains.annotations.Contract; + import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; @@ -38,7 +43,6 @@ import java.util.List; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -import org.jetbrains.annotations.Contract; /** * Common implementation of completion provider which requests completions to provided language diff --git a/app/src/main/java/com/itsaky/androidide/language/IAnalyzeManager.java b/app/src/main/java/com/itsaky/androidide/language/IAnalyzeManager.java index b485bd2a1..e6186d481 100644 --- a/app/src/main/java/com/itsaky/androidide/language/IAnalyzeManager.java +++ b/app/src/main/java/com/itsaky/androidide/language/IAnalyzeManager.java @@ -18,7 +18,9 @@ package com.itsaky.androidide.language; import androidx.annotation.NonNull; + import com.itsaky.lsp.models.DiagnosticItem; + import java.util.List; /** diff --git a/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java b/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java index e2b712aaa..be349859b 100644 --- a/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java +++ b/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java @@ -17,10 +17,13 @@ package com.itsaky.androidide.language; import androidx.annotation.NonNull; + import com.itsaky.androidide.app.StudioApp; import com.itsaky.lsp.api.ILanguageServer; import com.itsaky.lsp.models.DiagnosticItem; + import io.github.rosemoe.sora.lang.Language; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.java b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.java index 38325a5ad..d9eddc232 100755 --- a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.java +++ b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.java @@ -31,16 +31,19 @@ import static com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.get; import com.itsaky.androidide.lexers.groovy.GroovyLexer; import com.itsaky.androidide.utils.CharSequenceReader; import com.itsaky.androidide.utils.Logger; + import io.github.rosemoe.sora.lang.analysis.SimpleAnalyzeManager; 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 java.io.IOException; -import java.util.Stack; + import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.Token; +import java.io.IOException; +import java.util.Stack; + public class GroovyAnalyzer extends SimpleAnalyzeManager { private static final Logger LOG = Logger.newInstance("GroovyAnalyzer"); diff --git a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAutoComplete.java b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAutoComplete.java index 60611df7f..c150281c0 100755 --- a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAutoComplete.java +++ b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAutoComplete.java @@ -20,14 +20,17 @@ package com.itsaky.androidide.language.groovy; import android.os.Bundle; + import com.itsaky.lsp.models.CompletionItem; import com.itsaky.lsp.models.CompletionItemKind; import com.itsaky.lsp.models.InsertTextFormat; + import io.github.rosemoe.sora.lang.completion.CompletionHelper; import io.github.rosemoe.sora.lang.completion.CompletionPublisher; import io.github.rosemoe.sora.text.CharPosition; import io.github.rosemoe.sora.text.ContentReference; import io.github.rosemoe.sora.util.MyCharacter; + import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyLanguage.java b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyLanguage.java index 0439208d0..cc456d7b4 100755 --- a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyLanguage.java +++ b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyLanguage.java @@ -18,11 +18,14 @@ package com.itsaky.androidide.language.groovy; import android.os.Bundle; + import androidx.annotation.NonNull; + import com.itsaky.androidide.language.IDELanguage; import com.itsaky.androidide.lexers.groovy.GroovyLexer; import com.itsaky.androidide.utils.CharSequenceReader; import com.itsaky.androidide.utils.Logger; + import io.github.rosemoe.sora.lang.analysis.AnalyzeManager; import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; import io.github.rosemoe.sora.lang.completion.CompletionPublisher; @@ -32,10 +35,12 @@ 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.widget.SymbolPairMatch; -import java.io.StringReader; + import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.Token; +import java.io.StringReader; + public class GroovyLanguage extends IDELanguage { private static final Logger LOG = Logger.newInstance("GroovyLanguage"); diff --git a/app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.java b/app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.java index 8b2cefd9f..ba8927cdd 100644 --- a/app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.java +++ b/app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.java @@ -28,6 +28,7 @@ import static com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.get; import static com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.withoutCompletion; import androidx.annotation.NonNull; + import com.itsaky.androidide.language.IAnalyzeManager; import com.itsaky.androidide.lexers.java.JavaLexer; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; @@ -37,20 +38,23 @@ import com.itsaky.lsp.models.DiagnosticItem; import com.itsaky.lsp.models.DiagnosticSeverity; import com.itsaky.lsp.models.Position; import com.itsaky.lsp.models.Range; + import io.github.rosemoe.sora.lang.analysis.SimpleAnalyzeManager; import io.github.rosemoe.sora.lang.styling.CodeBlock; import io.github.rosemoe.sora.lang.styling.MappedSpans; import io.github.rosemoe.sora.lang.styling.Span; import io.github.rosemoe.sora.lang.styling.Styles; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; + import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.Token; import org.jetbrains.annotations.Contract; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; + /** * Code analyzer for the Java Language * diff --git a/app/src/main/java/com/itsaky/androidide/language/java/JavaLanguage.java b/app/src/main/java/com/itsaky/androidide/language/java/JavaLanguage.java index 3a03f7250..1374f73a8 100755 --- a/app/src/main/java/com/itsaky/androidide/language/java/JavaLanguage.java +++ b/app/src/main/java/com/itsaky/androidide/language/java/JavaLanguage.java @@ -18,7 +18,9 @@ package com.itsaky.androidide.language.java; import android.os.Bundle; + import androidx.annotation.NonNull; + import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.language.CommonCompletionProvider; import com.itsaky.androidide.language.IDELanguage; @@ -28,6 +30,7 @@ import com.itsaky.androidide.utils.Logger; import com.itsaky.androidide.views.editor.IDEEditor; import com.itsaky.lsp.api.ILanguageServer; import com.itsaky.lsp.models.DiagnosticItem; + import io.github.rosemoe.sora.lang.analysis.AnalyzeManager; import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; import io.github.rosemoe.sora.lang.completion.CompletionPublisher; @@ -37,13 +40,15 @@ 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.widget.SymbolPairMatch; + +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.Token; + import java.io.StringReader; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.Token; public class JavaLanguage extends IDELanguage { diff --git a/app/src/main/java/com/itsaky/androidide/language/logs/LogLanguageImpl.java b/app/src/main/java/com/itsaky/androidide/language/logs/LogLanguageImpl.java index b69b054f8..a16e3e9bb 100755 --- a/app/src/main/java/com/itsaky/androidide/language/logs/LogLanguageImpl.java +++ b/app/src/main/java/com/itsaky/androidide/language/logs/LogLanguageImpl.java @@ -18,10 +18,13 @@ package com.itsaky.androidide.language.logs; import android.os.Bundle; + import androidx.annotation.NonNull; + import com.itsaky.androidide.language.IDELanguage; import com.itsaky.androidide.models.LogLine; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; + import io.github.rosemoe.sora.lang.analysis.AnalyzeManager; import io.github.rosemoe.sora.lang.analysis.SimpleAnalyzeManager; import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; @@ -32,6 +35,7 @@ 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.SymbolPairMatch; + import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.java b/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.java index f5996f588..64da4dd1f 100755 --- a/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.java +++ b/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.java @@ -21,22 +21,26 @@ import static com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.OPERATO import static com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.TEXT_SELECTED; import static com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.forComment; import static com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.get; + import static io.github.rosemoe.sora.widget.schemes.EditorColorScheme.LITERAL; import com.itsaky.androidide.lexers.xml.XMLLexer; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; import com.itsaky.androidide.utils.CharSequenceReader; import com.itsaky.androidide.utils.Logger; + import io.github.rosemoe.sora.lang.analysis.SimpleAnalyzeManager; 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 java.io.IOException; -import java.util.Stack; + import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.Token; +import java.io.IOException; +import java.util.Stack; + /** * Simple analyzer implementation for the XML files. * diff --git a/app/src/main/java/com/itsaky/androidide/language/xml/XMLLanguage.java b/app/src/main/java/com/itsaky/androidide/language/xml/XMLLanguage.java index fd9dca322..599680f16 100755 --- a/app/src/main/java/com/itsaky/androidide/language/xml/XMLLanguage.java +++ b/app/src/main/java/com/itsaky/androidide/language/xml/XMLLanguage.java @@ -18,7 +18,9 @@ package com.itsaky.androidide.language.xml; import android.os.Bundle; + import androidx.annotation.NonNull; + import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.language.CommonCompletionProvider; import com.itsaky.androidide.language.IDELanguage; @@ -27,6 +29,7 @@ import com.itsaky.androidide.utils.JavaCharacter; import com.itsaky.androidide.utils.Logger; import com.itsaky.androidide.views.editor.IDEEditor; import com.itsaky.lsp.api.ILanguageServer; + import io.github.rosemoe.sora.lang.analysis.AnalyzeManager; import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; import io.github.rosemoe.sora.lang.completion.CompletionPublisher; @@ -34,11 +37,13 @@ import io.github.rosemoe.sora.lang.smartEnter.NewlineHandler; import io.github.rosemoe.sora.text.CharPosition; import io.github.rosemoe.sora.text.ContentReference; import io.github.rosemoe.sora.widget.SymbolPairMatch; + +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.Token; + import java.io.StringReader; import java.nio.file.Paths; import java.util.ArrayList; -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.Token; public class XMLLanguage extends IDELanguage { diff --git a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java index 8ba035cff..5fd5ecb72 100755 --- a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java +++ b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java @@ -20,6 +20,7 @@ package com.itsaky.androidide.lsp; import android.view.View; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.ThreadUtils; @@ -50,7 +51,9 @@ import com.itsaky.lsp.models.Location; import com.itsaky.lsp.models.Range; import com.itsaky.lsp.models.TextEdit; import com.itsaky.toaster.Toaster; + import io.github.rosemoe.sora.text.Content; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/itsaky/androidide/models/ApkMetadata.java b/app/src/main/java/com/itsaky/androidide/models/ApkMetadata.java index 6e4b3c98f..42e5ca008 100755 --- a/app/src/main/java/com/itsaky/androidide/models/ApkMetadata.java +++ b/app/src/main/java/com/itsaky/androidide/models/ApkMetadata.java @@ -18,7 +18,9 @@ package com.itsaky.androidide.models; import androidx.annotation.NonNull; + import com.google.gson.annotations.SerializedName; + import java.util.List; @SuppressWarnings("unused") diff --git a/app/src/main/java/com/itsaky/androidide/models/DiagnosticGroup.java b/app/src/main/java/com/itsaky/androidide/models/DiagnosticGroup.java index 977110136..da8095cf0 100755 --- a/app/src/main/java/com/itsaky/androidide/models/DiagnosticGroup.java +++ b/app/src/main/java/com/itsaky/androidide/models/DiagnosticGroup.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.models; import com.itsaky.lsp.models.DiagnosticItem; + import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/models/LogLine.java b/app/src/main/java/com/itsaky/androidide/models/LogLine.java index cb2b3c4c4..0186c1445 100755 --- a/app/src/main/java/com/itsaky/androidide/models/LogLine.java +++ b/app/src/main/java/com/itsaky/androidide/models/LogLine.java @@ -18,10 +18,13 @@ package com.itsaky.androidide.models; import android.content.Context; + import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; + import com.itsaky.androidide.R; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; + import java.util.Locale; public class LogLine { diff --git a/app/src/main/java/com/itsaky/androidide/models/ProjectTemplate.java b/app/src/main/java/com/itsaky/androidide/models/ProjectTemplate.java index 208a1ecb7..cefeeb978 100755 --- a/app/src/main/java/com/itsaky/androidide/models/ProjectTemplate.java +++ b/app/src/main/java/com/itsaky/androidide/models/ProjectTemplate.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.models; import android.content.Context; + import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; diff --git a/app/src/main/java/com/itsaky/androidide/models/SearchResult.java b/app/src/main/java/com/itsaky/androidide/models/SearchResult.java index 2441ee0be..4ee6e7484 100755 --- a/app/src/main/java/com/itsaky/androidide/models/SearchResult.java +++ b/app/src/main/java/com/itsaky/androidide/models/SearchResult.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.models; import com.itsaky.lsp.models.Range; + import java.io.File; public class SearchResult extends Range { diff --git a/app/src/main/java/com/itsaky/androidide/models/UIWidget.java b/app/src/main/java/com/itsaky/androidide/models/UIWidget.java index c94df4782..390d2de43 100755 --- a/app/src/main/java/com/itsaky/androidide/models/UIWidget.java +++ b/app/src/main/java/com/itsaky/androidide/models/UIWidget.java @@ -20,7 +20,9 @@ package com.itsaky.androidide.models; import android.os.Parcel; import android.os.Parcelable; import android.view.View; + import androidx.annotation.DrawableRes; + import java.util.Objects; /** diff --git a/app/src/main/java/com/itsaky/androidide/models/UIWidgetGroup.java b/app/src/main/java/com/itsaky/androidide/models/UIWidgetGroup.java index d9472bcc8..622a3e3f0 100755 --- a/app/src/main/java/com/itsaky/androidide/models/UIWidgetGroup.java +++ b/app/src/main/java/com/itsaky/androidide/models/UIWidgetGroup.java @@ -19,11 +19,14 @@ package com.itsaky.androidide.models; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; + +import org.jetbrains.annotations.Contract; + import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.jetbrains.annotations.Contract; /** * Model class for holding data about a group that will be displayed in Widgets list in UI Designer diff --git a/app/src/main/java/com/itsaky/androidide/models/XMLAttribute.java b/app/src/main/java/com/itsaky/androidide/models/XMLAttribute.java index 8c87e05b5..89fbc773b 100644 --- a/app/src/main/java/com/itsaky/androidide/models/XMLAttribute.java +++ b/app/src/main/java/com/itsaky/androidide/models/XMLAttribute.java @@ -19,15 +19,19 @@ package com.itsaky.androidide.models; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; + import com.itsaky.androidide.app.StudioApp; import com.itsaky.attrinfo.models.Attr; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.impl.UiAttribute; import com.itsaky.xml.INamespace; -import java.util.Objects; + import org.jetbrains.annotations.Contract; +import java.util.Objects; + /** * A model that is used to show attributes list of a view. * diff --git a/app/src/main/java/com/itsaky/androidide/project/AndroidProject.java b/app/src/main/java/com/itsaky/androidide/project/AndroidProject.java index f0394ca99..1cc0f2876 100755 --- a/app/src/main/java/com/itsaky/androidide/project/AndroidProject.java +++ b/app/src/main/java/com/itsaky/androidide/project/AndroidProject.java @@ -22,7 +22,9 @@ package com.itsaky.androidide.project; import android.os.Parcel; import android.os.Parcelable; + import com.itsaky.androidide.app.StudioApp; + import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/project/IDEProject.java b/app/src/main/java/com/itsaky/androidide/project/IDEProject.java index d6d716e05..05aef2b9a 100755 --- a/app/src/main/java/com/itsaky/androidide/project/IDEProject.java +++ b/app/src/main/java/com/itsaky/androidide/project/IDEProject.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.project; import com.google.gson.annotations.SerializedName; + import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java b/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java index b22c5956c..1d6a1ccc6 100644 --- a/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java +++ b/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java @@ -19,9 +19,11 @@ package com.itsaky.androidide.project; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.utils.Logger; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.values.ValuesTableFactory; + import java.io.File; import java.io.FileFilter; import java.util.Collection; diff --git a/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java b/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java index 1b34c5a5f..0d4513104 100755 --- a/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java +++ b/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java @@ -23,6 +23,7 @@ package com.itsaky.androidide.services; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; + import com.itsaky.androidide.models.LogLine; import com.itsaky.androidide.utils.Logger; diff --git a/app/src/main/java/com/itsaky/androidide/services/MessagingService.java b/app/src/main/java/com/itsaky/androidide/services/MessagingService.java index bbdbcd91f..39e481cf4 100755 --- a/app/src/main/java/com/itsaky/androidide/services/MessagingService.java +++ b/app/src/main/java/com/itsaky/androidide/services/MessagingService.java @@ -23,13 +23,16 @@ package com.itsaky.androidide.services; import android.app.PendingIntent; import android.content.Intent; import android.provider.Settings; + import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; + import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; import com.itsaky.androidide.BuildConfig; import com.itsaky.androidide.SplashActivity; import com.itsaky.androidide.app.StudioApp; + import java.util.Map; public class MessagingService extends FirebaseMessagingService { diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/BuildListener.java b/app/src/main/java/com/itsaky/androidide/services/builder/BuildListener.java index 9b39b4b90..739c8c702 100755 --- a/app/src/main/java/com/itsaky/androidide/services/builder/BuildListener.java +++ b/app/src/main/java/com/itsaky/androidide/services/builder/BuildListener.java @@ -20,6 +20,7 @@ package com.itsaky.androidide.services.builder; import com.itsaky.androidide.project.IDEModule; import com.itsaky.androidide.project.IDEProject; import com.itsaky.androidide.tasks.GradleTask; + import java.util.Optional; /** A client should implement this interface to get callbacks about a build */ diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/IDEService.java b/app/src/main/java/com/itsaky/androidide/services/builder/IDEService.java index 208f87a61..db527f4c8 100755 --- a/app/src/main/java/com/itsaky/androidide/services/builder/IDEService.java +++ b/app/src/main/java/com/itsaky/androidide/services/builder/IDEService.java @@ -21,6 +21,7 @@ import static com.itsaky.androidide.managers.ToolsManager.getCommonAsset; import androidx.annotation.NonNull; import androidx.annotation.StringRes; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.ResourceUtils; @@ -42,6 +43,9 @@ import com.itsaky.androidide.utils.Environment; import com.itsaky.androidide.utils.InputStreamLineReader; import com.itsaky.androidide.utils.Logger; import com.itsaky.toaster.Toaster; + +import org.jetbrains.annotations.Contract; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -57,7 +61,6 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import org.jetbrains.annotations.Contract; public class IDEService { diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/MainThreadBuildListener.java b/app/src/main/java/com/itsaky/androidide/services/builder/MainThreadBuildListener.java index c2d9cbe58..ebbc9aeca 100755 --- a/app/src/main/java/com/itsaky/androidide/services/builder/MainThreadBuildListener.java +++ b/app/src/main/java/com/itsaky/androidide/services/builder/MainThreadBuildListener.java @@ -18,10 +18,12 @@ package com.itsaky.androidide.services.builder; import androidx.annotation.NonNull; + import com.blankj.utilcode.util.ThreadUtils; import com.itsaky.androidide.project.IDEModule; import com.itsaky.androidide.project.IDEProject; import com.itsaky.androidide.tasks.GradleTask; + import java.util.Objects; import java.util.Optional; diff --git a/app/src/main/java/com/itsaky/androidide/syntax/colorschemes/SchemeAndroidIDE.java b/app/src/main/java/com/itsaky/androidide/syntax/colorschemes/SchemeAndroidIDE.java index dbb04821a..b09f5953f 100755 --- a/app/src/main/java/com/itsaky/androidide/syntax/colorschemes/SchemeAndroidIDE.java +++ b/app/src/main/java/com/itsaky/androidide/syntax/colorschemes/SchemeAndroidIDE.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.syntax.colorschemes; import android.graphics.Color; + import io.github.rosemoe.sora.lang.styling.TextStyle; import io.github.rosemoe.sora.widget.schemes.EditorColorScheme; diff --git a/app/src/main/java/com/itsaky/androidide/syntax/highlighters/JavaHighlighter.java b/app/src/main/java/com/itsaky/androidide/syntax/highlighters/JavaHighlighter.java index 0a9988926..36e05d2d7 100644 --- a/app/src/main/java/com/itsaky/androidide/syntax/highlighters/JavaHighlighter.java +++ b/app/src/main/java/com/itsaky/androidide/syntax/highlighters/JavaHighlighter.java @@ -19,14 +19,18 @@ package com.itsaky.androidide.syntax.highlighters; import android.text.SpannableStringBuilder; import android.text.style.BackgroundColorSpan; import android.text.style.ForegroundColorSpan; + import com.itsaky.androidide.lexers.java.JavaLexer; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; + import io.github.rosemoe.sora.widget.schemes.EditorColorScheme; + +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.Token; + import java.io.StringReader; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.Token; public class JavaHighlighter implements Highlighter { diff --git a/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java b/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java index d1728e66d..4443a4311 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java @@ -20,6 +20,7 @@ package com.itsaky.androidide.tasks; import com.blankj.utilcode.util.ThreadUtils; import com.itsaky.androidide.utils.Logger; + import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; @@ -35,7 +36,8 @@ public class TaskExecutor { return callable.call(); } catch (Throwable th) { LOG.error( - "An error occurred while executing Callable in background thread.", + "An error occurred while executing Callable in background" + + " thread.", th); return null; } @@ -52,7 +54,8 @@ public class TaskExecutor { return callable.call(); } catch (Throwable th) { LOG.error( - "An error occurred while executing Callable in background thread.", + "An error occurred while executing Callable in background" + + " thread.", th); throw new CompletionException(th); } diff --git a/app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java b/app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java index a8c833874..49404db51 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java @@ -21,8 +21,10 @@ package com.itsaky.androidide.tasks.callables; import android.content.Context; + import com.itsaky.androidide.adapters.viewholders.FileTreeViewHolder; import com.unnamed.b.atv.model.TreeNode; + import java.io.File; import java.io.FileFilter; import java.util.Arrays; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/callables/LicenseReader.java b/app/src/main/java/com/itsaky/androidide/tasks/callables/LicenseReader.java index 8a784796f..5be6c8f69 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/callables/LicenseReader.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/callables/LicenseReader.java @@ -21,9 +21,11 @@ package com.itsaky.androidide.tasks.callables; import android.content.Context; + import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.itsaky.androidide.models.License; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/callables/ListDirectoryCallable.java b/app/src/main/java/com/itsaky/androidide/tasks/callables/ListDirectoryCallable.java index daa40121e..99690adfa 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/callables/ListDirectoryCallable.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/callables/ListDirectoryCallable.java @@ -21,7 +21,9 @@ package com.itsaky.androidide.tasks.callables; import android.text.TextUtils; + import com.blankj.utilcode.util.FileUtils; + import java.io.File; import java.io.FileFilter; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/callables/ProjectCreatorCallable.java b/app/src/main/java/com/itsaky/androidide/tasks/callables/ProjectCreatorCallable.java index 528a1a8a5..f63030b87 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/callables/ProjectCreatorCallable.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/callables/ProjectCreatorCallable.java @@ -24,6 +24,7 @@ import com.itsaky.androidide.interfaces.ProjectWriterCallback; import com.itsaky.androidide.models.NewProjectDetails; import com.itsaky.androidide.models.ProjectTemplate; import com.itsaky.androidide.utils.ProjectWriter; + import java.util.concurrent.Callable; public class ProjectCreatorCallable implements Callable { diff --git a/app/src/main/java/com/itsaky/androidide/tasks/callables/UnzipCallable.java b/app/src/main/java/com/itsaky/androidide/tasks/callables/UnzipCallable.java index 8de68d4a2..0016e1223 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/callables/UnzipCallable.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/callables/UnzipCallable.java @@ -21,6 +21,7 @@ package com.itsaky.androidide.tasks.callables; import com.blankj.utilcode.util.ZipUtils; + import java.io.File; import java.util.List; import java.util.concurrent.Callable; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/ApkGeneratingTask.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/ApkGeneratingTask.java index 5846440a5..483bdac63 100644 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/ApkGeneratingTask.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/ApkGeneratingTask.java @@ -28,6 +28,7 @@ import com.itsaky.androidide.models.ApkMetadata; import com.itsaky.androidide.tasks.BaseGradleTask; import com.itsaky.androidide.utils.JSONUtility; import com.itsaky.androidide.utils.Logger; + import java.io.File; import java.util.Collections; import java.util.HashSet; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/AssembleDebug.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/AssembleDebug.java index 2628f661d..a11c5e613 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/AssembleDebug.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/AssembleDebug.java @@ -21,6 +21,7 @@ package com.itsaky.androidide.tasks.gradle.build; import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; + import java.io.File; import java.util.Collections; import java.util.HashSet; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/AssembleRelease.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/AssembleRelease.java index e7e2e391a..76e43cc59 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/AssembleRelease.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/AssembleRelease.java @@ -24,6 +24,7 @@ import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; import com.itsaky.androidide.tasks.GradleTask; + import java.io.File; import java.util.Arrays; import java.util.HashSet; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Build.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Build.java index 13ddf5a16..57b605112 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Build.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Build.java @@ -24,6 +24,7 @@ import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; import com.itsaky.androidide.tasks.GradleTask; + import java.io.File; import java.util.Arrays; import java.util.HashSet; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Bundle.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Bundle.java index df4e1ab3f..0c8385b1f 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Bundle.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Bundle.java @@ -25,6 +25,7 @@ import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; import com.itsaky.androidide.tasks.BaseGradleTask; import com.itsaky.androidide.tasks.GradleTask; + import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Clean.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Clean.java index 82006a98d..721671534 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Clean.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/Clean.java @@ -25,6 +25,7 @@ import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; import com.itsaky.androidide.tasks.BaseGradleTask; import com.itsaky.androidide.tasks.GradleTask; + import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/CleanBuild.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/CleanBuild.java index c1295843e..e3f912c69 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/CleanBuild.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/CleanBuild.java @@ -25,6 +25,7 @@ import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; import com.itsaky.androidide.tasks.BaseGradleTask; import com.itsaky.androidide.tasks.GradleTask; + import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/Lint.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/Lint.java index 883915e13..bd83e83c1 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/Lint.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/Lint.java @@ -24,6 +24,7 @@ import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; import com.itsaky.androidide.tasks.BaseGradleTask; + import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/LintDebug.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/LintDebug.java index f35b58dfd..2730f6883 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/LintDebug.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/LintDebug.java @@ -24,6 +24,7 @@ import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; import com.itsaky.androidide.tasks.BaseGradleTask; + import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/LintRelease.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/LintRelease.java index 4614a1196..929babd0c 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/LintRelease.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/lint/LintRelease.java @@ -24,6 +24,7 @@ import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.services.builder.IDEService; import com.itsaky.androidide.tasks.BaseGradleTask; + import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/plugin/InitializeIDEProject.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/plugin/InitializeIDEProject.java index ebced1bf0..1aa3603b9 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/plugin/InitializeIDEProject.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/plugin/InitializeIDEProject.java @@ -22,6 +22,7 @@ package com.itsaky.androidide.tasks.gradle.plugin; import com.itsaky.androidide.tasks.BaseGradleTask; import com.itsaky.androidide.tasks.GradleTask; + import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/DatabindingGenBaseClassesDebug.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/DatabindingGenBaseClassesDebug.java index e3828d652..beb8dd2d1 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/DatabindingGenBaseClassesDebug.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/DatabindingGenBaseClassesDebug.java @@ -21,6 +21,7 @@ package com.itsaky.androidide.tasks.gradle.resources; import com.itsaky.androidide.tasks.BaseGradleTask; + import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/ProcessDebugResources.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/ProcessDebugResources.java index ed9202283..f2c61ca84 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/ProcessDebugResources.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/ProcessDebugResources.java @@ -22,6 +22,7 @@ package com.itsaky.androidide.tasks.gradle.resources; import com.itsaky.androidide.tasks.BaseGradleTask; import com.itsaky.androidide.tasks.GradleTask; + import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/UpdateResourceClassesTask.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/UpdateResourceClassesTask.java index 244edcb32..1fd747239 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/UpdateResourceClassesTask.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/resources/UpdateResourceClassesTask.java @@ -22,6 +22,7 @@ package com.itsaky.androidide.tasks.gradle.resources; import com.itsaky.androidide.tasks.BaseGradleTask; import com.itsaky.androidide.tasks.GradleTask; + import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java b/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java index ae5c584e8..dc64ac3f8 100755 --- a/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java +++ b/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java @@ -22,7 +22,9 @@ import android.graphics.RectF; import android.view.DragEvent; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.SizeUtils; import com.itsaky.androidide.DesignerActivity; import com.itsaky.androidide.R; @@ -36,6 +38,7 @@ import com.itsaky.inflater.impl.UiAttribute; import com.itsaky.inflater.impl.UiView; import com.itsaky.inflater.impl.UiViewGroup; import com.itsaky.xml.INamespace; + import org.jetbrains.annotations.Contract; /** diff --git a/app/src/main/java/com/itsaky/androidide/ui/WidgetTouchListener.java b/app/src/main/java/com/itsaky/androidide/ui/WidgetTouchListener.java index ce778ac60..296a89258 100644 --- a/app/src/main/java/com/itsaky/androidide/ui/WidgetTouchListener.java +++ b/app/src/main/java/com/itsaky/androidide/ui/WidgetTouchListener.java @@ -22,8 +22,10 @@ import android.view.GestureDetector; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.inflater.IView; /** diff --git a/app/src/main/java/com/itsaky/androidide/ui/edit/BaseSuggestionProvider.java b/app/src/main/java/com/itsaky/androidide/ui/edit/BaseSuggestionProvider.java index c44c283ae..e427c1255 100644 --- a/app/src/main/java/com/itsaky/androidide/ui/edit/BaseSuggestionProvider.java +++ b/app/src/main/java/com/itsaky/androidide/ui/edit/BaseSuggestionProvider.java @@ -20,6 +20,7 @@ import com.itsaky.androidide.app.StudioApp; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.values.ValuesTable; import com.itsaky.inflater.values.ValuesTableFactory; + import java.io.File; import java.util.Objects; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/itsaky/androidide/ui/edit/DimensionSuggestionProvider.java b/app/src/main/java/com/itsaky/androidide/ui/edit/DimensionSuggestionProvider.java index bb636993f..0236f604d 100644 --- a/app/src/main/java/com/itsaky/androidide/ui/edit/DimensionSuggestionProvider.java +++ b/app/src/main/java/com/itsaky/androidide/ui/edit/DimensionSuggestionProvider.java @@ -17,9 +17,11 @@ package com.itsaky.androidide.ui.edit; import androidx.annotation.NonNull; + import com.itsaky.attrinfo.models.Attr; import com.itsaky.inflater.IAttribute; import com.itsaky.lsp.util.StringUtils; + import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/ui/edit/IValueSuggestionProvider.java b/app/src/main/java/com/itsaky/androidide/ui/edit/IValueSuggestionProvider.java index 44bc9bd87..d145aad88 100644 --- a/app/src/main/java/com/itsaky/androidide/ui/edit/IValueSuggestionProvider.java +++ b/app/src/main/java/com/itsaky/androidide/ui/edit/IValueSuggestionProvider.java @@ -18,7 +18,9 @@ package com.itsaky.androidide.ui.edit; import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; + import java.util.List; /** diff --git a/app/src/main/java/com/itsaky/androidide/utils/DialogUtils.java b/app/src/main/java/com/itsaky/androidide/utils/DialogUtils.java index 1333f352f..ce858ee53 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/DialogUtils.java +++ b/app/src/main/java/com/itsaky/androidide/utils/DialogUtils.java @@ -19,9 +19,12 @@ package com.itsaky.androidide.utils; import android.content.Context; import android.content.DialogInterface; + import androidx.annotation.NonNull; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.itsaky.androidide.R; + import org.jetbrains.annotations.Contract; /** diff --git a/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java b/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java index 6829ba2c2..0fdc19cf4 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java +++ b/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java @@ -22,8 +22,10 @@ import android.graphics.RectF; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; + import androidx.annotation.NonNull; import androidx.coordinatorlayout.widget.CoordinatorLayout; + import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.itsaky.androidide.databinding.LayoutEditorBottomSheetBinding; diff --git a/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java b/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java index 5456a0f57..ad619e6f4 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java +++ b/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java @@ -22,6 +22,7 @@ import static com.itsaky.lsp.models.HighlightTokenKind.*; import com.itsaky.lsp.models.HighlightToken; import com.itsaky.lsp.models.HighlightTokenKind; import com.itsaky.lsp.models.Position; + import java.util.List; public class HighlightRangeHelper { diff --git a/app/src/main/java/com/itsaky/androidide/utils/LSPUtils.java b/app/src/main/java/com/itsaky/androidide/utils/LSPUtils.java index 9d5ff1408..b102dbf23 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/LSPUtils.java +++ b/app/src/main/java/com/itsaky/androidide/utils/LSPUtils.java @@ -23,6 +23,7 @@ import com.itsaky.lsp.models.DiagnosticItem; import com.itsaky.lsp.models.DiagnosticSeverity; import com.itsaky.lsp.models.Position; import com.itsaky.lsp.models.Range; + import java.util.Comparator; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/utils/ProjectFinder.java b/app/src/main/java/com/itsaky/androidide/utils/ProjectFinder.java index 90bb2cd80..69846cf21 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/ProjectFinder.java +++ b/app/src/main/java/com/itsaky/androidide/utils/ProjectFinder.java @@ -21,14 +21,18 @@ package com.itsaky.androidide.utils; import android.text.TextUtils; + import com.blankj.utilcode.util.FileIOUtils; import com.itsaky.androidide.project.AndroidProject; + import fr.arnaudguyon.xmltojsonlib.XmlToJson; + +import org.json.JSONException; +import org.json.JSONObject; + import java.io.File; import java.io.FileFilter; import java.util.regex.Pattern; -import org.json.JSONException; -import org.json.JSONObject; public class ProjectFinder { diff --git a/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java b/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java index 9876a18fa..570b00419 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java +++ b/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java @@ -21,6 +21,7 @@ package com.itsaky.androidide.utils; import androidx.annotation.NonNull; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.ResourceUtils; @@ -31,6 +32,7 @@ import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.interfaces.ProjectWriterCallback; import com.itsaky.androidide.models.NewProjectDetails; import com.itsaky.androidide.models.ProjectTemplate; + import java.io.File; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java b/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java index ec0d83012..39746b674 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java +++ b/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java @@ -25,8 +25,10 @@ import com.itsaky.androidide.models.SearchResult; import com.itsaky.androidide.tasks.TaskExecutor; import com.itsaky.lsp.models.Position; import com.itsaky.lsp.models.Range; + import io.github.rosemoe.sora.text.CharPosition; import io.github.rosemoe.sora.text.Content; + import java.io.File; import java.io.FileFilter; import java.util.ArrayList; diff --git a/app/src/main/java/com/itsaky/androidide/utils/Symbols.java b/app/src/main/java/com/itsaky/androidide/utils/Symbols.java index 0478214ae..b8e8f5b26 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/Symbols.java +++ b/app/src/main/java/com/itsaky/androidide/utils/Symbols.java @@ -18,8 +18,10 @@ package com.itsaky.androidide.utils; import androidx.annotation.Nullable; + import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.views.SymbolInputView.Symbol; + import java.io.File; public class Symbols { diff --git a/app/src/main/java/com/itsaky/androidide/utils/TextWatcherAdapter.java b/app/src/main/java/com/itsaky/androidide/utils/TextWatcherAdapter.java index eb024c735..7063d2f79 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/TextWatcherAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/utils/TextWatcherAdapter.java @@ -19,6 +19,7 @@ package com.itsaky.androidide.utils; import android.text.Editable; import android.text.TextWatcher; + import androidx.annotation.NonNull; /** diff --git a/app/src/main/java/com/itsaky/androidide/utils/TransformUtils.java b/app/src/main/java/com/itsaky/androidide/utils/TransformUtils.java index 054b40a2f..0916a95c5 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/TransformUtils.java +++ b/app/src/main/java/com/itsaky/androidide/utils/TransformUtils.java @@ -19,7 +19,9 @@ package com.itsaky.androidide.utils; import android.graphics.Color; import android.view.View; + import androidx.core.content.ContextCompat; + import com.google.android.material.transition.MaterialArcMotion; import com.google.android.material.transition.MaterialContainerTransform; diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/EditorViewModel.java b/app/src/main/java/com/itsaky/androidide/viewmodel/EditorViewModel.java index adf22f7a4..7c0b150a5 100644 --- a/app/src/main/java/com/itsaky/androidide/viewmodel/EditorViewModel.java +++ b/app/src/main/java/com/itsaky/androidide/viewmodel/EditorViewModel.java @@ -24,8 +24,10 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModel; + import com.itsaky.androidide.project.AndroidProject; import com.itsaky.androidide.project.IDEProject; + import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/itsaky/androidide/views/DesignerLayoutContainer.java b/app/src/main/java/com/itsaky/androidide/views/DesignerLayoutContainer.java index 86b2ddc75..a8a4e00c9 100644 --- a/app/src/main/java/com/itsaky/androidide/views/DesignerLayoutContainer.java +++ b/app/src/main/java/com/itsaky/androidide/views/DesignerLayoutContainer.java @@ -25,7 +25,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; + import androidx.annotation.Nullable; + import com.itsaky.androidide.R; /** diff --git a/app/src/main/java/com/itsaky/androidide/views/EmptyView.java b/app/src/main/java/com/itsaky/androidide/views/EmptyView.java index ff8b1122b..8185cf703 100755 --- a/app/src/main/java/com/itsaky/androidide/views/EmptyView.java +++ b/app/src/main/java/com/itsaky/androidide/views/EmptyView.java @@ -25,6 +25,7 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.widget.RelativeLayout; import android.widget.TextView; + import androidx.core.content.ContextCompat; public class EmptyView extends RelativeLayout { diff --git a/app/src/main/java/com/itsaky/androidide/views/MaterialBanner.java b/app/src/main/java/com/itsaky/androidide/views/MaterialBanner.java index 5db161bae..614f982d8 100755 --- a/app/src/main/java/com/itsaky/androidide/views/MaterialBanner.java +++ b/app/src/main/java/com/itsaky/androidide/views/MaterialBanner.java @@ -26,11 +26,13 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.animation.Animation; import android.view.animation.Transformation; + import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; + import com.itsaky.androidide.databinding.LayoutBannerBinding; public class MaterialBanner extends CoordinatorLayout { diff --git a/app/src/main/java/com/itsaky/androidide/views/SymbolInputView.java b/app/src/main/java/com/itsaky/androidide/views/SymbolInputView.java index 2846717cc..540801d21 100755 --- a/app/src/main/java/com/itsaky/androidide/views/SymbolInputView.java +++ b/app/src/main/java/com/itsaky/androidide/views/SymbolInputView.java @@ -19,8 +19,10 @@ package com.itsaky.androidide.views; import android.content.Context; import android.util.AttributeSet; + import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.itsaky.androidide.adapters.SymbolInputAdapter; import com.itsaky.androidide.views.editor.IDEEditor; diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/BaseEditorWindow.java b/app/src/main/java/com/itsaky/androidide/views/editor/BaseEditorWindow.java index 13cd0160f..ba343bc1d 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/BaseEditorWindow.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/BaseEditorWindow.java @@ -24,10 +24,13 @@ import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; + import com.blankj.utilcode.util.SizeUtils; import com.itsaky.androidide.R; + import io.github.rosemoe.sora.widget.base.EditorPopupWindow; /** diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java b/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java index 59a498355..1027c6045 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java @@ -38,8 +38,10 @@ import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.widget.FrameLayout; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.SizeUtils; import com.itsaky.androidide.adapters.CompletionListAdapter; @@ -57,9 +59,14 @@ import com.itsaky.androidide.utils.Logger; import com.itsaky.androidide.utils.TypefaceUtils; import com.itsaky.inflater.values.ValuesTableFactory; import com.itsaky.lsp.models.Range; + import io.github.rosemoe.sora.event.ContentChangeEvent; import io.github.rosemoe.sora.lang.EmptyLanguage; import io.github.rosemoe.sora.text.Content; + +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.Token; + import java.io.File; import java.io.StringReader; import java.nio.file.Files; @@ -67,8 +74,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.CompletableFuture; -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.Token; /** * A view that handles opened code editors. diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/DiagnosticWindow.java b/app/src/main/java/com/itsaky/androidide/views/editor/DiagnosticWindow.java index f40b116d2..4d2d88b74 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/DiagnosticWindow.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/DiagnosticWindow.java @@ -19,6 +19,7 @@ package com.itsaky.androidide.views.editor; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.lsp.models.DiagnosticItem; /** diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionMode.java b/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionMode.java index 070c06f01..c810e4297 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionMode.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionMode.java @@ -19,15 +19,19 @@ package com.itsaky.androidide.views.editor; import android.annotation.SuppressLint; import android.view.Menu; import android.view.MenuItem; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.view.ActionMode; import androidx.appcompat.view.menu.MenuBuilder; + import com.itsaky.androidide.utils.Logger; + import io.github.rosemoe.sora.event.ClickEvent; import io.github.rosemoe.sora.event.SelectionChangeEvent; import io.github.rosemoe.sora.widget.component.EditorTextActionWindow; + import java.util.Objects; import java.util.Set; import java.util.TreeSet; diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionWindow.java b/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionWindow.java index ee596f0b9..d8929b779 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionWindow.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionWindow.java @@ -22,14 +22,17 @@ import android.graphics.drawable.GradientDrawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; + import com.blankj.utilcode.util.SizeUtils; import com.itsaky.androidide.R; import com.itsaky.androidide.adapters.TextActionItemAdapter; import com.itsaky.androidide.databinding.LayoutEditorActionsBinding; import com.itsaky.androidide.utils.Logger; + import io.github.rosemoe.sora.event.HandleStateChangeEvent; import io.github.rosemoe.sora.event.ScrollEvent; import io.github.rosemoe.sora.event.SelectionChangeEvent; @@ -38,6 +41,7 @@ import io.github.rosemoe.sora.event.Unsubscribe; import io.github.rosemoe.sora.widget.CodeEditor; import io.github.rosemoe.sora.widget.EditorTouchEventHandler; import io.github.rosemoe.sora.widget.base.EditorPopupWindow; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java b/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java index 11ccc58b4..1fdfc886d 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java @@ -23,10 +23,12 @@ import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.inputmethod.EditorInfo; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.core.content.ContextCompat; + import com.blankj.utilcode.util.ThreadUtils; import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; @@ -59,18 +61,21 @@ import com.itsaky.lsp.models.SignatureHelpParams; import com.itsaky.lsp.util.DiagnosticUtil; import com.itsaky.lsp.util.PathUtils; import com.itsaky.toaster.Toaster; + import io.github.rosemoe.sora.event.ContentChangeEvent; import io.github.rosemoe.sora.event.SelectionChangeEvent; import io.github.rosemoe.sora.event.Unsubscribe; import io.github.rosemoe.sora.widget.CodeEditor; import io.github.rosemoe.sora.widget.component.EditorAutoCompletion; + +import org.jetbrains.annotations.Contract; + import java.io.File; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; -import org.jetbrains.annotations.Contract; public class IDEEditor extends CodeEditor { diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java b/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java index ecb0cda16..80f04bd31 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java @@ -20,11 +20,14 @@ package com.itsaky.androidide.views.editor; import android.text.SpannableStringBuilder; import android.text.style.BackgroundColorSpan; import android.text.style.ForegroundColorSpan; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.models.SignatureHelp; import com.itsaky.lsp.models.SignatureInformation; + import io.github.rosemoe.sora.event.SelectionChangeEvent; import io.github.rosemoe.sora.widget.base.EditorPopupWindow; diff --git a/app/src/main/java/com/itsaky/androidide/views/transition/ArcMotionPlus.java b/app/src/main/java/com/itsaky/androidide/views/transition/ArcMotionPlus.java index ca7d9b001..d6ccd4f7c 100755 --- a/app/src/main/java/com/itsaky/androidide/views/transition/ArcMotionPlus.java +++ b/app/src/main/java/com/itsaky/androidide/views/transition/ArcMotionPlus.java @@ -41,6 +41,7 @@ package com.itsaky.androidide.views.transition; import android.content.Context; import android.graphics.Path; import android.util.AttributeSet; + import androidx.transition.PathMotion; public class ArcMotionPlus extends PathMotion { diff --git a/app/src/main/java/com/itsaky/androidide/views/transition/ProgressTransition.java b/app/src/main/java/com/itsaky/androidide/views/transition/ProgressTransition.java index ce755786a..9bc24ee61 100755 --- a/app/src/main/java/com/itsaky/androidide/views/transition/ProgressTransition.java +++ b/app/src/main/java/com/itsaky/androidide/views/transition/ProgressTransition.java @@ -22,8 +22,10 @@ import android.animation.ObjectAnimator; import android.util.Property; import android.view.ViewGroup; import android.widget.ProgressBar; + import androidx.transition.Transition; import androidx.transition.TransitionValues; + import com.itsaky.androidide.utils.IntProperty; public class ProgressTransition extends Transition { diff --git a/build.gradle b/build.gradle index 56bcec480..da3dcb06c 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,11 @@ -import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormat -import com.github.sherter.googlejavaformatgradleplugin.VerifyGoogleJavaFormat +import com.google.googlejavaformat.java.Formatter +import com.google.googlejavaformat.java.JavaFormatterOptions + +import java.nio.charset.StandardCharsets +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import java.util.stream.Collectors buildscript { ext.kotlin_version = '1.6.10' @@ -29,18 +35,16 @@ buildscript { classpath 'com.google.gms:google-services:4.3.10' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.github.sherter.googlejavaformatgradleplugin:google-java-format-gradle-plugin:0.9-SNAPSHOT' + classpath 'com.google.googlejavaformat:google-java-format:1.15.0' } } +//dependencies { +// implementation 'com.google.googlejavaformat:google-java-format:1.15.0' +//} + subprojects { apply from: "${rootDir}/gradle/dependencies.gradle" - apply plugin: 'com.github.sherter.google-java-format' - - googleJavaFormat { - toolVersion = '1.15.0' - options style: 'AOSP' - } project.afterEvaluate { tasks.register("checkTranslations", task -> { @@ -95,77 +99,6 @@ subprojects { project.logger.info("Default strings.xml file does not exist for project '${project.name}'") } }) - tasks.register("format", GoogleJavaFormat, task -> { - source 'src/main' - source 'src/test' - include '**/*.java' - exclude '**/*_template.java' - - finalizedBy tasks.getByName("verifyFormatting") - }) - - tasks.register("verifyFormatting", VerifyGoogleJavaFormat, task -> { - source 'src/main' - source 'src/test' - include '**/*.java' - exclude '**/*_template.java' - ignoreFailures true - - finalizedBy tasks.getByName("checkFormattingChanges") - }) - - tasks.register("checkFormattingChanges", task -> { - def exit = rootProject.exec { - ignoreExitValue true - standardOutput OutputStream.nullOutputStream() - errorOutput standardOutput - commandLine "git", "diff", "--exit-code" - } - - if (exit.exitValue == 0) { - println "No changes in ${project.displayName}." - } else { - task.finalizedBy tasks.stageChanges - return - } - }) - - tasks.register("stageChanges", task -> { - task.dependsOn tasks.getByName("checkFormattingChanges") - def out = new ByteArrayOutputStream() - def exit = rootProject.exec { - ignoreExitValue true - standardOutput out - errorOutput standardOutput - commandLine "git", "add", "." - } - - if (exit.exitValue == 0) { - task.finalizedBy tasks.commitFormattingChanges - return - } else { - println "Unable to stage changes. Process terminated with exit code ${exit.exitValue}" - println out.toString() - } - }) - - tasks.register("commitFormattingChanges", task -> { - task.dependsOn tasks.getByName("stageChanges") - def out = new ByteArrayOutputStream() - def exit = rootProject.exec { - ignoreExitValue true - standardOutput out - errorOutput standardOutput - commandLine "git", "commit", "-m", "[Gradle] Format java source code" - } - - if (exit.exitValue == 0) { - println "Changes committed successfully." - } else { - println "Failed to commit changes. Process terminated with exit code ${exit.exitValue}" - println out.toString() - } - }) } } @@ -180,4 +113,107 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir +} + +Collection walkForSources(Path dir) { + try { + + if (!Files.exists(dir)) { + return Collections.emptySet() + } + + return Files.walk(dir) + .filter(path -> !Files.isDirectory(path)) + .filter(path -> Files.isReadable(path) && Files.isWritable(path)) + .map(path -> path.toFile()) + .map(file -> file.absolutePath) + .filter(path -> path.endsWith(".java")) + .filter(path -> !path.endsWith("_template.java")) + .collect(Collectors.toSet()) + } catch (Throwable error) { + getLogger().error("Could not walk directory for java sources: ${dir.toString()}", error) + return Collections.emptySet() + } +} + +boolean doJavaFormat(Formatter formatter, String path) { + try { + final def file = Paths.get(path) + final def content = Files.readAllBytes(file) + final def utf8Decoded = new String(content, StandardCharsets.UTF_8.name()) + final def formatted = formatter.formatSource(utf8Decoded) + if (utf8Decoded == formatted) { + getLogger().info("{}: UP-TO-DATE", file) + return true + } + + byte[] utf8Encoded = formatted.getBytes(StandardCharsets.UTF_8.name()) + Files.write(file, utf8Encoded) + getLogger().lifecycle("{}: Formatted successfully!", file) + return true + } catch (Throwable th) { + getLogger().error("Failed to format ${path}", th) + return false + } +} + +task formatJavaSources() { + def jarName = "google-java-format-1.15.0-all-deps" + def jar = rootProject.file(".tools/${jarName}.jar") + + if (!jar.exists()) { + getLogger().info("google-java-format JAR file not found. Skipping format task...") + return + } + + boolean formattingChanges = false + rootProject.subprojects.forEach(sub -> { + def sources = walkForSources(sub.file("src/main/java").toPath()) + sources.addAll(walkForSources(sub.file("src/test/java").toPath())) + + final def formatter = new Formatter(JavaFormatterOptions.builder().style(JavaFormatterOptions.Style.AOSP).formatJavadoc(true).build()) + + for (def path : sources) { + getLogger().info("Formatting: ${path}") + if (doJavaFormat(formatter, path)) { + formattingChanges = true + } + } + }) + + if (!formattingChanges) { + getLogger().info("No formatting changes.") + return + } + + // ---------------- Stage Changes ------------------- + def out = new ByteArrayOutputStream() + def exit = rootProject.exec { + ignoreExitValue true + standardOutput out + errorOutput standardOutput + commandLine "git", "add", "." + } + + if (exit.exitValue != 0) { + getLogger().error("Unable to stage changes. Process terminated with exit code ${exit.exitValue}") + getLogger().error(out.toString()) + return + } + + // ----------------- Commit Changes -------------------- + out = new ByteArrayOutputStream() + exit = rootProject.exec { + ignoreExitValue true + standardOutput out + errorOutput standardOutput + commandLine "git", "commit", "-m", "[Gradle] Format java source code" + } + + if (exit.exitValue == 0) { + getLogger().info("Changes committed successfully.") + } else { + getLogger().error("Failed to commit changes. Process terminated with exit code ${exit.exitValue}") + getLogger().error(out.toString()) + } } \ No newline at end of file diff --git a/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java b/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java index fea614f07..eac89c1f9 100755 --- a/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java +++ b/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java @@ -24,11 +24,13 @@ import android.content.Intent; import android.graphics.Color; import android.net.Uri; import android.os.Build; + import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.NotificationManagerCompat; import androidx.multidex.MultiDexApplication; + import com.blankj.utilcode.util.ThrowableUtils; import com.itsaky.androidide.common.R; import com.itsaky.androidide.managers.PreferenceManager; @@ -39,9 +41,11 @@ import com.itsaky.androidide.utils.FileUtil; import com.itsaky.androidide.utils.JavaCharacter; import com.itsaky.androidide.utils.StudioUtils; import com.itsaky.toaster.Toaster; + +import org.jetbrains.annotations.Contract; + import java.io.File; import java.util.Arrays; -import org.jetbrains.annotations.Contract; public abstract class BaseApplication extends MultiDexApplication { diff --git a/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java b/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java index 89237a9e2..4b8efdaa9 100644 --- a/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java +++ b/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java @@ -31,9 +31,11 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.LinearLayout; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; + import com.google.android.material.slider.Slider; import com.itsaky.androidide.common.R; import com.itsaky.androidide.common.databinding.LayoutColorPickerBinding; diff --git a/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java b/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java index efb45c485..f6cb58c5b 100755 --- a/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java +++ b/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.managers; import androidx.annotation.NonNull; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.ResourceUtils; @@ -25,9 +26,11 @@ import com.blankj.utilcode.util.ZipUtils; import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.utils.Environment; import com.itsaky.androidide.utils.Logger; + +import org.jetbrains.annotations.Contract; + import java.io.File; import java.io.IOException; -import org.jetbrains.annotations.Contract; public class ToolsManager { diff --git a/common/src/main/java/com/itsaky/androidide/shell/CommonProcessExecutor.java b/common/src/main/java/com/itsaky/androidide/shell/CommonProcessExecutor.java index 3792a8e1b..c120a59d7 100755 --- a/common/src/main/java/com/itsaky/androidide/shell/CommonProcessExecutor.java +++ b/common/src/main/java/com/itsaky/androidide/shell/CommonProcessExecutor.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.shell; import com.itsaky.androidide.utils.Environment; + import java.io.File; import java.io.IOException; import java.util.Map; diff --git a/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java b/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java index f1ced59db..8d56d3314 100755 --- a/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java +++ b/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java @@ -20,7 +20,9 @@ package com.itsaky.androidide.shell; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; + import java.io.BufferedReader; import java.io.Closeable; import java.io.File; diff --git a/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java b/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java index 162cc6d10..5c2204f58 100644 --- a/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java +++ b/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java @@ -22,12 +22,15 @@ import static com.itsaky.androidide.utils.Environment.SYSROOT; import android.content.Context; import android.system.ErrnoException; import android.system.Os; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.util.Pair; + import com.blankj.utilcode.util.FileUtils; import com.itsaky.androidide.common.R; import com.itsaky.androidide.managers.ToolsManager; + import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; diff --git a/common/src/main/java/com/itsaky/androidide/utils/CharSequenceReader.java b/common/src/main/java/com/itsaky/androidide/utils/CharSequenceReader.java index 8a0e4800f..154883081 100644 --- a/common/src/main/java/com/itsaky/androidide/utils/CharSequenceReader.java +++ b/common/src/main/java/com/itsaky/androidide/utils/CharSequenceReader.java @@ -17,6 +17,7 @@ package com.itsaky.androidide.utils; import androidx.annotation.NonNull; + import java.io.Reader; import java.io.Serializable; import java.util.Objects; diff --git a/common/src/main/java/com/itsaky/androidide/utils/Environment.java b/common/src/main/java/com/itsaky/androidide/utils/Environment.java index bf7bcf197..8402e52b3 100755 --- a/common/src/main/java/com/itsaky/androidide/utils/Environment.java +++ b/common/src/main/java/com/itsaky/androidide/utils/Environment.java @@ -18,10 +18,13 @@ package com.itsaky.androidide.utils; import android.annotation.SuppressLint; import android.os.Build; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; import com.itsaky.androidide.app.BaseApplication; + import java.io.File; import java.io.StringReader; import java.util.ArrayList; diff --git a/common/src/main/java/com/itsaky/androidide/utils/FileUtil.java b/common/src/main/java/com/itsaky/androidide/utils/FileUtil.java index d89cd33d3..db8165a4b 100755 --- a/common/src/main/java/com/itsaky/androidide/utils/FileUtil.java +++ b/common/src/main/java/com/itsaky/androidide/utils/FileUtil.java @@ -42,6 +42,7 @@ import android.os.Environment; import android.provider.DocumentsContract; import android.provider.MediaStore; import android.text.TextUtils; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/common/src/main/java/com/itsaky/androidide/utils/Logger.java b/common/src/main/java/com/itsaky/androidide/utils/Logger.java index 43220f99a..dfcb51093 100755 --- a/common/src/main/java/com/itsaky/androidide/utils/Logger.java +++ b/common/src/main/java/com/itsaky/androidide/utils/Logger.java @@ -18,12 +18,16 @@ package com.itsaky.androidide.utils; import android.util.Log; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.ThrowableUtils; + +import org.jetbrains.annotations.Contract; + import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.jetbrains.annotations.Contract; /** * Logger for the IDE. diff --git a/common/src/main/java/com/itsaky/androidide/utils/StudioUtils.java b/common/src/main/java/com/itsaky/androidide/utils/StudioUtils.java index 090386400..1922ac01a 100755 --- a/common/src/main/java/com/itsaky/androidide/utils/StudioUtils.java +++ b/common/src/main/java/com/itsaky/androidide/utils/StudioUtils.java @@ -19,6 +19,7 @@ package com.itsaky.androidide.utils; import android.content.Context; import android.util.TypedValue; + import com.itsaky.toaster.Toaster; public class StudioUtils { diff --git a/common/src/main/java/com/itsaky/androidide/utils/TypefaceUtils.java b/common/src/main/java/com/itsaky/androidide/utils/TypefaceUtils.java index 584a273ae..acef986c1 100755 --- a/common/src/main/java/com/itsaky/androidide/utils/TypefaceUtils.java +++ b/common/src/main/java/com/itsaky/androidide/utils/TypefaceUtils.java @@ -18,6 +18,7 @@ package com.itsaky.androidide.utils; import android.graphics.Typeface; + import com.itsaky.androidide.app.BaseApplication; public class TypefaceUtils { diff --git a/common/src/main/java/com/itsaky/toaster/ToastWrapper.java b/common/src/main/java/com/itsaky/toaster/ToastWrapper.java index 54d6b1c9e..ef3171a4c 100755 --- a/common/src/main/java/com/itsaky/toaster/ToastWrapper.java +++ b/common/src/main/java/com/itsaky/toaster/ToastWrapper.java @@ -27,6 +27,7 @@ import android.graphics.Color; import android.util.AttributeSet; import android.view.ViewAnimationUtils; import android.widget.LinearLayout; + import com.google.android.material.animation.ArgbEvaluatorCompat; public class ToastWrapper extends LinearLayout { diff --git a/common/src/main/java/com/itsaky/toaster/Toaster.java b/common/src/main/java/com/itsaky/toaster/Toaster.java index f6dd4a277..5121cfc3d 100755 --- a/common/src/main/java/com/itsaky/toaster/Toaster.java +++ b/common/src/main/java/com/itsaky/toaster/Toaster.java @@ -25,6 +25,7 @@ import android.graphics.drawable.GradientDrawable; import android.util.TypedValue; import android.view.LayoutInflater; import android.widget.Toast; + import androidx.core.content.ContextCompat; import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat; diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButton.java b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButton.java index 114798c50..bc757768a 100755 --- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButton.java +++ b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButton.java @@ -1,6 +1,7 @@ package com.itsaky.androidide.views.virtualkeys; import androidx.annotation.NonNull; + import java.util.HashMap; /** The {@link Class} that implements special buttons for {@link VirtualKeysView}. */ diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButtonState.java b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButtonState.java index 4e710975c..9ae82ba38 100755 --- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButtonState.java +++ b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButtonState.java @@ -1,6 +1,7 @@ package com.itsaky.androidide.views.virtualkeys; import android.widget.Button; + import java.util.ArrayList; import java.util.List; diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeyButton.java b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeyButton.java index 06181a58d..f3d3bdb22 100755 --- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeyButton.java +++ b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeyButton.java @@ -1,13 +1,16 @@ package com.itsaky.androidide.views.virtualkeys; import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import java.util.Arrays; -import java.util.stream.Collectors; + import org.json.JSONException; import org.json.JSONObject; +import java.util.Arrays; +import java.util.stream.Collectors; + public class VirtualKeyButton { /** diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysConstants.java b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysConstants.java index d9faf4703..6829dac43 100755 --- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysConstants.java +++ b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysConstants.java @@ -1,6 +1,7 @@ package com.itsaky.androidide.views.virtualkeys; import android.view.KeyEvent; + import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysInfo.java b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysInfo.java index b6383a7cd..507e62963 100755 --- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysInfo.java +++ b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysInfo.java @@ -2,8 +2,11 @@ package com.itsaky.androidide.views.virtualkeys; import android.view.View; import android.widget.Button; + import androidx.annotation.NonNull; + import com.itsaky.androidide.views.virtualkeys.VirtualKeysConstants.EXTRA_KEY_DISPLAY_MAPS; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -33,19 +36,20 @@ import org.json.JSONObject; * *

Examples: {@code # Empty: [] * - *

# Single row: [[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]] + *

# Single row: [[ESC, TAB, CTRL, ALT, {key: '-', + * popup: '|'}, DOWN, UP]] * - *

# 2 row: [['ESC','/',{key: '-', popup: '|'},'HOME','UP','END','PGUP'], - * ['TAB','CTRL','ALT','LEFT','DOWN','RIGHT','PGDN']] + *

# 2 row: [['ESC','/',{key: '-', popup: + * '|'},'HOME','UP','END','PGUP'], ['TAB','CTRL','ALT','LEFT','DOWN','RIGHT','PGDN']] * - *

# Advance: [[ {key: ESC, popup: {macro: "CTRL f d", display: "tmux - * exit"}}, {key: CTRL, popup: {macro: "CTRL f BKSP", display: "tmux ←"}}, {key: ALT, popup: {macro: - * "CTRL f TAB", display: "tmux →"}}, {key: TAB, popup: {macro: "ALT a", display: A-a}}, {key: LEFT, - * popup: HOME}, {key: DOWN, popup: PGDN}, {key: UP, popup: PGUP}, {key: RIGHT, popup: END}, {macro: - * "ALT j", display: A-j, popup: {macro: "ALT g", display: A-g}}, {key: KEYBOARD, popup: {macro: - * "CTRL d", display: exit}} ]] + *

# Advance: [[ {key: ESC, popup: {macro: "CTRL f d", + * display: "tmux exit"}}, {key: CTRL, popup: {macro: "CTRL f BKSP", display: "tmux ←"}}, {key: ALT, + * popup: {macro: "CTRL f TAB", display: "tmux →"}}, {key: TAB, popup: {macro: "ALT a", display: + * A-a}}, {key: LEFT, popup: HOME}, {key: DOWN, popup: PGDN}, {key: UP, popup: PGUP}, {key: RIGHT, + * popup: END}, {macro: "ALT j", display: A-j, popup: {macro: "ALT g", display: A-g}}, {key: + * KEYBOARD, popup: {macro: "CTRL d", display: exit}} ]] * - *

} + *

} * *

Aliases are also allowed for the keys that you can pass as {@code extraKeyAliasMap}. Check * {@link VirtualKeysConstants#CONTROL_CHARS_ALIASES}. diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysView.java b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysView.java index 2e51e74d9..3dd96fc68 100755 --- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysView.java +++ b/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysView.java @@ -16,8 +16,10 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.GridLayout; import android.widget.PopupWindow; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/emulatorview/src/main/java/com/itsaky/terminal/TerminalEmulator.java b/emulatorview/src/main/java/com/itsaky/terminal/TerminalEmulator.java index f5cb8b21f..b442292a8 100755 --- a/emulatorview/src/main/java/com/itsaky/terminal/TerminalEmulator.java +++ b/emulatorview/src/main/java/com/itsaky/terminal/TerminalEmulator.java @@ -1,6 +1,7 @@ package com.itsaky.terminal; import android.util.Base64; + import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Locale; diff --git a/emulatorview/src/main/java/com/itsaky/terminal/TerminalSession.java b/emulatorview/src/main/java/com/itsaky/terminal/TerminalSession.java index fa708a383..18efa2c8e 100755 --- a/emulatorview/src/main/java/com/itsaky/terminal/TerminalSession.java +++ b/emulatorview/src/main/java/com/itsaky/terminal/TerminalSession.java @@ -6,6 +6,7 @@ import android.os.Message; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; + import java.io.File; import java.io.FileDescriptor; import java.io.FileInputStream; diff --git a/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalRenderer.java b/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalRenderer.java index 44ca3ffc3..cb23c0d73 100755 --- a/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalRenderer.java +++ b/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalRenderer.java @@ -4,6 +4,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.Typeface; + import com.itsaky.terminal.TerminalBuffer; import com.itsaky.terminal.TerminalEmulator; import com.itsaky.terminal.TerminalRow; diff --git a/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalView.java b/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalView.java index d7ed80561..8d46e6670 100755 --- a/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalView.java +++ b/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalView.java @@ -29,7 +29,9 @@ import android.view.inputmethod.BaseInputConnection; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; import android.widget.Scroller; + import androidx.annotation.RequiresApi; + import com.itsaky.terminal.KeyHandler; import com.itsaky.terminal.TerminalEmulator; import com.itsaky.terminal.TerminalSession; diff --git a/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalViewClient.java b/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalViewClient.java index 2132f8028..3ec54d8b5 100755 --- a/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalViewClient.java +++ b/emulatorview/src/main/java/com/itsaky/terminal/view/TerminalViewClient.java @@ -4,6 +4,7 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.ScaleGestureDetector; import android.view.View; + import com.itsaky.terminal.TerminalSession; /** diff --git a/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/CursorController.java b/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/CursorController.java index f6ec6e874..828169455 100755 --- a/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/CursorController.java +++ b/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/CursorController.java @@ -2,6 +2,7 @@ package com.itsaky.terminal.view.textselection; import android.view.MotionEvent; import android.view.ViewTreeObserver; + import com.itsaky.terminal.view.TerminalView; /** diff --git a/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/TextSelectionCursorController.java b/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/TextSelectionCursorController.java index ceb1efc4e..596dec74e 100755 --- a/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/TextSelectionCursorController.java +++ b/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/TextSelectionCursorController.java @@ -10,6 +10,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; + import com.itsaky.terminal.TerminalBuffer; import com.itsaky.terminal.WcWidth; import com.itsaky.terminal.view.R; diff --git a/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/TextSelectionHandleView.java b/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/TextSelectionHandleView.java index a6d362edb..573b65c7d 100755 --- a/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/TextSelectionHandleView.java +++ b/emulatorview/src/main/java/com/itsaky/terminal/view/textselection/TextSelectionHandleView.java @@ -11,6 +11,7 @@ import android.view.ViewGroup; import android.view.ViewParent; import android.view.WindowManager; import android.widget.PopupWindow; + import com.itsaky.terminal.view.R; import com.itsaky.terminal.view.TerminalView; diff --git a/lexers/src/main/java/com/itsaky/androidide/lexers/groovy/GroovyLexer.java b/lexers/src/main/java/com/itsaky/androidide/lexers/groovy/GroovyLexer.java index 0407077e2..f44ae13fd 100755 --- a/lexers/src/main/java/com/itsaky/androidide/lexers/groovy/GroovyLexer.java +++ b/lexers/src/main/java/com/itsaky/androidide/lexers/groovy/GroovyLexer.java @@ -20,8 +20,6 @@ // Generated from GroovyLexer.g4 by ANTLR 4.9.2 package com.itsaky.androidide.lexers.groovy; -import java.io.IOException; -import java.io.StringReader; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.Lexer; @@ -34,6 +32,9 @@ import org.antlr.v4.runtime.atn.LexerATNSimulator; import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; +import java.io.IOException; +import java.io.StringReader; + @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class GroovyLexer extends Lexer { static { diff --git a/lexers/src/main/java/com/itsaky/androidide/lexers/java/JavaParser.java b/lexers/src/main/java/com/itsaky/androidide/lexers/java/JavaParser.java index 4b666a83f..bab0bee84 100755 --- a/lexers/src/main/java/com/itsaky/androidide/lexers/java/JavaParser.java +++ b/lexers/src/main/java/com/itsaky/androidide/lexers/java/JavaParser.java @@ -20,13 +20,14 @@ // Generated from JavaParser.g4 by ANTLR 4.9.2 package com.itsaky.androidide.lexers.java; -import java.util.List; import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.misc.*; import org.antlr.v4.runtime.tree.*; +import java.util.List; + @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JavaParser extends Parser { static { diff --git a/lexers/src/main/java/com/itsaky/androidide/lexers/javadoc/JavadocParser.java b/lexers/src/main/java/com/itsaky/androidide/lexers/javadoc/JavadocParser.java index 8b835e79d..f8121adb2 100755 --- a/lexers/src/main/java/com/itsaky/androidide/lexers/javadoc/JavadocParser.java +++ b/lexers/src/main/java/com/itsaky/androidide/lexers/javadoc/JavadocParser.java @@ -20,13 +20,14 @@ // Generated from JavadocParser.g4 by ANTLR 4.9.2 package com.itsaky.androidide.antlr4.javadoc; -import java.util.List; import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.misc.*; import org.antlr.v4.runtime.tree.*; +import java.util.List; + @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JavadocParser extends Parser { static { diff --git a/lexers/src/main/java/com/itsaky/androidide/lexers/xml/XMLParser.java b/lexers/src/main/java/com/itsaky/androidide/lexers/xml/XMLParser.java index 9f8677e25..68fa7daed 100644 --- a/lexers/src/main/java/com/itsaky/androidide/lexers/xml/XMLParser.java +++ b/lexers/src/main/java/com/itsaky/androidide/lexers/xml/XMLParser.java @@ -2,13 +2,14 @@ // D:/Projects/AndroidStudioProjects/AndroidIDE/lexers/src/main/java/com/itsaky/androidide/lexers/xml\XMLParser.g4 by ANTLR 4.9.2 package com.itsaky.androidide.lexers.xml; -import java.util.List; import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.misc.*; import org.antlr.v4.runtime.tree.*; +import java.util.List; + @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class XMLParser extends Parser { static { diff --git a/lsp/api/src/main/java/com/itsaky/lsp/api/ICompletionProvider.java b/lsp/api/src/main/java/com/itsaky/lsp/api/ICompletionProvider.java index 207eebe9a..62b0affb8 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/api/ICompletionProvider.java +++ b/lsp/api/src/main/java/com/itsaky/lsp/api/ICompletionProvider.java @@ -35,8 +35,10 @@ package com.itsaky.lsp.api; import androidx.annotation.NonNull; + import com.itsaky.lsp.models.CompletionParams; import com.itsaky.lsp.models.CompletionResult; + import java.nio.file.Files; import java.nio.file.Path; diff --git a/lsp/api/src/main/java/com/itsaky/lsp/api/IDocumentHandler.java b/lsp/api/src/main/java/com/itsaky/lsp/api/IDocumentHandler.java index bc65626d0..79e4071bc 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/api/IDocumentHandler.java +++ b/lsp/api/src/main/java/com/itsaky/lsp/api/IDocumentHandler.java @@ -18,10 +18,12 @@ package com.itsaky.lsp.api; import androidx.annotation.NonNull; + import com.itsaky.lsp.models.DocumentChangeEvent; import com.itsaky.lsp.models.DocumentCloseEvent; import com.itsaky.lsp.models.DocumentOpenEvent; import com.itsaky.lsp.models.DocumentSaveEvent; + import java.nio.file.Path; /** diff --git a/lsp/api/src/main/java/com/itsaky/lsp/api/ILanguageServer.java b/lsp/api/src/main/java/com/itsaky/lsp/api/ILanguageServer.java index 4bbb8d5b8..0da9b611d 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/api/ILanguageServer.java +++ b/lsp/api/src/main/java/com/itsaky/lsp/api/ILanguageServer.java @@ -35,6 +35,7 @@ package com.itsaky.lsp.api; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.lsp.models.CodeActionParams; import com.itsaky.lsp.models.CodeActionResult; import com.itsaky.lsp.models.DefinitionParams; @@ -48,6 +49,7 @@ import com.itsaky.lsp.models.ReferenceResult; import com.itsaky.lsp.models.ServerCapabilities; import com.itsaky.lsp.models.SignatureHelp; import com.itsaky.lsp.models.SignatureHelpParams; + import java.nio.file.Path; import java.util.List; diff --git a/lsp/api/src/main/java/com/itsaky/lsp/util/DiagnosticUtil.java b/lsp/api/src/main/java/com/itsaky/lsp/util/DiagnosticUtil.java index 252dd4c00..38c2b6b4d 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/util/DiagnosticUtil.java +++ b/lsp/api/src/main/java/com/itsaky/lsp/util/DiagnosticUtil.java @@ -18,9 +18,11 @@ package com.itsaky.lsp.util; import androidx.annotation.NonNull; + import com.itsaky.lsp.models.DiagnosticItem; import com.itsaky.lsp.models.Position; import com.itsaky.lsp.models.Range; + import java.util.Collections; import java.util.List; diff --git a/lsp/api/src/main/java/com/itsaky/lsp/util/NoDocumentHandler.java b/lsp/api/src/main/java/com/itsaky/lsp/util/NoDocumentHandler.java index 47ede0467..ba1e854cc 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/util/NoDocumentHandler.java +++ b/lsp/api/src/main/java/com/itsaky/lsp/util/NoDocumentHandler.java @@ -18,11 +18,13 @@ package com.itsaky.lsp.util; import androidx.annotation.NonNull; + import com.itsaky.lsp.api.IDocumentHandler; import com.itsaky.lsp.models.DocumentChangeEvent; import com.itsaky.lsp.models.DocumentCloseEvent; import com.itsaky.lsp.models.DocumentOpenEvent; import com.itsaky.lsp.models.DocumentSaveEvent; + import java.nio.file.Path; /** diff --git a/lsp/api/src/main/java/com/itsaky/lsp/util/PrefBasedServerSettings.java b/lsp/api/src/main/java/com/itsaky/lsp/util/PrefBasedServerSettings.java index b8160817e..977580f3c 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/util/PrefBasedServerSettings.java +++ b/lsp/api/src/main/java/com/itsaky/lsp/util/PrefBasedServerSettings.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.util; import androidx.annotation.Nullable; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.managers.PreferenceManager; import com.itsaky.lsp.api.IServerSettings; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/Doc.java b/lsp/java/src/main/java/com/google/googlejavaformat/Doc.java index 37e8b9d5f..493478216 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/Doc.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/Doc.java @@ -15,6 +15,7 @@ package com.google.googlejavaformat; import static com.google.common.collect.Iterables.getLast; + import static java.lang.Math.max; import com.google.common.base.MoreObjects; @@ -22,6 +23,7 @@ import com.google.common.collect.DiscreteDomain; import com.google.common.collect.Iterators; import com.google.common.collect.Range; import com.google.googlejavaformat.Output.BreakTag; + import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/DocBuilder.java b/lsp/java/src/main/java/com/google/googlejavaformat/DocBuilder.java index 79ed63afe..c5dccc9c2 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/DocBuilder.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/DocBuilder.java @@ -15,6 +15,7 @@ package com.google.googlejavaformat; import com.google.common.base.MoreObjects; + import java.util.ArrayDeque; import java.util.List; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/InputOutput.java b/lsp/java/src/main/java/com/google/googlejavaformat/InputOutput.java index 039f8803c..be7237add 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/InputOutput.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/InputOutput.java @@ -17,6 +17,7 @@ package com.google.googlejavaformat; import com.google.common.collect.DiscreteDomain; import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/Newlines.java b/lsp/java/src/main/java/com/google/googlejavaformat/Newlines.java index d638155d7..e95adbcaf 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/Newlines.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/Newlines.java @@ -17,6 +17,7 @@ package com.google.googlejavaformat; import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; + import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/OpsBuilder.java b/lsp/java/src/main/java/com/google/googlejavaformat/OpsBuilder.java index c201f9ad5..c3e85fec0 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/OpsBuilder.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/OpsBuilder.java @@ -28,6 +28,7 @@ import com.google.googlejavaformat.Indent.Const; import com.google.googlejavaformat.Input.Tok; import com.google.googlejavaformat.Input.Token; import com.google.googlejavaformat.Output.BreakTag; + import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/Output.java b/lsp/java/src/main/java/com/google/googlejavaformat/Output.java index 90408ffff..3dcdd2d6e 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/Output.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/Output.java @@ -17,6 +17,7 @@ package com.google.googlejavaformat; import com.google.common.base.MoreObjects; import com.google.common.collect.Range; import com.google.googlejavaformat.OpsBuilder.BlankLineWanted; + import java.util.Optional; /** An output from the formatter. */ diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java index f42db47c7..573aa9db5 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java @@ -2,6 +2,7 @@ package com.google.googlejavaformat.java; import com.google.googlejavaformat.Input; import com.sun.source.tree.AnnotationTree; + import javax.annotation.processing.Generated; @Generated("com.google.auto.value.processor.AutoOneOfProcessor") diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java index d8b063579..612d98ad9 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java @@ -2,6 +2,7 @@ package com.google.googlejavaformat.java; import com.google.common.collect.ImmutableList; import com.sun.source.tree.AnnotationTree; + import javax.annotation.processing.Generated; @Generated("com.google.auto.value.processor.AutoValueProcessor") diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java index 0454864a2..3cb9101bc 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java @@ -16,6 +16,7 @@ package com.google.googlejavaformat.java; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableRangeSet; + import java.util.Optional; /** diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java index 1916d06e3..25c9a62a6 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java @@ -20,6 +20,7 @@ import com.google.common.base.CharMatcher; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; + import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Files; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java index c3c2385a4..de61f25aa 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java @@ -20,6 +20,7 @@ import com.sun.source.tree.AnnotationTree; import com.sun.source.tree.ArrayTypeTree; import com.sun.source.tree.Tree; import com.sun.tools.javac.tree.JCTree; + import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collections; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java index a388f4b81..f7bca19e7 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java @@ -17,6 +17,7 @@ package com.google.googlejavaformat.java; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; + import java.util.concurrent.Callable; /** diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/Formatter.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/Formatter.java index 3ce7e04f9..bbaf55068 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/Formatter.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/Formatter.java @@ -16,6 +16,7 @@ package com.google.googlejavaformat.java; import static com.google.common.base.StandardSystemProperty.JAVA_CLASS_VERSION; import static com.google.common.base.StandardSystemProperty.JAVA_SPECIFICATION_VERSION; + import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; @@ -40,6 +41,7 @@ import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.Log; import com.sun.tools.javac.util.Options; + import java.io.IOError; import java.io.IOException; import java.lang.reflect.Method; @@ -47,6 +49,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.DiagnosticListener; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/FormatterException.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/FormatterException.java index 2798b902e..236782227 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/FormatterException.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/FormatterException.java @@ -19,7 +19,9 @@ import static java.util.Locale.ENGLISH; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.googlejavaformat.FormatterDiagnostic; + import java.util.List; + import javax.tools.Diagnostic; import javax.tools.JavaFileObject; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java.template b/lsp/java/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java.template index 88706fbf1..6c3244689 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java.template +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java.template @@ -16,7 +16,7 @@ package com.google.googlejavaformat.java; class GoogleJavaFormatVersion { - static String version() { - return "%VERSION%"; - } + static String version() { + return "%VERSION%"; + } } diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java index e2dd6c464..0cfccef93 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java @@ -26,6 +26,7 @@ import com.google.googlejavaformat.Newlines; import com.google.googlejavaformat.java.JavaFormatterOptions.Style; import com.google.googlejavaformat.java.JavaInput.Tok; import com.sun.tools.javac.parser.Tokens.TokenKind; + import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java index 7cc71b2cc..7147474ed 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java @@ -20,6 +20,7 @@ import com.google.googlejavaformat.CommentsHelper; import com.google.googlejavaformat.Input.Tok; import com.google.googlejavaformat.Newlines; import com.google.googlejavaformat.java.javadoc.JavadocFormatter; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaInput.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaInput.java index 7111bc72c..d9b306f8d 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaInput.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaInput.java @@ -16,6 +16,7 @@ package com.google.googlejavaformat.java; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.getLast; + import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.MoreObjects; @@ -40,12 +41,14 @@ import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.Log; import com.sun.tools.javac.util.Log.DeferredDiagnosticHandler; import com.sun.tools.javac.util.Options; + import java.io.IOException; import java.net.URI; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; + import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.DiagnosticListener; @@ -465,7 +468,8 @@ public final class JavaInput extends Input { } else { if (strings.size() != 1 && !tokText.equals(originalTokText)) { throw new FormatterException( - "Unicode escapes not allowed in whitespace or multi-character operators"); + "Unicode escapes not allowed in whitespace or multi-character" + + " operators"); } for (String str : strings) { toks.add( diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java index a82f81682..422b4420e 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java @@ -41,6 +41,7 @@ import static com.sun.source.tree.Tree.Kind.NEW_CLASS; import static com.sun.source.tree.Tree.Kind.STRING_LITERAL; import static com.sun.source.tree.Tree.Kind.UNION_TYPE; import static com.sun.source.tree.Tree.Kind.VARIABLE; + import static java.util.stream.Collectors.toList; import com.google.auto.value.AutoOneOf; @@ -144,6 +145,9 @@ import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; import com.sun.tools.javac.tree.TreeScanner; + +import org.checkerframework.checker.nullness.qual.Nullable; + import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; @@ -157,8 +161,8 @@ import java.util.Optional; import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Stream; + import javax.lang.model.element.Name; -import org.checkerframework.checker.nullness.qual.Nullable; /** * An AST visitor that builds a stream of {@link Op}s to format from the given {@link diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaOutput.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaOutput.java index e41e4fa16..8c83d3e9e 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaOutput.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavaOutput.java @@ -31,6 +31,7 @@ import com.google.googlejavaformat.Input.Token; import com.google.googlejavaformat.Newlines; import com.google.googlejavaformat.OpsBuilder.BlankLineWanted; import com.google.googlejavaformat.Output; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavacTokens.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavacTokens.java index 02d6ab37d..d950964e2 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/JavacTokens.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/JavacTokens.java @@ -27,6 +27,7 @@ import com.sun.tools.javac.parser.Tokens.Token; import com.sun.tools.javac.parser.Tokens.TokenKind; import com.sun.tools.javac.parser.UnicodeReader; import com.sun.tools.javac.util.Context; + import java.util.Set; /** A wrapper around javac's lexer. */ diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/Main.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/Main.java index c4c9deef9..3be7f28a3 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/Main.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/Main.java @@ -20,6 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.ByteStreams; import com.google.googlejavaformat.FormatterDiagnostic; import com.google.googlejavaformat.java.JavaFormatterOptions.Style; + import java.io.IOError; import java.io.IOException; import java.io.InputStream; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java index 6f3d0e56f..a9f4c8390 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java @@ -24,6 +24,7 @@ import com.google.common.collect.TreeRangeMap; import com.google.googlejavaformat.Input.Tok; import com.google.googlejavaformat.Input.Token; import com.sun.tools.javac.parser.Tokens.TokenKind; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -31,6 +32,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; + import javax.lang.model.element.Modifier; /** Fixes sequences of modifiers to be in JLS order. */ diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java index 526fd07e9..719e8bbd2 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java @@ -54,6 +54,7 @@ import com.sun.tools.javac.tree.JCTree.JCImport; import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.Log; import com.sun.tools.javac.util.Options; + import java.io.IOError; import java.io.IOException; import java.lang.reflect.Method; @@ -62,6 +63,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; + import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.DiagnosticListener; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/Replacement.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/Replacement.java index b6f728a9d..022706452 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/Replacement.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/Replacement.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.Range; + import java.util.Objects; /** diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/SnippetFormatter.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/SnippetFormatter.java index e6abb978c..1557d9cb1 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/SnippetFormatter.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/SnippetFormatter.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; + import java.util.ArrayList; import java.util.List; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/StringWrapper.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/StringWrapper.java index b723e58b2..fa6ca9755 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/StringWrapper.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/StringWrapper.java @@ -15,6 +15,7 @@ package com.google.googlejavaformat.java; import static com.google.common.collect.Iterables.getLast; + import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.stream.Collectors.joining; @@ -41,6 +42,7 @@ import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.Log; import com.sun.tools.javac.util.Options; import com.sun.tools.javac.util.Position; + import java.io.IOException; import java.io.UncheckedIOException; import java.net.URI; @@ -52,6 +54,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Stream; + import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.DiagnosticListener; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/Trees.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/Trees.java index c52999093..ae02c3e0b 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/Trees.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/Trees.java @@ -26,8 +26,10 @@ import com.sun.source.util.TreePath; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.Pretty; import com.sun.tools.javac.tree.TreeInfo; + import java.io.IOError; import java.io.IOException; + import javax.lang.model.element.Name; /** Utilities for working with {@link Tree}s. */ diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/TypeNameClassifier.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/TypeNameClassifier.java index 13c0ceed9..0267becf2 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/TypeNameClassifier.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/TypeNameClassifier.java @@ -15,6 +15,7 @@ package com.google.googlejavaformat.java; import com.google.common.base.Verify; + import java.util.List; import java.util.Optional; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java index 9f3b27fe0..60d54a09e 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java @@ -17,14 +17,17 @@ package com.google.googlejavaformat.java.filer; import static com.google.common.base.Preconditions.checkNotNull; import com.google.googlejavaformat.java.Formatter; + +import org.checkerframework.checker.nullness.qual.Nullable; + import java.io.IOException; + import javax.annotation.processing.Filer; import javax.annotation.processing.Messager; import javax.lang.model.element.Element; import javax.tools.FileObject; import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; -import org.checkerframework.checker.nullness.qual.Nullable; /** * A decorating {@link Filer} implementation which formats Java source files with a {@link diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java index 1eb056237..7be1bf5c2 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java @@ -20,13 +20,16 @@ import com.google.common.io.CharSink; import com.google.common.io.CharSource; import com.google.googlejavaformat.java.Formatter; import com.google.googlejavaformat.java.FormatterException; + +import org.checkerframework.checker.nullness.qual.Nullable; + import java.io.IOException; import java.io.Writer; + import javax.annotation.processing.Messager; import javax.tools.Diagnostic; import javax.tools.ForwardingJavaFileObject; import javax.tools.JavaFileObject; -import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link JavaFileObject} decorator which {@linkplain Formatter formats} source code. */ final class FormattingJavaFileObject extends ForwardingJavaFileObject { diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java index 6bae5d2db..c5139e2e1 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java @@ -17,11 +17,13 @@ package com.google.googlejavaformat.java.javadoc; import static com.google.googlejavaformat.java.javadoc.JavadocLexer.lex; import static com.google.googlejavaformat.java.javadoc.Token.Type.BR_TAG; import static com.google.googlejavaformat.java.javadoc.Token.Type.PARAGRAPH_OPEN_TAG; + import static java.util.regex.Pattern.CASE_INSENSITIVE; import static java.util.regex.Pattern.compile; import com.google.common.collect.ImmutableList; import com.google.googlejavaformat.java.javadoc.JavadocLexer.LexException; + import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/lsp/java/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java b/lsp/java/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java index a5e704ffd..2275651e1 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java @@ -45,6 +45,7 @@ import static com.google.googlejavaformat.java.javadoc.Token.Type.PRE_OPEN_TAG; import static com.google.googlejavaformat.java.javadoc.Token.Type.TABLE_CLOSE_TAG; import static com.google.googlejavaformat.java.javadoc.Token.Type.TABLE_OPEN_TAG; import static com.google.googlejavaformat.java.javadoc.Token.Type.WHITESPACE; + import static java.lang.String.format; import static java.util.regex.Pattern.CASE_INSENSITIVE; import static java.util.regex.Pattern.DOTALL; @@ -54,6 +55,7 @@ import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableList; import com.google.common.collect.PeekingIterator; import com.google.googlejavaformat.java.javadoc.Token.Type; + import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; diff --git a/lsp/java/src/main/java/com/itsaky/androidide/utils/ClassBuilder.java b/lsp/java/src/main/java/com/itsaky/androidide/utils/ClassBuilder.java index 9663aa8af..b916ada80 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/utils/ClassBuilder.java +++ b/lsp/java/src/main/java/com/itsaky/androidide/utils/ClassBuilder.java @@ -3,6 +3,7 @@ package com.itsaky.androidide.utils; import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; + import javax.lang.model.element.Modifier; public class ClassBuilder { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/FileStore.java b/lsp/java/src/main/java/com/itsaky/lsp/java/FileStore.java index 78405c8ef..de2661210 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/FileStore.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/FileStore.java @@ -1,7 +1,9 @@ package com.itsaky.lsp.java; import android.text.TextUtils; + import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.CharSequenceInputStream; import com.itsaky.androidide.utils.CharSequenceReader; import com.itsaky.androidide.utils.Logger; @@ -10,6 +12,7 @@ import com.itsaky.lsp.models.DocumentChangeEvent; import com.itsaky.lsp.models.DocumentCloseEvent; import com.itsaky.lsp.models.DocumentOpenEvent; import com.itsaky.lsp.util.PathUtils; + import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.File; @@ -33,6 +36,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.TreeMap; + import javax.lang.model.element.TypeElement; public class FileStore { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java b/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java index 2b8bf8f07..96905f586 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java @@ -19,6 +19,7 @@ package com.itsaky.lsp.java; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.api.ICompletionProvider; import com.itsaky.lsp.api.IDocumentHandler; @@ -56,6 +57,7 @@ import com.itsaky.lsp.models.ServerCapabilities; import com.itsaky.lsp.models.SignatureHelp; import com.itsaky.lsp.models.SignatureHelpParams; import com.itsaky.lsp.util.NoCompletionsProvider; + import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/ActionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/ActionProvider.java index cb9b749b7..4b6e08c6b 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/ActionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/ActionProvider.java @@ -18,10 +18,12 @@ package com.itsaky.lsp.java.actions; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.models.CodeActionItem; import com.itsaky.lsp.models.DiagnosticItem; import com.itsaky.lsp.models.Range; + import java.nio.file.Path; import java.util.List; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/CursorCodeActionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/CursorCodeActionProvider.java index c206687f8..8db50d499 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/CursorCodeActionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/CursorCodeActionProvider.java @@ -40,6 +40,7 @@ import static com.itsaky.lsp.java.utils.CodeActionUtils.isBlankLine; import static com.itsaky.lsp.java.utils.CodeActionUtils.isInMethod; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; @@ -57,6 +58,9 @@ import com.sun.source.tree.ClassTree; import com.sun.source.tree.LineMap; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + +import org.jetbrains.annotations.Contract; + import java.nio.file.Path; import java.time.Duration; import java.time.Instant; @@ -66,13 +70,13 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.TreeMap; + import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; import javax.lang.model.util.Elements; -import org.jetbrains.annotations.Contract; /** * Provides code actions for the cursor range. diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileBatch.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileBatch.java index 51429ec4b..6e05824b6 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileBatch.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileBatch.java @@ -23,6 +23,7 @@ import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.java.parser.Parser; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.JavacTask; + import java.io.File; import java.io.IOException; import java.nio.file.Path; @@ -35,6 +36,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; import java.util.stream.Collectors; + import javax.lang.model.element.Name; import javax.tools.Diagnostic; import javax.tools.JavaFileObject; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileTask.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileTask.java index 24d9bc079..2548852c8 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileTask.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileTask.java @@ -18,10 +18,13 @@ package com.itsaky.lsp.java.compiler; import androidx.annotation.NonNull; + import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.JavacTask; + import java.nio.file.Path; import java.util.List; + import javax.tools.Diagnostic; import javax.tools.JavaFileObject; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompilerProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompilerProvider.java index 9c6f4e251..e638ca7e4 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompilerProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompilerProvider.java @@ -18,12 +18,14 @@ package com.itsaky.lsp.java.compiler; import com.itsaky.lsp.java.parser.ParseTask; + import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.Set; + import javax.tools.JavaFileObject; public interface CompilerProvider { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/JavaCompilerService.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/JavaCompilerService.java index 95958f7d0..ef6398a21 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/JavaCompilerService.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/JavaCompilerService.java @@ -27,6 +27,7 @@ import com.itsaky.lsp.java.utils.ScanClassPath; import com.itsaky.lsp.java.utils.StringSearch; import com.itsaky.lsp.java.visitors.FindTypeDeclarations; import com.sun.source.tree.CompilationUnitTree; + import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Path; @@ -43,6 +44,7 @@ import java.util.Set; import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.tools.Diagnostic; import javax.tools.JavaFileObject; import javax.tools.StandardLocation; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/ReusableCompiler.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/ReusableCompiler.java index 0334f6f2e..48bad3ab4 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/ReusableCompiler.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/ReusableCompiler.java @@ -39,12 +39,14 @@ import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.DefinedBy; import com.sun.tools.javac.util.DefinedBy.Api; import com.sun.tools.javac.util.Log; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.StreamSupport; + import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; import javax.tools.JavaFileManager; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SourceFileManager.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SourceFileManager.java index d397b4bb9..ad8c03e2f 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SourceFileManager.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SourceFileManager.java @@ -20,6 +20,7 @@ package com.itsaky.lsp.java.compiler; import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.java.utils.StringSearch; import com.sun.tools.javac.api.JavacTool; + import java.io.File; import java.io.IOException; import java.nio.charset.Charset; @@ -27,6 +28,7 @@ import java.nio.file.Path; import java.util.*; import java.util.logging.Logger; import java.util.stream.Stream; + import javax.tools.*; public class SourceFileManager extends ForwardingJavaFileManager { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SourceFileObject.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SourceFileObject.java index 746e74737..0c13ad79c 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SourceFileObject.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SourceFileObject.java @@ -19,6 +19,7 @@ package com.itsaky.lsp.java.compiler; import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.util.PathUtils; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.OutputStream; @@ -28,6 +29,7 @@ import java.io.Writer; import java.net.URI; import java.nio.file.Path; import java.time.Instant; + import javax.lang.model.element.Modifier; import javax.lang.model.element.NestingKind; import javax.tools.JavaFileObject; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SynchronizedTask.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SynchronizedTask.java index 7306867cf..56007b7a5 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SynchronizedTask.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SynchronizedTask.java @@ -35,10 +35,13 @@ package com.itsaky.lsp.java.compiler; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; + +import kotlin.jvm.functions.Function1; + import java.util.concurrent.Semaphore; import java.util.function.Consumer; -import kotlin.jvm.functions.Function1; public class SynchronizedTask { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/models/JavaServerSettings.java b/lsp/java/src/main/java/com/itsaky/lsp/java/models/JavaServerSettings.java index 149dbcae5..3f4cb8013 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/models/JavaServerSettings.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/models/JavaServerSettings.java @@ -17,6 +17,7 @@ package com.itsaky.lsp.java.models; import androidx.annotation.NonNull; + import com.itsaky.androidide.managers.PreferenceManager; import com.itsaky.lsp.util.PrefBasedServerSettings; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/parser/Parser.java b/lsp/java/src/main/java/com/itsaky/lsp/java/parser/Parser.java index a814972de..92d482ebe 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/parser/Parser.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/parser/Parser.java @@ -42,6 +42,7 @@ import com.sun.source.util.TreePath; import com.sun.source.util.TreeScanner; import com.sun.source.util.Trees; import com.sun.tools.javac.api.JavacTool; + import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; @@ -57,6 +58,7 @@ import java.util.Set; import java.util.StringJoiner; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.lang.model.element.Element; import javax.lang.model.element.Modifier; import javax.lang.model.element.Name; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeActionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeActionProvider.java index 5a38ca1c8..e5535765b 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeActionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeActionProvider.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.actions.ActionProvider; import com.itsaky.lsp.java.actions.CursorCodeActionProvider; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeFormatProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeFormatProvider.java index de2661ec6..0140d1fbe 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeFormatProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeFormatProvider.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; + import com.google.common.io.CharSink; import com.google.common.io.CharSource; import com.google.googlejavaformat.java.Formatter; @@ -25,6 +26,7 @@ import com.google.googlejavaformat.java.JavaFormatterOptions; import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.api.IServerSettings; import com.itsaky.lsp.java.models.JavaServerSettings; + import java.io.StringWriter; import java.io.Writer; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CompletionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CompletionProvider.java index 4fa4c0169..9217d9fdd 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CompletionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CompletionProvider.java @@ -958,7 +958,7 @@ public class CompletionProvider extends AbstractServiceProvider implements IComp } } sb.append(")"); - return sb.toString (); + return sb.toString(); } @Nullable diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DefinitionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DefinitionProvider.java index 5e79b12cc..d25e6da95 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DefinitionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DefinitionProvider.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; @@ -31,6 +32,7 @@ import com.itsaky.lsp.models.Location; import com.itsaky.lsp.util.PathUtils; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -38,6 +40,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Optional; + import javax.lang.model.element.Element; import javax.lang.model.element.Name; import javax.lang.model.element.TypeElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DiagnosticsProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DiagnosticsProvider.java index 3262e119c..7b6260d22 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DiagnosticsProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DiagnosticsProvider.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.visitors.DiagnosticVisitor; @@ -36,6 +37,7 @@ import com.sun.source.tree.VariableTree; import com.sun.source.util.SourcePositions; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -45,6 +47,7 @@ import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.lang.model.element.Element; import javax.lang.model.element.Name; import javax.tools.Diagnostic; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaDiagnosticProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaDiagnosticProvider.java index a4044a743..e6556fc72 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaDiagnosticProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaDiagnosticProvider.java @@ -18,10 +18,12 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SynchronizedTask; import com.itsaky.lsp.models.DiagnosticItem; + import java.nio.file.Path; import java.util.ArrayList; import java.util.List; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java index c5a7dd92b..0a3828ea7 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.visitors.FindBiggerRange; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/ReferenceProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/ReferenceProvider.java index a5fcddf01..60edfbbe4 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/ReferenceProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/ReferenceProvider.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SynchronizedTask; @@ -29,10 +30,12 @@ import com.itsaky.lsp.models.ReferenceParams; import com.itsaky.lsp.models.ReferenceResult; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.TreePath; + import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/SignatureProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/SignatureProvider.java index 7b888960d..dfae98891 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/SignatureProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/SignatureProvider.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SynchronizedTask; @@ -45,6 +46,7 @@ import com.sun.source.util.DocTrees; import com.sun.source.util.SourcePositions; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; @@ -52,6 +54,7 @@ import java.util.List; import java.util.Optional; import java.util.StringJoiner; import java.util.function.Predicate; + import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddException.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddException.java index 8dd2e88c0..1c3f12b31 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddException.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddException.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SynchronizedTask; import com.itsaky.lsp.java.utils.FindHelper; @@ -28,9 +29,11 @@ import com.sun.source.tree.LineMap; import com.sun.source.tree.MethodTree; import com.sun.source.util.SourcePositions; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.Collections; import java.util.Map; + import javax.lang.model.element.ExecutableElement; public class AddException extends Rewrite { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddImport.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddImport.java index 1dbef545b..2e338cad7 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddImport.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddImport.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.parser.ParseTask; import com.itsaky.lsp.models.Position; @@ -27,6 +28,7 @@ import com.sun.source.tree.ImportTree; import com.sun.source.tree.Tree; import com.sun.source.util.SourcePositions; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.Collections; import java.util.List; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddSuppressWarningAnnotation.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddSuppressWarningAnnotation.java index c072e8330..1a7969097 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddSuppressWarningAnnotation.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/AddSuppressWarningAnnotation.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SynchronizedTask; import com.itsaky.lsp.java.utils.EditHelper; @@ -29,9 +30,11 @@ import com.sun.source.tree.LineMap; import com.sun.source.tree.MethodTree; import com.sun.source.util.SourcePositions; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.Collections; import java.util.Map; + import javax.lang.model.element.ExecutableElement; public class AddSuppressWarningAnnotation extends Rewrite { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ConvertFieldToBlock.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ConvertFieldToBlock.java index 458474db0..9082ec9c8 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ConvertFieldToBlock.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ConvertFieldToBlock.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.parser.ParseTask; import com.itsaky.lsp.models.Position; @@ -28,9 +29,11 @@ import com.sun.source.tree.LineMap; import com.sun.source.tree.VariableTree; import com.sun.source.util.SourcePositions; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.Collections; import java.util.Map; + import javax.lang.model.element.Modifier; public class ConvertFieldToBlock extends Rewrite { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ConvertVariableToStatement.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ConvertVariableToStatement.java index 18f3940a4..826459b54 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ConvertVariableToStatement.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ConvertVariableToStatement.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.parser.ParseTask; import com.itsaky.lsp.java.visitors.FindVariableAtCursor; @@ -30,6 +31,7 @@ import com.sun.source.tree.Tree; import com.sun.source.tree.VariableTree; import com.sun.source.util.SourcePositions; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.Collections; import java.util.Map; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/CreateMissingMethod.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/CreateMissingMethod.java index dad31d6ae..5bdb8a242 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/CreateMissingMethod.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/CreateMissingMethod.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; @@ -38,11 +39,13 @@ import com.sun.source.tree.MethodTree; import com.sun.source.tree.Tree; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; import java.util.Map; import java.util.StringJoiner; + import javax.lang.model.element.Modifier; import javax.lang.model.element.Name; import javax.lang.model.type.DeclaredType; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateRecordConstructor.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateRecordConstructor.java index 791feea8f..2b992d80f 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateRecordConstructor.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateRecordConstructor.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; @@ -32,6 +33,7 @@ import com.sun.source.tree.Tree; import com.sun.source.tree.VariableTree; import com.sun.source.util.SourcePositions; import com.sun.source.util.Trees; + import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; @@ -40,6 +42,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.StringJoiner; + import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateSettersAndGetters.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateSettersAndGetters.java index 67d95dbc9..d63303982 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateSettersAndGetters.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateSettersAndGetters.java @@ -29,7 +29,6 @@ import com.itsaky.lsp.models.Range; import com.itsaky.lsp.models.TextEdit; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeName; -import com.sun.source.tree.ImportTree; import com.sun.source.tree.Tree; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; @@ -42,7 +41,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.TreeSet; -import java.util.stream.Collectors; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/NoRewrite.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/NoRewrite.java index 565f15cdb..7c643f9e3 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/NoRewrite.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/NoRewrite.java @@ -20,6 +20,7 @@ package com.itsaky.lsp.java.rewrite; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.models.CodeActionItem; import com.itsaky.lsp.models.TextEdit; + import java.nio.file.Path; import java.util.List; import java.util.Map; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/OverrideInheritedMethod.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/OverrideInheritedMethod.java index 57291c219..74e984640 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/OverrideInheritedMethod.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/OverrideInheritedMethod.java @@ -32,10 +32,12 @@ import com.sun.source.tree.Tree; import com.sun.source.util.SourcePositions; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.Collections; import java.util.Map; import java.util.Optional; + import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveClass.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveClass.java index 55b244a29..a56edd494 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveClass.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveClass.java @@ -18,12 +18,14 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.parser.ParseTask; import com.itsaky.lsp.java.utils.EditHelper; import com.itsaky.lsp.java.visitors.FindTypeDeclarationAt; import com.itsaky.lsp.models.TextEdit; import com.sun.source.tree.ClassTree; + import java.nio.file.Path; import java.util.Collections; import java.util.Map; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveException.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveException.java index 72baced6a..54646aa20 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveException.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveException.java @@ -31,12 +31,14 @@ import com.sun.source.util.JavacTask; import com.sun.source.util.SourcePositions; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + import java.io.IOException; import java.nio.file.Path; import java.util.Collections; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveMethod.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveMethod.java index d64204f86..a10d5b70b 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveMethod.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RemoveMethod.java @@ -22,9 +22,11 @@ import com.itsaky.lsp.java.utils.FindHelper; import com.itsaky.lsp.models.TextEdit; import com.sun.source.tree.MethodTree; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.Collections; import java.util.Map; + import javax.lang.model.element.ExecutableElement; public class RemoveMethod extends Rewrite { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/Rewrite.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/Rewrite.java index 835f7ed8a..cf6f36036 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/Rewrite.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/Rewrite.java @@ -18,11 +18,13 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.models.CodeActionItem; import com.itsaky.lsp.models.CodeActionKind; import com.itsaky.lsp.models.DocumentChange; import com.itsaky.lsp.models.TextEdit; + import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RewriteNotSupported.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RewriteNotSupported.java index d1a0c9daa..3ef605431 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RewriteNotSupported.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/RewriteNotSupported.java @@ -19,6 +19,7 @@ package com.itsaky.lsp.java.rewrite; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.models.TextEdit; + import java.nio.file.Path; import java.util.Map; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/AnalyzeTimer.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/AnalyzeTimer.java index 7a1f720c4..3d68c74e6 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/AnalyzeTimer.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/AnalyzeTimer.java @@ -18,7 +18,9 @@ package com.itsaky.lsp.java.utils; import android.os.Handler; + import androidx.annotation.NonNull; + import java.util.Objects; /** diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/Cache.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/Cache.java index d56861eb4..ecc097e0d 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/Cache.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/Cache.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.utils; import com.itsaky.lsp.java.FileStore; + import java.nio.file.Path; import java.time.Instant; import java.util.HashMap; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/CodeActionUtils.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/CodeActionUtils.java index e414404e8..7dcbb007e 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/CodeActionUtils.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/CodeActionUtils.java @@ -21,6 +21,7 @@ import static com.itsaky.androidide.utils.Logger.newInstance; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; @@ -39,16 +40,19 @@ import com.sun.source.util.TreePath; import com.sun.source.util.Trees; import com.sun.tools.javac.api.ClientCodeWrapper; import com.sun.tools.javac.util.JCDiagnostic; + +import org.jetbrains.annotations.Contract; + import java.io.IOException; import java.util.Collections; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic; import javax.tools.JavaFileObject; -import org.jetbrains.annotations.Contract; /** * @author Akash Yadav diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/Extractors.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/Extractors.java index 3b2477f25..3fd1a22b4 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/Extractors.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/Extractors.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.utils; import androidx.annotation.NonNull; + import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/FindHelper.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/FindHelper.java index 7c7cbfe1c..4cd0656d2 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/FindHelper.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/FindHelper.java @@ -37,11 +37,13 @@ import com.sun.source.tree.VariableTree; import com.sun.source.util.SourcePositions; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + import java.io.IOException; import java.net.URI; import java.nio.file.Paths; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/MarkdownHelper.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/MarkdownHelper.java index b5d7d9bae..0324a6474 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/MarkdownHelper.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/MarkdownHelper.java @@ -21,6 +21,13 @@ import com.itsaky.lsp.models.MarkupContent; import com.itsaky.lsp.models.MarkupKind; import com.sun.source.doctree.DocCommentTree; import com.sun.source.doctree.DocTree; + +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; @@ -31,6 +38,7 @@ import java.util.function.Function; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -40,11 +48,6 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; public class MarkdownHelper { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/MethodPtr.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/MethodPtr.java index c9ff067f2..3ff4301c9 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/MethodPtr.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/MethodPtr.java @@ -18,7 +18,9 @@ package com.itsaky.lsp.java.utils; import androidx.annotation.NonNull; + import com.sun.source.util.JavacTask; + import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/NavigationHelper.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/NavigationHelper.java index d04f48f89..c477a1308 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/NavigationHelper.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/NavigationHelper.java @@ -39,7 +39,9 @@ import com.itsaky.lsp.java.visitors.FindNameAt; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; + import java.nio.file.Path; + import javax.lang.model.element.Element; import javax.lang.model.element.Modifier; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScanClassPath.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScanClassPath.java index fc9434e62..ab17e8ae7 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScanClassPath.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScanClassPath.java @@ -19,8 +19,12 @@ package com.itsaky.lsp.java.utils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.common.reflect.ClassPath; import com.itsaky.androidide.utils.Logger; + +import org.jetbrains.annotations.Contract; + import java.io.File; import java.io.IOException; import java.lang.reflect.Method; @@ -40,7 +44,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.stream.Stream; -import org.jetbrains.annotations.Contract; public class ScanClassPath { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScopeHelper.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScopeHelper.java index b80801495..4be0223b7 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScopeHelper.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScopeHelper.java @@ -20,9 +20,11 @@ package com.itsaky.lsp.java.utils; import com.itsaky.lsp.java.compiler.CompileTask; import com.sun.source.tree.Scope; import com.sun.source.util.Trees; + import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; + import javax.lang.model.element.Element; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ShortTypePrinter.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ShortTypePrinter.java index 5f5c6390d..a34e09f8e 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ShortTypePrinter.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ShortTypePrinter.java @@ -2,6 +2,7 @@ package com.itsaky.lsp.java.utils; import java.util.StringJoiner; import java.util.stream.Collectors; + import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.element.VariableElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/StringSearch.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/StringSearch.java index 3826c3de6..6e374cf5d 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/StringSearch.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/StringSearch.java @@ -21,6 +21,7 @@ import com.itsaky.androidide.utils.CharSequenceReader; import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.util.StringUtils; + import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -40,6 +41,7 @@ import java.util.Arrays; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.lang.model.element.TypeElement; // Translated from https://golang.org/src/strings/search.go diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.java index a587a67f3..60b24944d 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.java @@ -34,11 +34,13 @@ import com.sun.source.util.JavacTask; import com.sun.source.util.TreePath; import com.sun.source.util.TreeScanner; import com.sun.source.util.Trees; + import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Objects; import java.util.Set; + import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java index 7fb9735ed..0b7e55ef5 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java @@ -19,6 +19,7 @@ package com.itsaky.lsp.java.visitors; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.models.Position; import com.itsaky.lsp.models.Range; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindMethodCallAt.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindMethodCallAt.java index 7db7251ef..8e5f5c0c6 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindMethodCallAt.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindMethodCallAt.java @@ -29,6 +29,7 @@ import com.sun.source.util.SourcePositions; import com.sun.source.util.TreePath; import com.sun.source.util.TreePathScanner; import com.sun.source.util.Trees; + import javax.lang.model.element.Element; import javax.lang.model.element.NestingKind; import javax.lang.model.element.TypeElement; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindNameAt.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindNameAt.java index 169ce9102..8786d82b7 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindNameAt.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindNameAt.java @@ -21,6 +21,7 @@ import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.utils.FindHelper; import com.sun.source.tree.*; import com.sun.source.util.*; + import javax.lang.model.element.Name; public class FindNameAt extends TreePathScanner { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindReferences.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindReferences.java index b854f9c42..4a38b211a 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindReferences.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindReferences.java @@ -25,7 +25,9 @@ import com.sun.source.util.JavacTask; import com.sun.source.util.TreePath; import com.sun.source.util.TreePathScanner; import com.sun.source.util.Trees; + import java.util.List; + import javax.lang.model.element.Element; public class FindReferences extends TreePathScanner> { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindTypeDeclarationNamed.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindTypeDeclarationNamed.java index 9234c24c9..53b410d7f 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindTypeDeclarationNamed.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindTypeDeclarationNamed.java @@ -19,6 +19,7 @@ package com.itsaky.lsp.java.visitors; import com.sun.source.tree.*; import com.sun.source.util.TreeScanner; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindTypeDeclarations.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindTypeDeclarations.java index db4fd0500..ce3a5226d 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindTypeDeclarations.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindTypeDeclarations.java @@ -19,6 +19,7 @@ package com.itsaky.lsp.java.visitors; import com.sun.source.tree.*; import com.sun.source.util.TreeScanner; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindVariablesBetween.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindVariablesBetween.java index 3a3ba4def..610b7487b 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindVariablesBetween.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindVariablesBetween.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.visitors; import androidx.annotation.NonNull; + import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.VariableTree; import com.sun.source.util.JavacTask; @@ -25,6 +26,7 @@ import com.sun.source.util.SourcePositions; import com.sun.source.util.TreePath; import com.sun.source.util.TreePathScanner; import com.sun.source.util.Trees; + import java.util.ArrayList; import java.util.List; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/PruneMethodBodies.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/PruneMethodBodies.java index d77b20d06..71f7f355a 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/PruneMethodBodies.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/PruneMethodBodies.java @@ -23,6 +23,7 @@ import com.sun.source.util.JavacTask; import com.sun.source.util.SourcePositions; import com.sun.source.util.TreeScanner; import com.sun.source.util.Trees; + import java.io.IOException; public class PruneMethodBodies extends TreeScanner { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/SemanticHighlighter.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/SemanticHighlighter.java index b846d3a72..e8a5a14fa 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/SemanticHighlighter.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/SemanticHighlighter.java @@ -20,6 +20,7 @@ package com.itsaky.lsp.java.visitors; import static android.text.TextUtils.substring; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.java.compiler.CompileTask; @@ -41,9 +42,11 @@ import com.sun.source.util.SourcePositions; import com.sun.source.util.TreePath; import com.sun.source.util.TreePathScanner; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; + import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/AnnotationSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/AnnotationSpec.java index 642fb19c4..78832e17a 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/AnnotationSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/AnnotationSpec.java @@ -31,6 +31,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; + import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/ArrayTypeName.java b/lsp/java/src/main/java/com/squareup/javapoet/ArrayTypeName.java index 8ad8085d9..cbcb527fb 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/ArrayTypeName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/ArrayTypeName.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import javax.lang.model.element.TypeParameterElement; import javax.lang.model.type.ArrayType; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/CodeBlock.java b/lsp/java/src/main/java/com/squareup/javapoet/CodeBlock.java index 12901fc15..75bc5306d 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/CodeBlock.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/CodeBlock.java @@ -26,6 +26,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collector; import java.util.stream.StreamSupport; + import javax.lang.model.element.Element; import javax.lang.model.type.TypeMirror; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java b/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java index df82f45f0..7b55c3229 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java @@ -19,6 +19,7 @@ import static com.squareup.javapoet.Util.checkArgument; import static com.squareup.javapoet.Util.checkNotNull; import static com.squareup.javapoet.Util.checkState; import static com.squareup.javapoet.Util.stringLiteralWithDoubleQuotes; + import static java.lang.String.join; import java.io.IOException; @@ -34,6 +35,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.regex.Pattern; + import javax.lang.model.SourceVersion; import javax.lang.model.element.Modifier; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/FieldSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/FieldSpec.java index a5fb0b504..ec95d309a 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/FieldSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/FieldSpec.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; + import javax.lang.model.SourceVersion; import javax.lang.model.element.Modifier; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java b/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java index 1dc4e63d2..d03ce1929 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java @@ -17,6 +17,7 @@ package com.squareup.javapoet; import static com.squareup.javapoet.Util.checkArgument; import static com.squareup.javapoet.Util.checkNotNull; + import static java.nio.charset.StandardCharsets.UTF_8; import java.io.ByteArrayInputStream; @@ -35,6 +36,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import java.util.TreeSet; + import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; import javax.tools.SimpleJavaFileObject; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/NameAllocator.java b/lsp/java/src/main/java/com/squareup/javapoet/NameAllocator.java index 3e9b26cb9..b96d54621 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/NameAllocator.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/NameAllocator.java @@ -22,6 +22,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import java.util.UUID; + import javax.lang.model.SourceVersion; /** diff --git a/lsp/java/src/main/java/com/squareup/javapoet/ParameterSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/ParameterSpec.java index e419668ff..17fd37e28 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/ParameterSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/ParameterSpec.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; + import javax.lang.model.SourceVersion; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/TypeName.java b/lsp/java/src/main/java/com/squareup/javapoet/TypeName.java index e74d7455f..fc6c7a942 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/TypeName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/TypeName.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeParameterElement; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/TypeSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/TypeSpec.java index 5a51e23c0..1c18232bf 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/TypeSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/TypeSpec.java @@ -35,6 +35,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.Modifier; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/TypeVariableName.java b/lsp/java/src/main/java/com/squareup/javapoet/TypeVariableName.java index e6a37329d..fc9351314 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/TypeVariableName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/TypeVariableName.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import javax.lang.model.element.TypeParameterElement; import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeVariable; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/Util.java b/lsp/java/src/main/java/com/squareup/javapoet/Util.java index 7c39715e0..950624e82 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/Util.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/Util.java @@ -26,6 +26,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; + import javax.lang.model.element.Modifier; /** diff --git a/lsp/java/src/main/java/com/squareup/javapoet/WildcardTypeName.java b/lsp/java/src/main/java/com/squareup/javapoet/WildcardTypeName.java index 95774d220..df8828839 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/WildcardTypeName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/WildcardTypeName.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import javax.lang.model.element.TypeParameterElement; import javax.lang.model.type.TypeMirror; diff --git a/lsp/java/src/main/java/com/sun/tools/javac/file/FSInfo.java b/lsp/java/src/main/java/com/sun/tools/javac/file/FSInfo.java index ac629c326..dfcbbaf53 100644 --- a/lsp/java/src/main/java/com/sun/tools/javac/file/FSInfo.java +++ b/lsp/java/src/main/java/com/sun/tools/javac/file/FSInfo.java @@ -27,6 +27,7 @@ package com.sun.tools.javac.file; import com.github.marschall.com.sun.nio.zipfs.ZipFileSystemProvider; import com.sun.tools.javac.util.Context; + import java.io.IOException; import java.nio.file.FileSystems; import java.nio.file.Files; diff --git a/lsp/java/src/main/java/com/sun/tools/javac/file/Locations.java b/lsp/java/src/main/java/com/sun/tools/javac/file/Locations.java index f4510a092..21644a009 100644 --- a/lsp/java/src/main/java/com/sun/tools/javac/file/Locations.java +++ b/lsp/java/src/main/java/com/sun/tools/javac/file/Locations.java @@ -30,6 +30,7 @@ import static com.sun.tools.javac.main.Option.ENDORSEDDIRS; import static com.sun.tools.javac.main.Option.EXTDIRS; import static com.sun.tools.javac.main.Option.XBOOTCLASSPATH_APPEND; import static com.sun.tools.javac.main.Option.XBOOTCLASSPATH_PREPEND; + import static javax.tools.StandardLocation.PLATFORM_CLASS_PATH; import com.sun.tools.javac.code.Lint; @@ -46,6 +47,10 @@ import com.sun.tools.javac.util.ListBuffer; import com.sun.tools.javac.util.Log; import com.sun.tools.javac.util.Pair; import com.sun.tools.javac.util.StringUtils; + +import jdk.internal.jmod.JmodFile; +import jdk.internal.jrtfs.JrtFileSystemProvider; + import java.io.Closeable; import java.io.File; import java.io.FileNotFoundException; @@ -87,6 +92,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.lang.model.SourceVersion; import javax.tools.JavaFileManager; import javax.tools.JavaFileManager.Location; @@ -94,8 +100,6 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardJavaFileManager.PathFactory; import javax.tools.StandardLocation; -import jdk.internal.jmod.JmodFile; -import jdk.internal.jrtfs.JrtFileSystemProvider; /** * This class converts command line arguments, environment variables and system properties (in diff --git a/lsp/java/src/main/java/jdk/internal/jrtfs/SystemImage.java b/lsp/java/src/main/java/jdk/internal/jrtfs/SystemImage.java index 6a4b7bfde..d62041bd1 100644 --- a/lsp/java/src/main/java/jdk/internal/jrtfs/SystemImage.java +++ b/lsp/java/src/main/java/jdk/internal/jrtfs/SystemImage.java @@ -25,6 +25,10 @@ package jdk.internal.jrtfs; import com.itsaky.androidide.utils.Environment; + +import jdk.internal.jimage.ImageReader; +import jdk.internal.jimage.ImageReader.Node; + import java.io.IOException; import java.nio.file.FileSystem; import java.nio.file.FileSystemNotFoundException; @@ -33,8 +37,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.security.AccessController; import java.security.PrivilegedAction; -import jdk.internal.jimage.ImageReader; -import jdk.internal.jimage.ImageReader.Node; /** * @implNote This class needs to maintain JDK 8 source compatibility. diff --git a/lsp/xml/src/main/java/com/itsaky/lsp/xml/XMLLanguageServer.java b/lsp/xml/src/main/java/com/itsaky/lsp/xml/XMLLanguageServer.java index 432e4a0b2..4c278faf2 100644 --- a/lsp/xml/src/main/java/com/itsaky/lsp/xml/XMLLanguageServer.java +++ b/lsp/xml/src/main/java/com/itsaky/lsp/xml/XMLLanguageServer.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.xml; import androidx.annotation.NonNull; + import com.itsaky.lsp.api.ICompletionProvider; import com.itsaky.lsp.api.IDocumentHandler; import com.itsaky.lsp.api.ILanguageClient; @@ -41,10 +42,12 @@ import com.itsaky.lsp.util.NoDocumentHandler; import com.itsaky.lsp.xml.models.XMLServerSettings; import com.itsaky.lsp.xml.providers.CompletionProvider; import com.itsaky.sdk.SDKInfo; + +import org.jetbrains.annotations.Nullable; + import java.nio.file.Path; import java.util.Collections; import java.util.List; -import org.jetbrains.annotations.Nullable; /** * Language server implementation for XML files. diff --git a/lsp/xml/src/main/java/com/itsaky/lsp/xml/providers/CompletionProvider.java b/lsp/xml/src/main/java/com/itsaky/lsp/xml/providers/CompletionProvider.java index 5f4265b79..1d16699ec 100644 --- a/lsp/xml/src/main/java/com/itsaky/lsp/xml/providers/CompletionProvider.java +++ b/lsp/xml/src/main/java/com/itsaky/lsp/xml/providers/CompletionProvider.java @@ -19,6 +19,7 @@ package com.itsaky.lsp.xml.providers; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.lexers.xml.XMLLexer; import com.itsaky.androidide.utils.CharSequenceReader; @@ -37,16 +38,19 @@ import com.itsaky.lsp.models.InsertTextFormat; import com.itsaky.lsp.xml.R; import com.itsaky.sdk.SDKInfo; import com.itsaky.widgets.models.Widget; + import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; + +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.Token; +import org.jetbrains.annotations.Contract; + import java.nio.file.Path; import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.regex.Pattern; -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.Token; -import org.jetbrains.annotations.Contract; /** * Completion provider for the XML Language diff --git a/lsp/xml/src/main/java/com/itsaky/lsp/xml/utils/XmlUtils.java b/lsp/xml/src/main/java/com/itsaky/lsp/xml/utils/XmlUtils.java index 2f3060d5c..155f8c434 100644 --- a/lsp/xml/src/main/java/com/itsaky/lsp/xml/utils/XmlUtils.java +++ b/lsp/xml/src/main/java/com/itsaky/lsp/xml/utils/XmlUtils.java @@ -18,8 +18,10 @@ package com.itsaky.lsp.xml.utils; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.CharSequenceReader; import com.itsaky.androidide.utils.Logger; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; diff --git a/sdk-info/src/main/java/com/itsaky/apiinfo/ApiInfo.java b/sdk-info/src/main/java/com/itsaky/apiinfo/ApiInfo.java index c4c2cac27..76b97c3b6 100755 --- a/sdk-info/src/main/java/com/itsaky/apiinfo/ApiInfo.java +++ b/sdk-info/src/main/java/com/itsaky/apiinfo/ApiInfo.java @@ -19,19 +19,22 @@ package com.itsaky.apiinfo; import android.content.Context; import android.content.res.Resources; + import com.itsaky.apiinfo.models.ClassInfo; import com.itsaky.apiinfo.models.FieldInfo; import com.itsaky.apiinfo.models.MethodInfo; + +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashMap; import java.util.Map; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; public class ApiInfo { diff --git a/sdk-info/src/main/java/com/itsaky/apiinfo/models/ClassInfo.java b/sdk-info/src/main/java/com/itsaky/apiinfo/models/ClassInfo.java index 8e86e3dbb..315b027be 100755 --- a/sdk-info/src/main/java/com/itsaky/apiinfo/models/ClassInfo.java +++ b/sdk-info/src/main/java/com/itsaky/apiinfo/models/ClassInfo.java @@ -20,11 +20,13 @@ package com.itsaky.apiinfo.models; import android.text.TextUtils; + +import org.eclipse.jdt.core.Signature; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.jdt.core.Signature; /** Holds information about a class */ public class ClassInfo extends Info { diff --git a/sdk-info/src/main/java/com/itsaky/attrinfo/AttrInfo.java b/sdk-info/src/main/java/com/itsaky/attrinfo/AttrInfo.java index 522113a0c..8a88ace87 100755 --- a/sdk-info/src/main/java/com/itsaky/attrinfo/AttrInfo.java +++ b/sdk-info/src/main/java/com/itsaky/attrinfo/AttrInfo.java @@ -19,21 +19,25 @@ package com.itsaky.attrinfo; import android.content.Context; import android.content.res.Resources; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.attrinfo.models.Attr; import com.itsaky.attrinfo.models.Styleable; import com.itsaky.sdkinfo.R; import com.itsaky.xml.INamespace; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; + import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.parser.Parser; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + /** * A parser for parsing attrs.xml. This parser maps the attributes with the declared * styleables. diff --git a/sdk-info/src/main/java/com/itsaky/attrinfo/models/Attr.java b/sdk-info/src/main/java/com/itsaky/attrinfo/models/Attr.java index 8c8ec4f15..913277049 100755 --- a/sdk-info/src/main/java/com/itsaky/attrinfo/models/Attr.java +++ b/sdk-info/src/main/java/com/itsaky/attrinfo/models/Attr.java @@ -20,15 +20,19 @@ package com.itsaky.attrinfo.models; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; + import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.xml.INamespace; + +import org.jetbrains.annotations.Contract; + import java.util.ArrayList; import java.util.Objects; import java.util.Set; import java.util.TreeSet; import java.util.regex.Pattern; -import org.jetbrains.annotations.Contract; /** * Represents an xml attribute which is read from {@code attrs.xml}. diff --git a/sdk-info/src/main/java/com/itsaky/attrinfo/models/Styleable.java b/sdk-info/src/main/java/com/itsaky/attrinfo/models/Styleable.java index 483169793..3e5c195c0 100644 --- a/sdk-info/src/main/java/com/itsaky/attrinfo/models/Styleable.java +++ b/sdk-info/src/main/java/com/itsaky/attrinfo/models/Styleable.java @@ -18,6 +18,7 @@ package com.itsaky.attrinfo.models; import androidx.annotation.NonNull; + import java.util.HashSet; import java.util.Objects; import java.util.Set; diff --git a/sdk-info/src/main/java/com/itsaky/sdk/SDKInfo.java b/sdk-info/src/main/java/com/itsaky/sdk/SDKInfo.java index 067ca1275..11dea52e8 100644 --- a/sdk-info/src/main/java/com/itsaky/sdk/SDKInfo.java +++ b/sdk-info/src/main/java/com/itsaky/sdk/SDKInfo.java @@ -18,10 +18,13 @@ package com.itsaky.sdk; import android.content.Context; + import androidx.annotation.NonNull; + import com.itsaky.apiinfo.ApiInfo; import com.itsaky.attrinfo.AttrInfo; import com.itsaky.widgets.WidgetInfo; + import java.util.Objects; /** diff --git a/sdk-info/src/main/java/com/itsaky/widgets/WidgetInfo.java b/sdk-info/src/main/java/com/itsaky/widgets/WidgetInfo.java index 4f16d2894..724db5bcc 100755 --- a/sdk-info/src/main/java/com/itsaky/widgets/WidgetInfo.java +++ b/sdk-info/src/main/java/com/itsaky/widgets/WidgetInfo.java @@ -19,9 +19,12 @@ package com.itsaky.widgets; import android.content.Context; import android.content.res.Resources; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.widgets.models.Widget; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/sdk-info/src/main/java/com/itsaky/xml/INamespace.java b/sdk-info/src/main/java/com/itsaky/xml/INamespace.java index a2f034955..11f9eb3eb 100644 --- a/sdk-info/src/main/java/com/itsaky/xml/INamespace.java +++ b/sdk-info/src/main/java/com/itsaky/xml/INamespace.java @@ -17,8 +17,11 @@ package com.itsaky.xml; import android.os.Parcelable; + import androidx.annotation.NonNull; + import com.itsaky.xml.impl.UiNamespace; + import org.jetbrains.annotations.Contract; /** diff --git a/sdk-info/src/main/java/com/itsaky/xml/impl/UiNamespace.java b/sdk-info/src/main/java/com/itsaky/xml/impl/UiNamespace.java index ddd56f5de..5cedc4404 100644 --- a/sdk-info/src/main/java/com/itsaky/xml/impl/UiNamespace.java +++ b/sdk-info/src/main/java/com/itsaky/xml/impl/UiNamespace.java @@ -17,11 +17,15 @@ package com.itsaky.xml.impl; import android.os.Parcel; + import androidx.annotation.NonNull; + import com.itsaky.xml.INamespace; -import java.util.Objects; + import org.jetbrains.annotations.Contract; +import java.util.Objects; + /** * @author Akash Yadav */ diff --git a/sdk-info/src/main/java/org/eclipse/jdt/core/Signature.java b/sdk-info/src/main/java/org/eclipse/jdt/core/Signature.java index 8b46e012f..58f4b1af6 100755 --- a/sdk-info/src/main/java/org/eclipse/jdt/core/Signature.java +++ b/sdk-info/src/main/java/org/eclipse/jdt/core/Signature.java @@ -16,11 +16,12 @@ *******************************************************************************/ package org.eclipse.jdt.core; -import java.util.ArrayList; import org.eclipse.jdt.core.compiler.CharOperation; import org.eclipse.jdt.internal.compiler.parser.ScannerHelper; import org.eclipse.jdt.internal.compiler.util.Util; +import java.util.ArrayList; + /** * Provides methods for encoding and decoding type and method signature strings. * diff --git a/sdk-info/src/main/java/org/eclipse/jdt/core/compiler/CharOperation.java b/sdk-info/src/main/java/org/eclipse/jdt/core/compiler/CharOperation.java index bbfed73ec..edc64e2e6 100755 --- a/sdk-info/src/main/java/org/eclipse/jdt/core/compiler/CharOperation.java +++ b/sdk-info/src/main/java/org/eclipse/jdt/core/compiler/CharOperation.java @@ -35,9 +35,10 @@ *******************************************************************************/ package org.eclipse.jdt.core.compiler; +import org.eclipse.jdt.internal.compiler.parser.ScannerHelper; + import java.util.Arrays; import java.util.List; -import org.eclipse.jdt.internal.compiler.parser.ScannerHelper; /** * This class is a collection of helper methods to manipulate char arrays. diff --git a/sdk-info/src/main/java/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java b/sdk-info/src/main/java/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java index 2d29e0b71..d5f68364a 100755 --- a/sdk-info/src/main/java/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java +++ b/sdk-info/src/main/java/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java @@ -33,11 +33,12 @@ *******************************************************************************/ package org.eclipse.jdt.internal.compiler.parser; +import org.eclipse.jdt.internal.compiler.ast.ASTNode; +import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; + import java.io.BufferedInputStream; import java.io.DataInputStream; import java.io.IOException; -import org.eclipse.jdt.internal.compiler.ast.ASTNode; -import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; public class ScannerHelper { diff --git a/treeview/src/main/java/com/unnamed/b/atv/holder/SimpleViewHolder.java b/treeview/src/main/java/com/unnamed/b/atv/holder/SimpleViewHolder.java index 0036f78ff..8368cd5aa 100755 --- a/treeview/src/main/java/com/unnamed/b/atv/holder/SimpleViewHolder.java +++ b/treeview/src/main/java/com/unnamed/b/atv/holder/SimpleViewHolder.java @@ -3,6 +3,7 @@ package com.unnamed.b.atv.holder; import android.content.Context; import android.view.View; import android.widget.TextView; + import com.unnamed.b.atv.model.TreeNode; /** Created by Bogdan Melnychuk on 2/11/15. */ diff --git a/treeview/src/main/java/com/unnamed/b/atv/model/TreeNode.java b/treeview/src/main/java/com/unnamed/b/atv/model/TreeNode.java index 1afd2f798..d7aae6017 100755 --- a/treeview/src/main/java/com/unnamed/b/atv/model/TreeNode.java +++ b/treeview/src/main/java/com/unnamed/b/atv/model/TreeNode.java @@ -3,9 +3,11 @@ package com.unnamed.b.atv.model; import android.content.Context; import android.view.View; import android.view.ViewGroup; + import com.unnamed.b.atv.R; import com.unnamed.b.atv.view.AndroidTreeView; import com.unnamed.b.atv.view.TreeNodeWrapperView; + import java.io.File; import java.util.ArrayList; import java.util.Collection; diff --git a/treeview/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/treeview/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java index 7e5ac7a28..632a3ec71 100755 --- a/treeview/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java +++ b/treeview/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java @@ -9,10 +9,13 @@ import android.view.animation.Animation; import android.view.animation.Transformation; import android.widget.LinearLayout; import android.widget.ScrollView; + import androidx.annotation.DrawableRes; + import com.unnamed.b.atv.R; import com.unnamed.b.atv.holder.SimpleViewHolder; import com.unnamed.b.atv.model.TreeNode; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/treeview/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java b/treeview/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java index 459704bbe..b277c3e87 100755 --- a/treeview/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java +++ b/treeview/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java @@ -6,6 +6,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.RelativeLayout; + import com.unnamed.b.atv.R; /** Created by Bogdan Melnychuk on 2/10/15. */ diff --git a/treeview/src/main/java/com/unnamed/b/atv/view/TwoDScrollView.java b/treeview/src/main/java/com/unnamed/b/atv/view/TwoDScrollView.java index 9cd3b1d3c..0cdfa1129 100755 --- a/treeview/src/main/java/com/unnamed/b/atv/view/TwoDScrollView.java +++ b/treeview/src/main/java/com/unnamed/b/atv/view/TwoDScrollView.java @@ -16,6 +16,7 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.Scroller; import android.widget.TextView; + import java.util.List; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/IAttribute.java b/xml-inflater/src/main/java/com/itsaky/inflater/IAttribute.java index 316393d60..c5f9807ed 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/IAttribute.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/IAttribute.java @@ -21,7 +21,9 @@ package com.itsaky.inflater; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.xml.INamespace; + import java.util.Comparator; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/IDTable.java b/xml-inflater/src/main/java/com/itsaky/inflater/IDTable.java index fbe91289e..78df35391 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/IDTable.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/IDTable.java @@ -18,6 +18,7 @@ package com.itsaky.inflater; import android.view.View; + import java.util.HashMap; import java.util.Map; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/ILayoutInflater.java b/xml-inflater/src/main/java/com/itsaky/inflater/ILayoutInflater.java index b6ac833d9..7e1ae87be 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/ILayoutInflater.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/ILayoutInflater.java @@ -19,11 +19,14 @@ package com.itsaky.inflater; import android.content.Context; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.FileUtils; import com.itsaky.inflater.util.Preconditions; + import java.io.File; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/IResourceTable.java b/xml-inflater/src/main/java/com/itsaky/inflater/IResourceTable.java index 27883352a..07c927c5d 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/IResourceTable.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/IResourceTable.java @@ -19,6 +19,7 @@ package com.itsaky.inflater; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import java.io.File; import java.util.Collection; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/IView.java b/xml-inflater/src/main/java/com/itsaky/inflater/IView.java index 17ce6bdb1..0caae88ac 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/IView.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/IView.java @@ -18,9 +18,12 @@ package com.itsaky.inflater; import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.xml.INamespace; + import java.util.List; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/IViewGroup.java b/xml-inflater/src/main/java/com/itsaky/inflater/IViewGroup.java index 546ee7748..f2c8bff1d 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/IViewGroup.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/IViewGroup.java @@ -18,6 +18,7 @@ package com.itsaky.inflater; import android.view.View; + import java.util.List; import java.util.function.Consumer; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/LayoutInflaterConfiguration.java b/xml-inflater/src/main/java/com/itsaky/inflater/LayoutInflaterConfiguration.java index acb4d8ba6..046d5d343 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/LayoutInflaterConfiguration.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/LayoutInflaterConfiguration.java @@ -19,6 +19,7 @@ package com.itsaky.inflater; import com.itsaky.attrinfo.AttrInfo; import com.itsaky.widgets.WidgetInfo; + import java.io.File; import java.util.Set; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java b/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java index 3f59e0e04..0bc8fa438 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java @@ -27,8 +27,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.annotation.StringRes; + import com.blankj.utilcode.util.ReflectUtils; import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.utils.Logger; @@ -46,12 +48,7 @@ import com.itsaky.widgets.WidgetInfo; import com.itsaky.widgets.models.Widget; import com.itsaky.xml.INamespace; import com.itsaky.xml.impl.UiNamespace; -import java.io.File; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.Objects; -import java.util.Set; -import java.util.regex.Pattern; + import org.jsoup.Jsoup; import org.jsoup.nodes.Attribute; import org.jsoup.nodes.Attributes; @@ -59,6 +56,13 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.parser.Parser; +import java.io.File; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.Objects; +import java.util.Set; +import java.util.regex.Pattern; + class XMLLayoutInflater extends BaseLayoutInflater { private final Set resDirs; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/gesture/GestureOverlayViewAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/gesture/GestureOverlayViewAttrAdapter.java index 000b05b3b..7772f13b6 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/gesture/GestureOverlayViewAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/gesture/GestureOverlayViewAttrAdapter.java @@ -19,7 +19,9 @@ package com.itsaky.inflater.adapters.android.gesture; import android.gesture.GestureOverlayView; import android.util.DisplayMetrics; import android.view.View; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.ReflectUtils; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewAttrAdapter.java index c26822c88..d963cc1f0 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewAttrAdapter.java @@ -27,8 +27,10 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.RelativeLayout; + import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IAttributeAdapter; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewGroupAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewGroupAttrAdapter.java index 1feb3e1ee..c55d80485 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewGroupAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewGroupAttrAdapter.java @@ -21,9 +21,12 @@ import android.animation.LayoutTransition; import android.util.DisplayMetrics; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; + import org.jetbrains.annotations.Contract; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AbsSeekBarAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AbsSeekBarAttrAdapter.java index 8e347ca42..4e97ec31d 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AbsSeekBarAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AbsSeekBarAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.AbsSeekBar; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AbsSpinnerAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AbsSpinnerAttrAdapter.java index 62ef927f0..f96e85313 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AbsSpinnerAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AbsSpinnerAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.AbsSpinner; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AdapterViewAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AdapterViewAttrAdapter.java index fac37c36c..df5307f99 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AdapterViewAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/AdapterViewAttrAdapter.java @@ -22,7 +22,9 @@ import android.util.DisplayMetrics; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.adapters.android.view.ViewGroupAttrAdapter; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ButtonAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ButtonAttrAdapter.java index 0f64be3bc..5cbedb559 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ButtonAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ButtonAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.Button; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CheckBoxAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CheckBoxAttrAdapter.java index 6a781e919..9e28ccacc 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CheckBoxAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CheckBoxAttrAdapter.java @@ -19,7 +19,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.CheckBox; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CheckedTextViewAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CheckedTextViewAttrAdapter.java index a71b4979f..4dd70b855 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CheckedTextViewAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CheckedTextViewAttrAdapter.java @@ -19,7 +19,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.CheckedTextView; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CompondButtonAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CompondButtonAttrAdapter.java index f0953fba2..00df6cb84 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CompondButtonAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/CompondButtonAttrAdapter.java @@ -4,7 +4,9 @@ import android.content.Context; import android.util.DisplayMetrics; import android.view.View; import android.widget.CompoundButton; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/EditTextAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/EditTextAttrAdapter.java index 1944cc43b..185ac1208 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/EditTextAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/EditTextAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.EditText; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/FrameLayoutAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/FrameLayoutAttrAdapter.java index 5476e77e0..57208b0ee 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/FrameLayoutAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/FrameLayoutAttrAdapter.java @@ -19,7 +19,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.FrameLayout; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.adapters.android.view.ViewGroupAttrAdapter; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/GridLayoutAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/GridLayoutAttrAdapter.java index 35a7aa3a4..4488e2a08 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/GridLayoutAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/GridLayoutAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.GridLayout; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.adapters.android.view.ViewGroupAttrAdapter; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ImageButtonAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ImageButtonAttrAdapter.java index 5d958af8b..2f5090a89 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ImageButtonAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ImageButtonAttrAdapter.java @@ -19,7 +19,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.ImageButton; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ImageViewAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ImageViewAttrAdapter.java index 857d9c1ee..f88678c7d 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ImageViewAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ImageViewAttrAdapter.java @@ -22,8 +22,10 @@ import android.graphics.drawable.Drawable; import android.util.DisplayMetrics; import android.view.View; import android.widget.ImageView; + import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.adapters.android.view.ViewAttrAdapter; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/LinearLayoutAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/LinearLayoutAttrAdapter.java index b69a4dc0b..cdf161af5 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/LinearLayoutAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/LinearLayoutAttrAdapter.java @@ -19,7 +19,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.LinearLayout; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.adapters.android.view.ViewGroupAttrAdapter; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ProgressBarAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ProgressBarAttrAdapter.java index 437117442..b820ea0c9 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ProgressBarAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ProgressBarAttrAdapter.java @@ -21,7 +21,9 @@ import android.content.Context; import android.util.DisplayMetrics; import android.view.View; import android.widget.ProgressBar; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.adapters.android.view.ViewAttrAdapter; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/RadioButtonAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/RadioButtonAttrAdapter.java index b49ec98fe..b98dd7fc4 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/RadioButtonAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/RadioButtonAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.RadioButton; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/RelativeLayoutAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/RelativeLayoutAttrAdapter.java index 51f7f9284..a406d64f9 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/RelativeLayoutAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/RelativeLayoutAttrAdapter.java @@ -19,7 +19,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.RelativeLayout; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.adapters.android.view.ViewGroupAttrAdapter; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SeekBarAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SeekBarAttrAdapter.java index 662929720..d9d8263f7 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SeekBarAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SeekBarAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.SeekBar; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SpinnerAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SpinnerAttrAdapter.java index e15e5abdb..93b3e45ce 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SpinnerAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SpinnerAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.Spinner; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SwitchAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SwitchAttrAdapter.java index 94a74004e..8ee5de169 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SwitchAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/SwitchAttrAdapter.java @@ -22,7 +22,9 @@ import android.graphics.Typeface; import android.util.DisplayMetrics; import android.view.View; import android.widget.Switch; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/TextViewAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/TextViewAttrAdapter.java index 60a464f67..4c317f6b1 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/TextViewAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/TextViewAttrAdapter.java @@ -27,11 +27,14 @@ import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.View; import android.widget.TextView; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.SizeUtils; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.adapters.android.view.ViewAttrAdapter; + import java.util.regex.Pattern; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ToggleButtonAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ToggleButtonAttrAdapter.java index dc095e993..61852dc17 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ToggleButtonAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/widget/ToggleButtonAttrAdapter.java @@ -20,7 +20,9 @@ package com.itsaky.inflater.adapters.android.widget; import android.util.DisplayMetrics; import android.view.View; import android.widget.ToggleButton; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.ReflectUtils; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IResourceTable; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/BitmapDrawableParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/BitmapDrawableParser.java index 2acc8936a..653ba9cc1 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/BitmapDrawableParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/BitmapDrawableParser.java @@ -23,11 +23,14 @@ import android.graphics.Shader; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.util.DisplayMetrics; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.InflateException; + import org.jetbrains.annotations.Contract; import org.xmlpull.v1.XmlPullParser; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ClipDrawableParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ClipDrawableParser.java index 1eb2c7d23..107114274 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ClipDrawableParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ClipDrawableParser.java @@ -21,11 +21,14 @@ import android.graphics.drawable.ClipDrawable; import android.graphics.drawable.Drawable; import android.util.DisplayMetrics; import android.view.Gravity; + import androidx.annotation.NonNull; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.InflateException; import com.itsaky.inflater.util.Preconditions; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/DrawableParserFactory.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/DrawableParserFactory.java index 04bc26a0d..a7c6fcd25 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/DrawableParserFactory.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/DrawableParserFactory.java @@ -23,20 +23,24 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.NinePatchDrawable; import android.util.DisplayMetrics; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.ImageUtils; import com.itsaky.androidide.utils.Logger; import com.itsaky.inflater.IResourceTable; import com.sdsmdg.harjot.vectormaster.VectorMasterDrawable; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; + import java.io.File; import java.io.IOException; import java.io.Reader; import java.io.StringReader; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; /** * Utility methods for creating instances of suitable drawable parsers for a file or an XML code. diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/IDrawableParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/IDrawableParser.java index f8c41fc3d..9d1ffc337 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/IDrawableParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/IDrawableParser.java @@ -19,9 +19,12 @@ package com.itsaky.inflater.drawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.util.DisplayMetrics; + import androidx.annotation.ChecksSdkIntAtLeast; + import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.util.CommonParseUtils; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/InsetDrawableParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/InsetDrawableParser.java index e5bd829e1..ea87b3251 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/InsetDrawableParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/InsetDrawableParser.java @@ -20,10 +20,12 @@ package com.itsaky.inflater.drawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.InsetDrawable; import android.util.DisplayMetrics; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.InflateException; import com.itsaky.inflater.util.Preconditions; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/LayerListParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/LayerListParser.java index 311784d56..c9d7da072 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/LayerListParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/LayerListParser.java @@ -21,10 +21,13 @@ import static com.itsaky.inflater.util.Preconditions.assertNotBlank; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.util.DisplayMetrics; + import androidx.annotation.NonNull; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.util.TextDrawable; + import org.jetbrains.annotations.Contract; import org.xmlpull.v1.XmlPullParser; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ScaleDrawableParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ScaleDrawableParser.java index 474c8250e..4184274a4 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ScaleDrawableParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ScaleDrawableParser.java @@ -21,11 +21,14 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.ScaleDrawable; import android.util.DisplayMetrics; import android.view.Gravity; + import androidx.annotation.NonNull; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.InflateException; import com.itsaky.inflater.util.Preconditions; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ShapeDrawableParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ShapeDrawableParser.java index b20842132..eedc3b245 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ShapeDrawableParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/ShapeDrawableParser.java @@ -23,14 +23,18 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.util.DisplayMetrics; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.inflater.IResourceTable; -import java.util.Arrays; + import org.jetbrains.annotations.Contract; import org.xmlpull.v1.XmlPullParser; +import java.util.Arrays; + /** * Parses a drawable whose root element is {@code }. If the parse was successful, returns a * {@link GradientDrawable}, otherwise {@code null}. diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/StateListParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/StateListParser.java index 670951d00..8f89112c6 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/StateListParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/StateListParser.java @@ -20,13 +20,16 @@ package com.itsaky.inflater.drawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.StateListDrawable; import android.util.DisplayMetrics; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.utils.Logger; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.InflateException; -import java.util.ArrayList; + import org.xmlpull.v1.XmlPullParser; +import java.util.ArrayList; + /** * Parser for parsing <selector> drawables. * diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseView.java b/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseView.java index 8948633b9..c6199e437 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseView.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseView.java @@ -18,14 +18,17 @@ package com.itsaky.inflater.impl; import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.utils.Logger; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IAttributeAdapter; import com.itsaky.inflater.IView; import com.itsaky.inflater.IViewGroup; import com.itsaky.xml.INamespace; + import java.util.ArrayList; import java.util.Comparator; import java.util.HashSet; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseViewGroup.java b/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseViewGroup.java index 3249b0289..c2b3c8999 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseViewGroup.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseViewGroup.java @@ -19,10 +19,13 @@ package com.itsaky.inflater.impl; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttributeAdapter; import com.itsaky.inflater.IView; import com.itsaky.inflater.IViewGroup; + import java.util.ArrayList; import java.util.List; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/impl/ErrorUiView.java b/xml-inflater/src/main/java/com/itsaky/inflater/impl/ErrorUiView.java index 99aaa64be..3da23625f 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/impl/ErrorUiView.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/impl/ErrorUiView.java @@ -22,9 +22,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; + import com.itsaky.inflater.IView; + import org.jetbrains.annotations.Contract; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/impl/UiAttribute.java b/xml-inflater/src/main/java/com/itsaky/inflater/impl/UiAttribute.java index 8459fa59c..cb165176d 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/impl/UiAttribute.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/impl/UiAttribute.java @@ -18,8 +18,10 @@ package com.itsaky.inflater.impl; import androidx.annotation.NonNull; + import com.itsaky.inflater.IAttribute; import com.itsaky.xml.INamespace; + import java.util.Objects; public class UiAttribute implements IAttribute { diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/impl/UiViewGroup.java b/xml-inflater/src/main/java/com/itsaky/inflater/impl/UiViewGroup.java index c1b7d51ee..075ea54f6 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/impl/UiViewGroup.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/impl/UiViewGroup.java @@ -18,8 +18,11 @@ package com.itsaky.inflater.impl; import android.view.ViewGroup; + import androidx.annotation.Nullable; + import com.itsaky.inflater.IView; + import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/util/CommonParseUtils.java b/xml-inflater/src/main/java/com/itsaky/inflater/util/CommonParseUtils.java index 8f7fe86ab..72e4ce669 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/util/CommonParseUtils.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/util/CommonParseUtils.java @@ -26,13 +26,16 @@ import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.Gravity; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.core.view.GravityCompat; + import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.utils.Logger; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.drawable.DrawableParserFactory; + import java.io.File; import java.lang.reflect.Field; import java.util.Objects; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/util/TextDrawable.java b/xml-inflater/src/main/java/com/itsaky/inflater/util/TextDrawable.java index fecb5883a..d0fb68f5d 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/util/TextDrawable.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/util/TextDrawable.java @@ -9,6 +9,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.DisplayMetrics; import android.util.TypedValue; + import androidx.annotation.NonNull; public class TextDrawable extends Drawable { diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/values/FrameworkValues.java b/xml-inflater/src/main/java/com/itsaky/inflater/values/FrameworkValues.java index 1d6fe20e8..daa62bf85 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/values/FrameworkValues.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/values/FrameworkValues.java @@ -21,6 +21,7 @@ import static java.lang.reflect.Modifier.isPublic; import static java.lang.reflect.Modifier.isStatic; import androidx.annotation.NonNull; + import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTable.java b/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTable.java index ed736ede5..2d39f1ace 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTable.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTable.java @@ -19,6 +19,7 @@ package com.itsaky.inflater.values; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.blankj.utilcode.util.FileUtils; import com.itsaky.androidide.utils.Logger; import com.itsaky.inflater.values.models.ArrayResource; @@ -27,6 +28,11 @@ import com.itsaky.inflater.values.models.ColorResource; import com.itsaky.inflater.values.models.DimensionResource; import com.itsaky.inflater.values.models.IntegerResource; import com.itsaky.inflater.values.models.StringResource; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -35,9 +41,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.Objects; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; /** * Reads and manages values (colors, strings, integers, etc.) for a single module. diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTableFactory.java b/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTableFactory.java index 313358df2..73355ceb7 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTableFactory.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTableFactory.java @@ -17,6 +17,7 @@ package com.itsaky.inflater.values; import com.itsaky.androidide.utils.Logger; + import java.io.File; import java.util.HashMap; import java.util.Locale; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/values/models/AbstractResource.java b/xml-inflater/src/main/java/com/itsaky/inflater/values/models/AbstractResource.java index 7d14afc34..79906ee24 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/values/models/AbstractResource.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/values/models/AbstractResource.java @@ -17,7 +17,9 @@ package com.itsaky.inflater.values.models; import androidx.annotation.NonNull; + import com.itsaky.inflater.values.IResource; + import java.util.Objects; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/values/models/ArrayResource.java b/xml-inflater/src/main/java/com/itsaky/inflater/values/models/ArrayResource.java index df2b93f5c..3019b2840 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/values/models/ArrayResource.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/values/models/ArrayResource.java @@ -19,6 +19,7 @@ package com.itsaky.inflater.values.models; import android.graphics.Color; import android.text.TextUtils; + import androidx.annotation.NonNull; /** diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/values/models/ColorResource.java b/xml-inflater/src/main/java/com/itsaky/inflater/values/models/ColorResource.java index 1dcf4f1de..bc12d398d 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/values/models/ColorResource.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/values/models/ColorResource.java @@ -17,6 +17,7 @@ package com.itsaky.inflater.values.models; import android.graphics.Color; + import androidx.annotation.NonNull; /** diff --git a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/VectorMasterDrawable.java b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/VectorMasterDrawable.java index cd5ea78b3..3cca1a0c5 100644 --- a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/VectorMasterDrawable.java +++ b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/VectorMasterDrawable.java @@ -8,22 +8,26 @@ import android.graphics.Path; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.FileIOUtils; import com.sdsmdg.harjot.vectormaster.models.ClipPathModel; import com.sdsmdg.harjot.vectormaster.models.GroupModel; import com.sdsmdg.harjot.vectormaster.models.PathModel; import com.sdsmdg.harjot.vectormaster.models.VectorModel; import com.sdsmdg.harjot.vectormaster.utilities.Utils; -import java.io.File; -import java.io.IOException; -import java.io.StringReader; -import java.util.Stack; + import org.jetbrains.annotations.Contract; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.util.Stack; + public class VectorMasterDrawable extends Drawable { private VectorModel vectorModel; diff --git a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/VectorMasterView.java b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/VectorMasterView.java index 673d43c38..ba6105b3d 100644 --- a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/VectorMasterView.java +++ b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/VectorMasterView.java @@ -8,17 +8,20 @@ import android.graphics.Matrix; import android.graphics.Path; import android.util.AttributeSet; import android.view.View; + import com.itsaky.inflater.R; import com.sdsmdg.harjot.vectormaster.models.ClipPathModel; import com.sdsmdg.harjot.vectormaster.models.GroupModel; import com.sdsmdg.harjot.vectormaster.models.PathModel; import com.sdsmdg.harjot.vectormaster.models.VectorModel; import com.sdsmdg.harjot.vectormaster.utilities.Utils; -import java.io.IOException; -import java.util.Stack; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; +import java.io.IOException; +import java.util.Stack; + public class VectorMasterView extends View { VectorModel vectorModel; diff --git a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/ClipPathModel.java b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/ClipPathModel.java index 710f42902..8f47a4da4 100644 --- a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/ClipPathModel.java +++ b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/ClipPathModel.java @@ -6,6 +6,7 @@ import android.graphics.Path; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.RectF; + import com.sdsmdg.harjot.vectormaster.utilities.parser.PathParser; public class ClipPathModel { diff --git a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/GroupModel.java b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/GroupModel.java index 98b1ffd0f..14d200b5f 100644 --- a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/GroupModel.java +++ b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/GroupModel.java @@ -2,8 +2,10 @@ package com.sdsmdg.harjot.vectormaster.models; import android.graphics.Canvas; import android.graphics.Matrix; + import com.sdsmdg.harjot.vectormaster.DefaultValues; import com.sdsmdg.harjot.vectormaster.utilities.Utils; + import java.util.ArrayList; public class GroupModel { diff --git a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/PathModel.java b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/PathModel.java index f80b034b6..f249f0c1e 100644 --- a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/PathModel.java +++ b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/PathModel.java @@ -6,6 +6,7 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.PathMeasure; import android.graphics.RectF; + import com.sdsmdg.harjot.vectormaster.DefaultValues; import com.sdsmdg.harjot.vectormaster.utilities.Utils; import com.sdsmdg.harjot.vectormaster.utilities.parser.PathParser; diff --git a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/VectorModel.java b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/VectorModel.java index 258be95d9..4e3b4b4c4 100644 --- a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/VectorModel.java +++ b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/models/VectorModel.java @@ -4,7 +4,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Matrix; import android.graphics.Path; + import com.sdsmdg.harjot.vectormaster.enums.TintMode; + import java.util.ArrayList; public class VectorModel { diff --git a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/utilities/legacyparser/PathParser.java b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/utilities/legacyparser/PathParser.java index 1ead814c4..b3c3c5964 100644 --- a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/utilities/legacyparser/PathParser.java +++ b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/utilities/legacyparser/PathParser.java @@ -17,8 +17,11 @@ package com.sdsmdg.harjot.vectormaster.utilities.legacyparser; import android.graphics.Path; + import androidx.annotation.Nullable; + import com.itsaky.androidide.utils.Logger; + import java.util.ArrayList; /** This class is a duplicate of the PathParser.java in androidx.core.graphics package. */