mirror of
https://gitee.com/zhangsken/AndroidIDE.git
synced 2026-10-16 07:49:44 +08:00
Renamed Logger to ILogger
This commit is contained in:
+2
-2
@@ -23,7 +23,7 @@ import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.actions.ActionItem
|
||||
import com.itsaky.androidide.actions.ActionMenu
|
||||
import com.itsaky.androidide.actions.ActionsRegistry
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import java.util.concurrent.CompletableFuture
|
||||
|
||||
/**
|
||||
@@ -33,7 +33,7 @@ import java.util.concurrent.CompletableFuture
|
||||
*/
|
||||
class DefaultActionsRegistry : ActionsRegistry() {
|
||||
|
||||
private val log = Logger.newInstance("DefaultActionsRegistry")
|
||||
private val log = ILogger.newInstance("DefaultActionsRegistry")
|
||||
private val actions: MutableMap<String, MutableMap<String, ActionItem>> = mutableMapOf()
|
||||
private val listeners = mutableSetOf<ActionExecListener>()
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ import com.itsaky.androidide.ui.WidgetDragListener;
|
||||
import com.itsaky.androidide.ui.WidgetDragShadowBuilder;
|
||||
import com.itsaky.androidide.ui.WidgetTouchListener;
|
||||
import com.itsaky.androidide.utils.DialogUtils;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.inflater.IAttribute;
|
||||
import com.itsaky.inflater.IInflateListener;
|
||||
import com.itsaky.inflater.ILayoutInflater;
|
||||
@@ -97,7 +97,7 @@ public class DesignerActivity extends StudioActivity
|
||||
public static final String KEY_GENERATED_CODE = "designer_xmlCode";
|
||||
public static final String DRAGGING_WIDGET_TAG = "DRAGGING_WIDGET";
|
||||
public static final String DRAGGING_WIDGET_MIME = "application/ide_widget";
|
||||
private static final Logger LOG = Logger.newInstance("DesignerActivity");
|
||||
private static final ILogger LOG = ILogger.newInstance("DesignerActivity");
|
||||
public final String EDITOR_SHEET_DIALOG_TAG = "attribute_editor_dialog";
|
||||
private final boolean isTablet = DeviceUtils.isTablet();
|
||||
private final List<UIWidgetGroup> widgetGroups = new ArrayList<>();
|
||||
|
||||
@@ -106,7 +106,7 @@ import com.itsaky.androidide.utils.EditorActivityActions;
|
||||
import com.itsaky.androidide.utils.EditorBottomSheetBehavior;
|
||||
import com.itsaky.androidide.utils.Environment;
|
||||
import com.itsaky.androidide.utils.LSPUtils;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.utils.RecursiveFileSearcher;
|
||||
import com.itsaky.androidide.utils.Symbols;
|
||||
import com.itsaky.androidide.viewmodel.EditorViewModel;
|
||||
@@ -159,7 +159,7 @@ public class EditorActivity extends StudioActivity
|
||||
private static final int ACTION_ID_CLOSE = 100;
|
||||
private static final int ACTION_ID_OTHERS = 101;
|
||||
private static final int ACTION_ID_ALL = 102;
|
||||
private static final Logger LOG = Logger.newInstance("EditorActivity");
|
||||
private static final ILogger LOG = ILogger.newInstance("EditorActivity");
|
||||
|
||||
private ActivityEditorBinding mBinding;
|
||||
private LayoutDiagnosticInfoBinding mDiagnosticInfoBinding;
|
||||
|
||||
@@ -43,7 +43,7 @@ import com.itsaky.androidide.fragments.sheets.ProgressSheet;
|
||||
import com.itsaky.androidide.managers.PreferenceManager;
|
||||
import com.itsaky.androidide.models.ConstantsBridge;
|
||||
import com.itsaky.androidide.utils.BootstrapInstaller;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.utils.TypefaceUtils;
|
||||
import com.itsaky.androidide.views.virtualkeys.SpecialButton;
|
||||
import com.itsaky.androidide.views.virtualkeys.VirtualKeyButton;
|
||||
@@ -66,7 +66,7 @@ import java.util.Map;
|
||||
public class TerminalActivity extends StudioActivity {
|
||||
|
||||
public static final String KEY_WORKING_DIRECTORY = "terminal_workingDirectory";
|
||||
private static final Logger LOG = Logger.newInstance("TerminalActivity");
|
||||
private static final ILogger LOG = ILogger.newInstance("TerminalActivity");
|
||||
private static final byte[] SOURCES_LIST_CONTENT =
|
||||
"deb https://androidide.com/packages/ stable main".getBytes();
|
||||
private final Client client = new Client();
|
||||
|
||||
@@ -25,7 +25,7 @@ import com.itsaky.androidide.R
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.databinding.LayoutEditorFindReplaceBinding
|
||||
import com.itsaky.androidide.utils.DialogUtils
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
|
||||
/**
|
||||
* Shows dialog to replace one or all the matched text in editor searcher.
|
||||
@@ -34,7 +34,7 @@ import com.itsaky.androidide.utils.Logger
|
||||
class ReplaceAction() : SearchActionModeAction() {
|
||||
|
||||
override val id: String = "editor.search.replace"
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
constructor(context: Context) : this() {
|
||||
label = context.getString(R.string.replace)
|
||||
|
||||
@@ -23,13 +23,13 @@ import com.itsaky.androidide.R
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.actions.EditorRelatedAction
|
||||
import com.itsaky.androidide.app.StudioApp
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.toaster.Toaster
|
||||
|
||||
/** @author Akash Yadav */
|
||||
class SaveFileAction() : EditorRelatedAction() {
|
||||
|
||||
private val log = Logger.newInstance("SaveFileAction")
|
||||
private val log = ILogger.newInstance("SaveFileAction")
|
||||
|
||||
override val id: String = "editor_saveFile"
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ 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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -41,7 +41,7 @@ import java.util.Objects;
|
||||
@SuppressWarnings("deprecation")
|
||||
public class AttrValueFormatTabAdapter extends FragmentStatePagerAdapter {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("AttrValueEditorTabAdapter");
|
||||
private static final ILogger LOG = ILogger.newInstance("AttrValueEditorTabAdapter");
|
||||
private final List<Fragment> mFragments = new ArrayList<>();
|
||||
private final List<String> mTitles = new ArrayList<>();
|
||||
private final XMLAttribute attribute;
|
||||
|
||||
@@ -36,7 +36,7 @@ import com.google.gson.JsonObject;
|
||||
import com.itsaky.androidide.R;
|
||||
import com.itsaky.androidide.app.StudioApp;
|
||||
import com.itsaky.androidide.databinding.LayoutCompletionItemBinding;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.utils.TypefaceUtils;
|
||||
import com.itsaky.apiinfo.ApiInfo;
|
||||
import com.itsaky.apiinfo.models.ClassInfo;
|
||||
@@ -53,7 +53,7 @@ import io.github.rosemoe.sora.widget.component.EditorCompletionAdapter;
|
||||
|
||||
public class CompletionListAdapter extends EditorCompletionAdapter {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("CompletionListAdapter");
|
||||
private static final ILogger LOG = ILogger.newInstance("CompletionListAdapter");
|
||||
|
||||
@Override
|
||||
public void attachValues(
|
||||
|
||||
@@ -30,14 +30,14 @@ import com.itsaky.androidide.fragments.IDELogFragment;
|
||||
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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class EditorBottomSheetTabAdapter extends FragmentStateAdapter {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("EditorBottomSheetTabAdapter");
|
||||
private static final ILogger LOG = ILogger.newInstance("EditorBottomSheetTabAdapter");
|
||||
private final List<Tab> fragments;
|
||||
|
||||
public EditorBottomSheetTabAdapter(@NonNull FragmentActivity fragmentActivity) {
|
||||
|
||||
@@ -31,7 +31,7 @@ import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
|
||||
import com.itsaky.androidide.R;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
public abstract class StudioActivity extends AppCompatActivity {
|
||||
private boolean toRequestStorage = true;
|
||||
@@ -39,7 +39,7 @@ public abstract class StudioActivity extends AppCompatActivity {
|
||||
public static final String TAG = "StudioActivity";
|
||||
public static final int REQCODE_STORAGE = 1009;
|
||||
|
||||
protected static Logger LOG = Logger.newInstance("StudioActivity");
|
||||
protected static ILogger LOG = ILogger.newInstance("StudioActivity");
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
||||
@@ -25,7 +25,7 @@ import com.blankj.utilcode.util.ThrowableUtils;
|
||||
import com.itsaky.androidide.CrashHandlerActivity;
|
||||
import com.itsaky.androidide.R;
|
||||
import com.itsaky.androidide.project.ProjectResourceTable;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.apiinfo.ApiInfo;
|
||||
import com.itsaky.attrinfo.AttrInfo;
|
||||
import com.itsaky.inflater.ILayoutInflater;
|
||||
@@ -44,7 +44,7 @@ import java.util.concurrent.CompletionException;
|
||||
|
||||
public class StudioApp extends BaseApplication {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("StudioApp");
|
||||
private static final ILogger LOG = ILogger.newInstance("StudioApp");
|
||||
private static StudioApp instance;
|
||||
private static SDKInfo sdkInfo;
|
||||
private final ILanguageServer mJavaLanguageServer = new JavaLanguageServer();
|
||||
|
||||
@@ -32,7 +32,7 @@ import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.R;
|
||||
import com.itsaky.androidide.utils.Environment;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
@@ -57,7 +57,7 @@ import java.util.LinkedList;
|
||||
public class IDEDocumentsProvider extends DocumentsProvider {
|
||||
|
||||
private static final String ALL_MIME_TYPES = "*/*";
|
||||
private static final Logger LOG = Logger.newInstance("IDEDocumentsProvider");
|
||||
private static final ILogger LOG = ILogger.newInstance("IDEDocumentsProvider");
|
||||
private static final File BASE_DIR = getBaseDir();
|
||||
// The default columns to return information about a root if no specific
|
||||
// columns are requested in a query.
|
||||
|
||||
@@ -44,7 +44,7 @@ import com.itsaky.androidide.project.AndroidProject;
|
||||
import com.itsaky.androidide.tasks.TaskExecutor;
|
||||
import com.itsaky.androidide.tasks.callables.FileTreeCallable;
|
||||
import com.itsaky.androidide.utils.Environment;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.views.editor.CodeEditorView;
|
||||
import com.itsaky.toaster.Toaster;
|
||||
import com.unnamed.b.atv.model.TreeNode;
|
||||
@@ -59,7 +59,7 @@ public class FileTreeFragment extends BottomSheetDialogFragment
|
||||
implements TreeNode.TreeNodeClickListener, TreeNode.TreeNodeLongClickListener {
|
||||
|
||||
private static final String KEY_STORED_TREE_STATE = "fileTree_state";
|
||||
private static final Logger LOG = Logger.newInstance("FileTreeFragment");
|
||||
private static final ILogger LOG = ILogger.newInstance("FileTreeFragment");
|
||||
private LayoutEditorFileTreeBinding binding;
|
||||
private AndroidTreeView mFileTreeView;
|
||||
private FileActionListener mFileActionListener;
|
||||
|
||||
@@ -20,14 +20,14 @@ package com.itsaky.androidide.fragments;
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.models.LogLine;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
public class IDELogFragment extends LogViewFragment {
|
||||
|
||||
private final Logger.LogListener listener = this::log;
|
||||
private final ILogger.LogListener listener = this::log;
|
||||
|
||||
public IDELogFragment() {
|
||||
Logger.addLogListener(listener);
|
||||
ILogger.addLogListener(listener);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -47,7 +47,7 @@ public class IDELogFragment extends LogViewFragment {
|
||||
}
|
||||
|
||||
private void logLine(int priority, String tag, String message) {
|
||||
final var line = new LogLine(Logger.priorityChar(priority), tag, message);
|
||||
final var line = new LogLine(ILogger.priorityChar(priority), tag, message);
|
||||
appendLog(line);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ 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.ILogger;
|
||||
import com.itsaky.androidide.utils.TypefaceUtils;
|
||||
import com.itsaky.androidide.views.editor.IDEEditor;
|
||||
|
||||
@@ -36,7 +36,7 @@ import io.github.rosemoe.sora.lang.EmptyLanguage;
|
||||
|
||||
public abstract class NonEditableEditorFragment extends Fragment {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("NonEditableEditorFragment");
|
||||
private static final ILogger LOG = ILogger.newInstance("NonEditableEditorFragment");
|
||||
private FragmentNonEditableEditorBinding binding;
|
||||
|
||||
@Nullable
|
||||
|
||||
@@ -25,7 +25,7 @@ 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.ILogger;
|
||||
import com.itsaky.androidide.utils.TextWatcherAdapter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -38,7 +38,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
*/
|
||||
public abstract class AbstractReferenceEditor extends BaseValueEditorFragment {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("ReferenceEditor");
|
||||
private static final ILogger LOG = ILogger.newInstance("ReferenceEditor");
|
||||
public TextWatcherAdapter resInputWatcher;
|
||||
|
||||
@Override
|
||||
|
||||
@@ -31,7 +31,7 @@ import androidx.annotation.Nullable;
|
||||
import com.google.android.material.textfield.MaterialAutoCompleteTextView;
|
||||
import com.itsaky.androidide.R;
|
||||
import com.itsaky.androidide.databinding.LayoutDimensionAttrEditorBinding;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.utils.TextWatcherAdapter;
|
||||
import com.itsaky.inflater.values.FrameworkValues;
|
||||
import com.itsaky.inflater.values.ValuesTableFactory;
|
||||
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
|
||||
*/
|
||||
public class DimensionEditor extends AbstractReferenceEditor {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("DimensionEditor");
|
||||
private static final ILogger LOG = ILogger.newInstance("DimensionEditor");
|
||||
public TextWatcherAdapter dimensionInputWatcher;
|
||||
|
||||
private LayoutDimensionAttrEditorBinding binding;
|
||||
|
||||
@@ -25,14 +25,14 @@ 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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
/**
|
||||
* @author Akash Yadav
|
||||
*/
|
||||
public class EnumEditor extends FixedValueEditor {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("EnumEditor");
|
||||
private static final ILogger LOG = ILogger.newInstance("EnumEditor");
|
||||
|
||||
@Override
|
||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
||||
|
||||
@@ -27,7 +27,7 @@ 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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
@@ -37,7 +37,7 @@ import java.util.Arrays;
|
||||
*/
|
||||
public class FlagEditor extends FixedValueEditor {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("FlagEditor");
|
||||
private static final ILogger LOG = ILogger.newInstance("FlagEditor");
|
||||
|
||||
@Override
|
||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
||||
|
||||
@@ -30,7 +30,7 @@ import com.itsaky.androidide.BuildConfig;
|
||||
import com.itsaky.androidide.R;
|
||||
import com.itsaky.androidide.app.BaseApplication;
|
||||
import com.itsaky.androidide.app.StudioApp;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.toaster.Toaster;
|
||||
|
||||
public class IDEPreferences extends BasePreferenceFragment
|
||||
@@ -43,7 +43,7 @@ public class IDEPreferences extends BasePreferenceFragment
|
||||
public static final String KEY_ISSUES = "idepref_issues";
|
||||
public static final String KEY_CHANGELOG = "idepref_changelog";
|
||||
public static final String KEY_ABOUT = "idepref_about";
|
||||
private static final Logger LOG = Logger.newInstance("IDEPreferences");
|
||||
private static final ILogger LOG = ILogger.newInstance("IDEPreferences");
|
||||
private GeneralPreferences mGeneralPrefs;
|
||||
private BuildPreferences mBuildPreferences;
|
||||
private EditorPreferences mEditorPreferences;
|
||||
|
||||
@@ -38,7 +38,7 @@ import com.itsaky.androidide.fragments.attr.BaseValueEditorFragment;
|
||||
import com.itsaky.androidide.models.IconTextListItem;
|
||||
import com.itsaky.androidide.models.XMLAttribute;
|
||||
import com.itsaky.androidide.utils.DialogUtils;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.attrinfo.models.Attr;
|
||||
import com.itsaky.inflater.IAttribute;
|
||||
import com.itsaky.inflater.IView;
|
||||
@@ -63,7 +63,7 @@ public class AttrEditorSheet extends BottomSheetDialogFragment
|
||||
BaseValueEditorFragment.OnValueChangeListener {
|
||||
|
||||
private static final List<IconTextListItem> VIEW_ACTIONS = new ArrayList<>();
|
||||
private static final Logger LOG = Logger.newInstance("AttrBottomSheet");
|
||||
private static final ILogger LOG = ILogger.newInstance("AttrBottomSheet");
|
||||
private AttributeListSheet mAttrListSheet;
|
||||
private AttrValueEditorSheet mValueEditorSheet;
|
||||
private IView selectedView;
|
||||
|
||||
@@ -30,11 +30,11 @@ import android.widget.RelativeLayout;
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.databinding.LayoutProgressSheetBinding;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
public class ProgressSheet extends BaseBottomSheetFragment {
|
||||
|
||||
private final Logger LOG = Logger.newInstance("ProgressSheet");
|
||||
private final ILogger LOG = ILogger.newInstance("ProgressSheet");
|
||||
private LayoutProgressSheetBinding binding;
|
||||
private String message = "";
|
||||
private String subMessage = "";
|
||||
|
||||
@@ -20,7 +20,7 @@ package com.itsaky.androidide.handlers;
|
||||
import com.itsaky.androidide.EditorActivity;
|
||||
import com.itsaky.androidide.project.AndroidProject;
|
||||
import com.itsaky.androidide.project.IDEProject;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
/**
|
||||
* A handler is an implementation that handles a specific feature, data or anything else in
|
||||
@@ -28,7 +28,7 @@ import com.itsaky.androidide.utils.Logger;
|
||||
*/
|
||||
public abstract class IDEHandler {
|
||||
|
||||
protected static final Logger LOG = Logger.instance();
|
||||
protected static final ILogger LOG = ILogger.instance();
|
||||
|
||||
protected Provider provider;
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ package com.itsaky.androidide.language;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.api.ICompletionProvider;
|
||||
import com.itsaky.lsp.api.ILanguageServer;
|
||||
import com.itsaky.lsp.models.CompletionItem;
|
||||
@@ -66,7 +66,7 @@ public class CommonCompletionProvider {
|
||||
String s2 = p2.getSortText() == null ? p2.getLabel() : p2.getSortText();
|
||||
return s1.compareTo(s2);
|
||||
};
|
||||
private static final Logger LOG = Logger.newInstance("CommonCompletionProvider");
|
||||
private static final ILogger LOG = ILogger.newInstance("CommonCompletionProvider");
|
||||
private final ILanguageServer server;
|
||||
private CompletableFuture<CompletionResult> future;
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ 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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import org.antlr.v4.runtime.CharStreams;
|
||||
import org.antlr.v4.runtime.CodePointCharStream;
|
||||
@@ -46,7 +46,7 @@ import io.github.rosemoe.sora.lang.styling.Styles;
|
||||
|
||||
public class GroovyAnalyzer extends SimpleAnalyzeManager<Void> {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("GroovyAnalyzer");
|
||||
private static final ILogger LOG = ILogger.newInstance("GroovyAnalyzer");
|
||||
|
||||
@Override
|
||||
protected Styles analyze(StringBuilder text, Delegate<Void> delegate) {
|
||||
|
||||
@@ -24,7 +24,7 @@ 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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import org.antlr.v4.runtime.CharStreams;
|
||||
import org.antlr.v4.runtime.Token;
|
||||
@@ -43,7 +43,7 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch;
|
||||
|
||||
public class GroovyLanguage extends IDELanguage {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("GroovyLanguage");
|
||||
private static final ILogger LOG = ILogger.newInstance("GroovyLanguage");
|
||||
private final GroovyAnalyzer analyzer;
|
||||
private final GroovyAutoComplete completer;
|
||||
private final NewlineHandler[] newlineHandlers = new NewlineHandler[] {new BraceHandler()};
|
||||
|
||||
@@ -33,7 +33,7 @@ import com.itsaky.androidide.language.IAnalyzeManager;
|
||||
import com.itsaky.androidide.lexers.java.JavaLexer;
|
||||
import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE;
|
||||
import com.itsaky.androidide.utils.CharSequenceReader;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.models.DiagnosticItem;
|
||||
import com.itsaky.lsp.models.DiagnosticSeverity;
|
||||
import com.itsaky.lsp.models.Position;
|
||||
@@ -62,7 +62,7 @@ import io.github.rosemoe.sora.lang.styling.Styles;
|
||||
*/
|
||||
public class JavaAnalyzer extends SimpleAnalyzeManager<Void> implements IAnalyzeManager {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("JavaAnalyzer");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaAnalyzer");
|
||||
private final List<DiagnosticItem> ideDiagnostics = new ArrayList<>();
|
||||
private List<DiagnosticItem> diagnostics = new ArrayList<>();
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import com.itsaky.androidide.language.CommonCompletionProvider;
|
||||
import com.itsaky.androidide.language.IDELanguage;
|
||||
import com.itsaky.androidide.lexers.java.JavaLexer;
|
||||
import com.itsaky.androidide.lexers.java.JavaParser;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.views.editor.IDEEditor;
|
||||
import com.itsaky.lsp.api.ILanguageServer;
|
||||
import com.itsaky.lsp.models.DiagnosticItem;
|
||||
@@ -52,7 +52,7 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch;
|
||||
|
||||
public class JavaLanguage extends IDELanguage {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("JavaLanguage");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaLanguage");
|
||||
private final NewlineHandler[] newlineHandlers;
|
||||
private JavaAnalyzer analyzer;
|
||||
private CommonCompletionProvider completer;
|
||||
|
||||
@@ -26,7 +26,7 @@ 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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import org.antlr.v4.runtime.CharStreams;
|
||||
import org.antlr.v4.runtime.CodePointCharStream;
|
||||
@@ -47,7 +47,7 @@ import io.github.rosemoe.sora.lang.styling.Styles;
|
||||
*/
|
||||
public class XMLAnalyzer extends SimpleAnalyzeManager<Void> {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("XMLAnalyzer");
|
||||
private static final ILogger LOG = ILogger.newInstance("XMLAnalyzer");
|
||||
|
||||
@Override
|
||||
protected Styles analyze(StringBuilder text, Delegate<Void> delegate) {
|
||||
|
||||
@@ -26,7 +26,7 @@ import com.itsaky.androidide.language.CommonCompletionProvider;
|
||||
import com.itsaky.androidide.language.IDELanguage;
|
||||
import com.itsaky.androidide.lexers.xml.XMLLexer;
|
||||
import com.itsaky.androidide.utils.JavaCharacter;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.views.editor.IDEEditor;
|
||||
import com.itsaky.lsp.api.ILanguageServer;
|
||||
|
||||
@@ -47,7 +47,7 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch;
|
||||
|
||||
public class XMLLanguage extends IDELanguage {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("XMLLanguage");
|
||||
private static final ILogger LOG = ILogger.newInstance("XMLLanguage");
|
||||
private final CommonCompletionProvider completer;
|
||||
private final NewlineHandler[] newlineHandlers;
|
||||
private XMLAnalyzer analyzer;
|
||||
|
||||
@@ -39,7 +39,7 @@ import com.itsaky.androidide.models.SearchResult;
|
||||
import com.itsaky.androidide.tasks.TaskExecutor;
|
||||
import com.itsaky.androidide.utils.DialogUtils;
|
||||
import com.itsaky.androidide.utils.LSPUtils;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.views.editor.CodeEditorView;
|
||||
import com.itsaky.androidide.views.editor.IDEEditor;
|
||||
import com.itsaky.lsp.api.ILanguageClient;
|
||||
@@ -65,7 +65,7 @@ import io.github.rosemoe.sora.text.Content;
|
||||
public class IDELanguageClientImpl implements ILanguageClient {
|
||||
|
||||
protected static final Gson gson = new Gson();
|
||||
protected static final Logger LOG = Logger.newInstance("AbstractLanguageClient");
|
||||
protected static final ILogger LOG = ILogger.newInstance("AbstractLanguageClient");
|
||||
private static IDELanguageClientImpl mInstance;
|
||||
private final Map<File, List<DiagnosticItem>> diagnostics = new HashMap<>();
|
||||
protected EditorActivityProvider activityProvider;
|
||||
|
||||
@@ -20,7 +20,7 @@ package com.itsaky.androidide.project;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.inflater.IResourceTable;
|
||||
import com.itsaky.inflater.values.ValuesTableFactory;
|
||||
|
||||
@@ -32,7 +32,7 @@ import java.util.Locale;
|
||||
|
||||
public class ProjectResourceTable implements IResourceTable {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("ProjectResourceFinder");
|
||||
private static final ILogger LOG = ILogger.newInstance("ProjectResourceFinder");
|
||||
private File resDir;
|
||||
private File color;
|
||||
private File layout;
|
||||
|
||||
@@ -25,7 +25,7 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
||||
import com.itsaky.androidide.models.LogLine;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
public class LogReceiver extends BroadcastReceiver {
|
||||
|
||||
@@ -34,7 +34,7 @@ public class LogReceiver extends BroadcastReceiver {
|
||||
public static final String APPEND_LOG = "com.itsaky.androidide.logs.APPEND_LOG";
|
||||
public static final String EXTRA_LINE = "log_line";
|
||||
|
||||
private final Logger LOG = Logger.newInstance("LogReceiver");
|
||||
private final ILogger LOG = ILogger.newInstance("LogReceiver");
|
||||
|
||||
public LogReceiver setLogListener(LogListener listener) {
|
||||
this.listener = listener;
|
||||
|
||||
@@ -41,7 +41,7 @@ import com.itsaky.androidide.tasks.gradle.BaseGradleTasks;
|
||||
import com.itsaky.androidide.tasks.gradle.resources.UpdateResourceClassesTask;
|
||||
import com.itsaky.androidide.utils.Environment;
|
||||
import com.itsaky.androidide.utils.InputStreamLineReader;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.toaster.Toaster;
|
||||
|
||||
import org.jetbrains.annotations.Contract;
|
||||
@@ -75,7 +75,7 @@ public class IDEService {
|
||||
public static final int TASK_LINT = GradleTask.TASK_LINT;
|
||||
public static final int TASK_LINT_DEBUG = GradleTask.TASK_LINT_DEBUG;
|
||||
public static final int TASK_LINT_RELEASE = GradleTask.TASK_LINT_RELEASE;
|
||||
public static final Logger LOG = Logger.newInstance("IDEService");
|
||||
public static final ILogger LOG = ILogger.newInstance("IDEService");
|
||||
private final File projectRoot;
|
||||
private final IProcessExecutor processExecutor;
|
||||
private BuildListener listener;
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
package com.itsaky.androidide.tasks;
|
||||
|
||||
import com.blankj.utilcode.util.ThreadUtils;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
@@ -27,7 +27,7 @@ import java.util.concurrent.CompletionException;
|
||||
|
||||
public class TaskExecutor {
|
||||
|
||||
private final Logger LOG = Logger.newInstance("TaskExecutor");
|
||||
private final ILogger LOG = ILogger.newInstance("TaskExecutor");
|
||||
|
||||
public static <R> void execAsync(Callable<R> callable, Callback<R> callback) {
|
||||
new TaskExecutor().executeAsync(callable, callback);
|
||||
|
||||
@@ -27,7 +27,7 @@ import com.itsaky.androidide.app.StudioApp;
|
||||
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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Collections;
|
||||
@@ -37,7 +37,7 @@ import java.util.Set;
|
||||
|
||||
public abstract class ApkGeneratingTask extends BaseGradleTask {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("ApkGeneratingTask");
|
||||
private static final ILogger LOG = ILogger.newInstance("ApkGeneratingTask");
|
||||
|
||||
/**
|
||||
* Get the directories where APKs are generated. These directories must contain an
|
||||
|
||||
@@ -29,7 +29,7 @@ import com.blankj.utilcode.util.SizeUtils;
|
||||
import com.itsaky.androidide.DesignerActivity;
|
||||
import com.itsaky.androidide.R;
|
||||
import com.itsaky.androidide.models.UIWidget;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.inflater.IAttribute;
|
||||
import com.itsaky.inflater.IView;
|
||||
import com.itsaky.inflater.IViewGroup;
|
||||
@@ -57,7 +57,7 @@ public class WidgetDragListener implements View.OnDragListener {
|
||||
|
||||
public static final String ANDROID_NS = "android";
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("WidgetDragListener");
|
||||
private static final ILogger LOG = ILogger.newInstance("WidgetDragListener");
|
||||
|
||||
public WidgetDragListener(
|
||||
@NonNull Context context, IViewGroup viewGroup, OnViewAddedListener addedListener) {
|
||||
|
||||
@@ -32,7 +32,7 @@ import com.itsaky.androidide.databinding.LayoutEditorBottomSheetBinding;
|
||||
public class EditorBottomSheetBehavior<V extends View> extends BottomSheetBehavior<V> {
|
||||
|
||||
private LayoutEditorBottomSheetBinding binding;
|
||||
private static final Logger LOG = Logger.newInstance("EditorBottomSheetBehavior");
|
||||
private static final ILogger LOG = ILogger.newInstance("EditorBottomSheetBehavior");
|
||||
|
||||
public EditorBottomSheetBehavior(Context context, AttributeSet attributeSet) {
|
||||
super(context, attributeSet);
|
||||
|
||||
@@ -152,5 +152,5 @@ public class HighlightRangeHelper {
|
||||
return false;
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("HighlightRangeHelper");
|
||||
private static final ILogger LOG = ILogger.newInstance("HighlightRangeHelper");
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ import io.github.rosemoe.sora.text.Content;
|
||||
*/
|
||||
public class RecursiveFileSearcher {
|
||||
|
||||
private static final Logger logger = Logger.newInstance("RecursiveFileSearcher");
|
||||
private static final ILogger logger = ILogger.newInstance("RecursiveFileSearcher");
|
||||
|
||||
/**
|
||||
* Search the given text in files recursively in given search directories
|
||||
|
||||
@@ -56,7 +56,7 @@ import com.itsaky.androidide.managers.PreferenceManager;
|
||||
import com.itsaky.androidide.models.ConstantsBridge;
|
||||
import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE;
|
||||
import com.itsaky.androidide.utils.LSPUtils;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.androidide.utils.TypefaceUtils;
|
||||
import com.itsaky.inflater.values.ValuesTableFactory;
|
||||
import com.itsaky.lsp.models.Range;
|
||||
@@ -84,7 +84,7 @@ import io.github.rosemoe.sora.text.Content;
|
||||
@SuppressLint("ViewConstructor") // This view is always dynamically created.
|
||||
public class CodeEditorView extends FrameLayout {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("CodeEditorView");
|
||||
private static final ILogger LOG = ILogger.newInstance("CodeEditorView");
|
||||
private final File file;
|
||||
private final LayoutCodeEditorBinding binding;
|
||||
private boolean isModified;
|
||||
|
||||
@@ -47,7 +47,7 @@ import com.itsaky.androidide.actions.ActionsRegistry.Companion.getInstance
|
||||
import com.itsaky.androidide.actions.editor.SelectAllAction
|
||||
import com.itsaky.androidide.app.StudioApp
|
||||
import com.itsaky.androidide.language.IDELanguage
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.models.DiagnosticItem
|
||||
import com.itsaky.lsp.models.Range
|
||||
@@ -81,7 +81,7 @@ open class EditorActionsMenu(val editor: IDEEditor) :
|
||||
|
||||
private val touchHandler: EditorTouchEventHandler = editor.eventHandler
|
||||
private val receipts: MutableList<SubscriptionReceipt<*>> = mutableListOf()
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
private val list: ListView = ListView(editor.context)
|
||||
private var mLastScroll: Long = 0
|
||||
private var mLastPosition: Int = 0
|
||||
|
||||
@@ -35,7 +35,7 @@ import com.itsaky.androidide.language.IDELanguage;
|
||||
import com.itsaky.androidide.lsp.IDELanguageClientImpl;
|
||||
import com.itsaky.androidide.managers.PreferenceManager;
|
||||
import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.api.ILanguageServer;
|
||||
import com.itsaky.lsp.models.Command;
|
||||
import com.itsaky.lsp.models.DefinitionResult;
|
||||
@@ -71,7 +71,7 @@ import io.github.rosemoe.sora.widget.component.EditorTextActionWindow;
|
||||
public class IDEEditor extends CodeEditor {
|
||||
|
||||
public static final String KEY_FILE = "editor_file";
|
||||
private static final Logger LOG = Logger.newInstance("IDEEditor");
|
||||
private static final ILogger LOG = ILogger.newInstance("IDEEditor");
|
||||
private final EditorActionsMenu mActionsPopup;
|
||||
private IDEEditorSearcher mSearcher;
|
||||
private int mFileVersion;
|
||||
|
||||
@@ -24,7 +24,7 @@ import android.text.style.ForegroundColorSpan;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.models.SignatureHelp;
|
||||
import com.itsaky.lsp.models.SignatureInformation;
|
||||
|
||||
@@ -38,7 +38,7 @@ import io.github.rosemoe.sora.widget.base.EditorPopupWindow;
|
||||
*/
|
||||
public class SignatureHelpWindow extends BaseEditorWindow {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("SignatureHelpWindow");
|
||||
private static final ILogger LOG = ILogger.newInstance("SignatureHelpWindow");
|
||||
|
||||
/**
|
||||
* Create a signature help popup window for editor
|
||||
|
||||
@@ -22,7 +22,7 @@ package io.github.rosemoe.sora.widget
|
||||
import android.app.ProgressDialog
|
||||
import android.widget.Toast
|
||||
import com.itsaky.androidide.R.string
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.androidide.views.editor.IDEEditor
|
||||
import io.github.rosemoe.sora.text.TextUtils
|
||||
import io.github.rosemoe.sora.util.IntPair
|
||||
@@ -36,7 +36,7 @@ import java.util.concurrent.*
|
||||
*/
|
||||
open class IDEEditorSearcher(editor: IDEEditor) : EditorSearcher(editor) {
|
||||
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
protected fun getEditor(): CodeEditor {
|
||||
try {
|
||||
|
||||
+13
-13
@@ -48,7 +48,7 @@ import java.util.Objects;
|
||||
*
|
||||
* @author Akash Yadav
|
||||
*/
|
||||
public class Logger {
|
||||
public class ILogger {
|
||||
|
||||
public static final int DEBUG = 0;
|
||||
public static final int WARNING = 1;
|
||||
@@ -57,19 +57,19 @@ public class Logger {
|
||||
public static final int VERBOSE = 4;
|
||||
private static final String MSG_SEPARATOR = " "; // Separate messages with a space.
|
||||
private static final List<LogListener> logListeners = new ArrayList<>();
|
||||
private static Logger instance;
|
||||
private static ILogger instance;
|
||||
private final String TAG;
|
||||
|
||||
private Logger(String tag) {
|
||||
private ILogger (String tag) {
|
||||
TAG = tag;
|
||||
}
|
||||
|
||||
public static Logger instance() {
|
||||
public static ILogger instance() {
|
||||
return instance == null ? instance = createInstance("AndroidIDE") : instance;
|
||||
}
|
||||
|
||||
private static Logger createInstance(String tag) {
|
||||
return new Logger(tag);
|
||||
private static ILogger createInstance(String tag) {
|
||||
return new ILogger (tag);
|
||||
}
|
||||
|
||||
public static void addLogListener(LogListener listener) {
|
||||
@@ -80,7 +80,7 @@ public class Logger {
|
||||
logListeners.remove(Objects.requireNonNull(listener));
|
||||
}
|
||||
|
||||
public static Logger newInstance(String tag) {
|
||||
public static ILogger newInstance(String tag) {
|
||||
return createInstance(tag);
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ public class Logger {
|
||||
}
|
||||
}
|
||||
|
||||
public Logger warn(Object... messages) {
|
||||
public ILogger warn(Object... messages) {
|
||||
final var msg = generateMessage(messages);
|
||||
Log.w(TAG, msg);
|
||||
notifyListener(WARNING, msg);
|
||||
@@ -145,21 +145,21 @@ public class Logger {
|
||||
}
|
||||
}
|
||||
|
||||
public Logger error(Object... messages) {
|
||||
public ILogger error(Object... messages) {
|
||||
final var msg = generateMessage(messages);
|
||||
Log.e(TAG, msg);
|
||||
notifyListener(ERROR, msg);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Logger verbose(Object... messages) {
|
||||
public ILogger verbose(Object... messages) {
|
||||
final var msg = generateMessage(messages);
|
||||
Log.v(TAG, msg);
|
||||
notifyListener(VERBOSE, msg);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Logger info(Object... messages) {
|
||||
public ILogger info(Object... messages) {
|
||||
final var msg = generateMessage(messages);
|
||||
Log.i(TAG, msg);
|
||||
notifyListener(INFO, msg);
|
||||
@@ -171,7 +171,7 @@ public class Logger {
|
||||
debug(getCallerClassDescription());
|
||||
}
|
||||
|
||||
public Logger debug(Object... messages) {
|
||||
public ILogger debug(Object... messages) {
|
||||
final var msg = generateMessage(messages);
|
||||
Log.d(TAG, msg);
|
||||
notifyListener(DEBUG, msg);
|
||||
@@ -184,7 +184,7 @@ public class Logger {
|
||||
final var element = elements[i];
|
||||
final var klass = element.getClassName();
|
||||
final var method = element.getMethodName();
|
||||
if (Logger.class.getName().equals(klass) || klass.contains("java.lang.Thread")) {
|
||||
if (ILogger.class.getName().equals(klass) || klass.contains("java.lang.Thread")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.util.List;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
/**
|
||||
* Utility class for {@link Logger}.
|
||||
* Utility class for {@link ILogger}.
|
||||
*
|
||||
* @author Akash Yadav
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
/*
|
||||
* This file is part of AndroidIDE.
|
||||
*
|
||||
* AndroidIDE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* AndroidIDE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.itsaky.androidide.utils;
|
||||
|
||||
/**
|
||||
* {@link ILogger} implementation for the Android Runtime (ART).
|
||||
*
|
||||
* @author Akash Yadav
|
||||
*/
|
||||
public class LoggerImpl {}
|
||||
@@ -39,7 +39,7 @@ 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;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
/**
|
||||
* A color picker view.
|
||||
@@ -57,7 +57,7 @@ public class ColorPickerView extends LinearLayout {
|
||||
private final LayoutColorPickerBinding binding;
|
||||
private final int DEFAULT_COLOR;
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("ColorPickerView");
|
||||
private static final ILogger LOG = ILogger.newInstance("ColorPickerView");
|
||||
|
||||
private final Slider.OnChangeListener mValueChangeListener =
|
||||
(slider, value, fromUser) -> {
|
||||
|
||||
@@ -25,7 +25,7 @@ import com.blankj.utilcode.util.ResourceUtils;
|
||||
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 com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import org.jetbrains.annotations.Contract;
|
||||
|
||||
@@ -36,7 +36,7 @@ public class ToolsManager {
|
||||
|
||||
public static final int LOG_SENDER_VERSION = 2;
|
||||
public static final String KEY_LOG_SENDER_VERSION = "tools_logsenderVersion";
|
||||
private static final Logger LOG = Logger.newInstance("ToolsManager");
|
||||
private static final ILogger LOG = ILogger.newInstance("ToolsManager");
|
||||
public static String ARCH_SPECIFIC_ASSET_DATA_DIR = "data/" + BaseApplication.getArch();
|
||||
public static String COMMON_ASSET_DATA_DIR = "data/common";
|
||||
private static PreferenceManager prefs;
|
||||
|
||||
@@ -21,7 +21,7 @@ package com.itsaky.androidide.shell;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.Closeable;
|
||||
@@ -40,7 +40,7 @@ public class ShellServer extends Thread {
|
||||
private BufferedReader output;
|
||||
private Process process;
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("ShellServer");
|
||||
private static final ILogger LOG = ILogger.newInstance("ShellServer");
|
||||
|
||||
public ShellServer(
|
||||
Callback callback,
|
||||
|
||||
@@ -53,7 +53,7 @@ import java.util.zip.ZipInputStream;
|
||||
*/
|
||||
public class BootstrapInstaller {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("BootstrapInstaller");
|
||||
private static final ILogger LOG = ILogger.newInstance("BootstrapInstaller");
|
||||
|
||||
@NonNull
|
||||
public static CompletableFuture<Void> doInstall(
|
||||
|
||||
@@ -43,7 +43,7 @@ public final class Environment {
|
||||
public static final String DEFAULT_HOME = DEFAULT_ROOT + "/framework";
|
||||
private static final String DEFAULT_JAVA_HOME = DEFAULT_HOME + "/jdk";
|
||||
private static final String DEFAULT_ANDROID_HOME = DEFAULT_HOME + "/android-sdk";
|
||||
private static final Logger LOG = Logger.newInstance("Environment");
|
||||
private static final ILogger LOG = ILogger.newInstance("Environment");
|
||||
private static final List<String> blacklist = new ArrayList<>();
|
||||
public static File ROOT;
|
||||
public static File SYSROOT;
|
||||
|
||||
@@ -25,7 +25,7 @@ package com.itsaky.androidide.utils
|
||||
* @author Akash Yadav
|
||||
*/
|
||||
class StopWatch(val label: String, val start: Long = System.currentTimeMillis()) {
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
fun log() {
|
||||
log.debug("$label completed in ${System.currentTimeMillis() - start}ms")
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.itsaky.lsp.models
|
||||
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import io.github.rosemoe.sora.text.Content
|
||||
import io.github.rosemoe.sora.widget.CodeEditor
|
||||
import java.nio.file.Path
|
||||
@@ -66,7 +66,7 @@ data class CompletionItem(
|
||||
constructor() : this("", "", null, null, null, null, CompletionItemKind.NONE, ArrayList(), null)
|
||||
|
||||
companion object {
|
||||
private val LOG = Logger.newInstance("CompletionItem")
|
||||
private val LOG = ILogger.newInstance("CompletionItem")
|
||||
}
|
||||
|
||||
fun setLabel(label: String) {
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
package com.itsaky.lsp.util;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.newInstance;
|
||||
import static com.itsaky.androidide.utils.ILogger.newInstance;
|
||||
|
||||
import com.itsaky.androidide.actions.ActionItem;
|
||||
import com.itsaky.androidide.actions.ActionsRegistry;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.actions.CodeActionsMenu;
|
||||
|
||||
/**
|
||||
@@ -29,7 +29,7 @@ import com.itsaky.lsp.actions.CodeActionsMenu;
|
||||
*/
|
||||
public class LSPEditorActions {
|
||||
|
||||
private static final Logger LOG = newInstance("LSPEditorActions");
|
||||
private static final ILogger LOG = newInstance("LSPEditorActions");
|
||||
|
||||
public static void ensureActionsMenuRegistered(Class<? extends CodeActionsMenu> klass) {
|
||||
final var registry = ActionsRegistry.getInstance();
|
||||
|
||||
@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.CharSequenceInputStream;
|
||||
import com.itsaky.androidide.utils.CharSequenceReader;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.utils.StringSearch;
|
||||
import com.itsaky.lsp.models.DocumentChangeEvent;
|
||||
import com.itsaky.lsp.models.DocumentCloseEvent;
|
||||
@@ -48,7 +48,7 @@ public class FileStore {
|
||||
// TODO organize by package name for speed of list(...)
|
||||
private static final TreeMap<Path, Info> javaSources = new TreeMap<>();
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("FileStore");
|
||||
private static final ILogger LOG = ILogger.newInstance("FileStore");
|
||||
|
||||
public static void shutdown() {
|
||||
workspaceRoots.clear();
|
||||
|
||||
@@ -21,7 +21,7 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.RestrictTo;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.api.ICompletionProvider;
|
||||
import com.itsaky.lsp.api.IDocumentHandler;
|
||||
import com.itsaky.lsp.api.ILanguageClient;
|
||||
@@ -66,7 +66,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class JavaLanguageServer implements ILanguageServer, IDocumentHandler {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("JavaLanguageServer");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaLanguageServer");
|
||||
private final AnalyzeTimer analyzeTimer;
|
||||
private ILanguageClient client;
|
||||
private IServerSettings settings;
|
||||
|
||||
@@ -20,7 +20,7 @@ package com.itsaky.lsp.java.actions
|
||||
import android.content.Context
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.app.BaseApplication
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.compiler.CompileTask
|
||||
@@ -42,7 +42,7 @@ import javax.lang.model.element.Modifier.STATIC
|
||||
*/
|
||||
abstract class FieldBasedAction : BaseCodeAction() {
|
||||
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override fun prepare(data: ActionData) {
|
||||
super.prepare(data)
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.common
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
import io.github.rosemoe.sora.widget.CodeEditor
|
||||
@@ -33,7 +33,7 @@ class FindReferencesAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_findReferences"
|
||||
override var label: String = "Find references"
|
||||
override var requiresUIThread: Boolean = true
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override fun prepare(data: ActionData) {
|
||||
super.prepare(data)
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.common
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
import io.github.rosemoe.sora.widget.CodeEditor
|
||||
@@ -34,7 +34,7 @@ class GoToDefinitionAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_gotoDefinition"
|
||||
override var label: String = "Go to definition"
|
||||
override var requiresUIThread: Boolean = true
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override fun prepare(data: ActionData) {
|
||||
super.prepare(data)
|
||||
|
||||
@@ -18,7 +18,7 @@ package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.google.common.collect.Iterables.toArray
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -37,7 +37,7 @@ class AddImportAction() : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_addImport"
|
||||
override var label: String = "Import class(es)"
|
||||
private val diagnosticCode = DiagnosticCode.NOT_IMPORTED.id
|
||||
private val log = Logger.newInstance("AddImportAction")
|
||||
private val log = ILogger.newInstance("AddImportAction")
|
||||
|
||||
override val titleTextRes: Int = R.string.action_import_classes
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -31,7 +31,7 @@ class AddThrowsAction : BaseCodeAction() {
|
||||
override val id = "lsp_java_addThrows"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.NOT_THROWN.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_add_throws
|
||||
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -31,7 +31,7 @@ class CreateMissingMethodAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_createMissingMethod"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.MISSING_METHOD.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_create_missing_method
|
||||
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -32,7 +32,7 @@ class FieldToBlockAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_fieldToBlock"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.UNUSED_FIELD.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_convert_to_block
|
||||
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -34,7 +34,7 @@ class ImplementAbstractMethodsAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_implementAbstractMethods"
|
||||
override var label: String = ""
|
||||
private var diagnosticCode = DiagnosticCode.DOES_NOT_OVERRIDE_ABSTRACT.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_implement_abstract_methods
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -31,7 +31,7 @@ class RemoveClassAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_removeClass"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.UNUSED_CLASS.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_remove_class
|
||||
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -31,7 +31,7 @@ class RemoveMethodAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_removeMethod"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.UNUSED_METHOD.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_remove_method
|
||||
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -31,7 +31,7 @@ class RemoveUnusedThrowsAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_removeUnusedThrows"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.UNUSED_THROWS.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_remove_unused_throws
|
||||
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -31,7 +31,7 @@ class SuppressUncheckedWarningAction : BaseCodeAction() {
|
||||
override val id = "lsp_java_suppressUncheckedWarning"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.UNCHECKED.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_suppress_unchecked_warning
|
||||
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.diagnostics
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -32,7 +32,7 @@ class VariableToStatementAction : BaseCodeAction() {
|
||||
override val id: String = "lsp_java_variableToStatement"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.UNUSED_LOCAL.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_convert_to_statement
|
||||
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@ import com.github.javaparser.ast.Modifier
|
||||
import com.github.javaparser.ast.body.ConstructorDeclaration
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.app.BaseApplication
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.androidide.utils.StopWatch
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R.string
|
||||
@@ -168,5 +168,5 @@ class GenerateConstructorAction : FieldBasedAction() {
|
||||
override val titleTextRes: Int = string.action_generate_constructor
|
||||
override val id: String = "lsp_java_generateConstructor"
|
||||
override var label: String = ""
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
}
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
package com.itsaky.lsp.java.actions.generators
|
||||
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -31,7 +31,7 @@ class GenerateMissingConstructorAction : BaseCodeAction() {
|
||||
override val id = "lsp_java_generateMissingConstructor"
|
||||
override var label: String = ""
|
||||
private val diagnosticCode = DiagnosticCode.MISSING_CONSTRUCTOR.id
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
override val titleTextRes: Int = R.string.action_generate_missing_constructor
|
||||
|
||||
override fun prepare(data: ActionData) {
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@ import com.github.javaparser.ast.expr.SimpleName
|
||||
import com.github.javaparser.ast.type.VoidType
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.app.BaseApplication
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.FieldBasedAction
|
||||
@@ -51,7 +51,7 @@ import javax.lang.model.element.VariableElement
|
||||
class GenerateSettersAndGettersAction : FieldBasedAction() {
|
||||
override val id: String = "lsp_java_generateSettersAndGetters"
|
||||
override var label: String = ""
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override val titleTextRes: Int = R.string.action_generate_setters_getters
|
||||
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@ import com.github.javaparser.ast.body.MethodDeclaration
|
||||
import com.github.javaparser.ast.stmt.ReturnStmt
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.app.BaseApplication
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.R.string
|
||||
@@ -57,7 +57,7 @@ class GenerateToStringMethodAction : FieldBasedAction() {
|
||||
override val id: String = "lsp_java_generateToString"
|
||||
override var label: String = ""
|
||||
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
override fun onGetFields(fields: List<String>, data: ActionData) {
|
||||
showFieldSelector(fields, data) { selected ->
|
||||
|
||||
+2
-2
@@ -20,7 +20,7 @@ import android.content.Context
|
||||
import com.blankj.utilcode.util.ThreadUtils
|
||||
import com.itsaky.androidide.actions.ActionData
|
||||
import com.itsaky.androidide.app.BaseApplication
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.JavaLanguageServer
|
||||
import com.itsaky.lsp.java.R
|
||||
import com.itsaky.lsp.java.actions.BaseCodeAction
|
||||
@@ -58,7 +58,7 @@ class OverrideSuperclassMethodsAction : BaseCodeAction() {
|
||||
override val titleTextRes: Int = R.string.action_override_superclass_methods
|
||||
override val id: String = "lsp_java_overrideSuperclassMethods"
|
||||
override var label: String = "Override superclass methods"
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
private var position: Long = -1
|
||||
|
||||
override fun prepare(data: ActionData) {
|
||||
|
||||
@@ -18,15 +18,13 @@
|
||||
package com.itsaky.lsp.java.compiler;
|
||||
|
||||
import com.itsaky.androidide.utils.Environment;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
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 com.sun.tools.javac.api.JavacTaskImpl;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
@@ -44,7 +42,7 @@ import javax.tools.JavaFileObject;
|
||||
|
||||
public class CompileBatch implements AutoCloseable {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("CompileBatch");
|
||||
private static final ILogger LOG = ILogger.newInstance("CompileBatch");
|
||||
private static final Path FILE_NOT_FOUND = Paths.get("");
|
||||
final JavaCompilerService parent;
|
||||
final ReusableCompiler.Borrow borrow;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.itsaky.lsp.java.compiler;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.FileStore;
|
||||
import com.itsaky.lsp.java.parser.ParseTask;
|
||||
import com.itsaky.lsp.java.parser.Parser;
|
||||
@@ -53,7 +53,7 @@ public class JavaCompilerService implements CompilerProvider {
|
||||
|
||||
private static final Cache<String, Boolean> cacheContainsWord = new Cache<>();
|
||||
private static final Cache<Void, List<String>> cacheContainsType = new Cache<>();
|
||||
private static final Logger LOG = Logger.newInstance("JavaCompilerService");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaCompilerService");
|
||||
protected final ScanClassPath classPathScanner = new ScanClassPath();
|
||||
protected final Set<Path> classPath, docPath;
|
||||
protected final Set<String> jdkClasses = classPathScanner.jdkTopLevelClasses(),
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
// Forked from JavacTaskImpl
|
||||
package com.itsaky.lsp.java.compiler;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.utils.TestUtils;
|
||||
import com.sun.source.tree.Tree;
|
||||
import com.sun.source.util.JavacTask;
|
||||
@@ -94,7 +94,7 @@ import javax.tools.JavaFileObject;
|
||||
*/
|
||||
public class ReusableCompiler {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("ReusableCompiler");
|
||||
private static final ILogger LOG = ILogger.newInstance("ReusableCompiler");
|
||||
private static final JavacTool systemProvider = JavacTool.create();
|
||||
|
||||
private final List<String> currentOptions = new ArrayList<>();
|
||||
|
||||
@@ -36,7 +36,7 @@ package com.itsaky.lsp.java.compiler;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import java.util.concurrent.Semaphore;
|
||||
import java.util.function.Consumer;
|
||||
@@ -45,7 +45,7 @@ import kotlin.jvm.functions.Function1;
|
||||
|
||||
public class SynchronizedTask {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("SynchronizedTask");
|
||||
private static final ILogger LOG = ILogger.newInstance("SynchronizedTask");
|
||||
private final Semaphore semaphore = new Semaphore(1);
|
||||
private volatile boolean isWriting;
|
||||
private CompileTask task;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.itsaky.lsp.java.parser;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.FileStore;
|
||||
import com.itsaky.lsp.java.compiler.SourceFileManager;
|
||||
import com.itsaky.lsp.java.compiler.SourceFileObject;
|
||||
@@ -486,5 +486,5 @@ public class Parser {
|
||||
return "";
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("JavaParser");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaParser");
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ import com.google.common.io.CharSink;
|
||||
import com.google.common.io.CharSource;
|
||||
import com.google.googlejavaformat.java.Formatter;
|
||||
import com.google.googlejavaformat.java.JavaFormatterOptions;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.api.IServerSettings;
|
||||
import com.itsaky.lsp.java.models.JavaServerSettings;
|
||||
|
||||
@@ -37,7 +37,7 @@ import java.io.Writer;
|
||||
*/
|
||||
public class CodeFormatProvider {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("JavaCodeFormatProvider");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaCodeFormatProvider");
|
||||
|
||||
private final JavaServerSettings settings;
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ import static com.itsaky.lsp.java.utils.JavaPoetUtils.buildMethod;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.api.AbstractServiceProvider;
|
||||
import com.itsaky.lsp.api.ICompletionProvider;
|
||||
import com.itsaky.lsp.api.IServerSettings;
|
||||
@@ -153,7 +153,7 @@ public class CompletionProvider extends AbstractServiceProvider implements IComp
|
||||
"float",
|
||||
"double",
|
||||
};
|
||||
private static final Logger LOG = Logger.newInstance("JavaCompletionProvider");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaCompletionProvider");
|
||||
private final CompilerProvider compiler;
|
||||
private Path completingFile;
|
||||
private long cursor;
|
||||
|
||||
@@ -19,7 +19,7 @@ package com.itsaky.lsp.java.providers;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.compiler.CompileTask;
|
||||
import com.itsaky.lsp.java.compiler.CompilerProvider;
|
||||
import com.itsaky.lsp.java.compiler.SourceFileObject;
|
||||
@@ -50,7 +50,7 @@ import javax.tools.JavaFileObject;
|
||||
|
||||
public class DefinitionProvider {
|
||||
public static final List<Location> NOT_SUPPORTED = Collections.emptyList();
|
||||
private static final Logger LOG = Logger.newInstance("JavaDefinitionProvider");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaDefinitionProvider");
|
||||
private final CompilerProvider compiler;
|
||||
private Path file;
|
||||
private int line, column;
|
||||
|
||||
@@ -19,7 +19,7 @@ package com.itsaky.lsp.java.providers;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.compiler.CompilerProvider;
|
||||
import com.itsaky.lsp.java.visitors.FindBiggerRange;
|
||||
import com.itsaky.lsp.models.ExpandSelectionParams;
|
||||
@@ -33,7 +33,7 @@ import com.sun.source.tree.CompilationUnitTree;
|
||||
*/
|
||||
public class JavaSelectionProvider {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("JavaSelectionProvider");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaSelectionProvider");
|
||||
private final CompilerProvider compiler;
|
||||
|
||||
public JavaSelectionProvider(CompilerProvider compiler) {
|
||||
|
||||
@@ -19,7 +19,7 @@ package com.itsaky.lsp.java.rewrite;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.compiler.CompileTask;
|
||||
import com.itsaky.lsp.java.compiler.CompilerProvider;
|
||||
import com.itsaky.lsp.java.compiler.SynchronizedTask;
|
||||
@@ -52,7 +52,7 @@ import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
|
||||
public class CreateMissingMethod extends Rewrite {
|
||||
private static final Logger LOG = Logger.newInstance("main");
|
||||
private static final ILogger LOG = ILogger.newInstance("main");
|
||||
final Path file;
|
||||
final int position;
|
||||
int argCount = -1;
|
||||
|
||||
@@ -19,7 +19,7 @@ package com.itsaky.lsp.java.rewrite;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.compiler.CompileTask;
|
||||
import com.itsaky.lsp.java.compiler.CompilerProvider;
|
||||
import com.itsaky.lsp.java.compiler.SynchronizedTask;
|
||||
@@ -48,7 +48,7 @@ import javax.lang.model.element.TypeElement;
|
||||
|
||||
public class GenerateRecordConstructor extends Rewrite {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("main");
|
||||
private static final ILogger LOG = ILogger.newInstance("main");
|
||||
final String className;
|
||||
|
||||
public GenerateRecordConstructor(String className) {
|
||||
|
||||
@@ -19,7 +19,7 @@ package com.itsaky.lsp.java.rewrite;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.compiler.CompileTask;
|
||||
import com.itsaky.lsp.java.compiler.CompilerProvider;
|
||||
import com.itsaky.lsp.java.compiler.SynchronizedTask;
|
||||
@@ -59,7 +59,7 @@ import javax.lang.model.util.Elements;
|
||||
|
||||
public class ImplementAbstractMethods extends Rewrite {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("main");
|
||||
private static final ILogger LOG = ILogger.newInstance("main");
|
||||
private final String className;
|
||||
private final String classFile;
|
||||
private final long position;
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
|
||||
package com.itsaky.lsp.java.utils;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.newInstance;
|
||||
import static com.itsaky.androidide.utils.ILogger.newInstance;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.compiler.CompileTask;
|
||||
import com.itsaky.lsp.java.compiler.CompilerProvider;
|
||||
import com.itsaky.lsp.java.rewrite.Rewrite;
|
||||
@@ -60,7 +60,7 @@ public class CodeActionUtils {
|
||||
Pattern.compile("^'((\\w+\\.)*\\w+)' is not thrown");
|
||||
private static final Pattern UNREPORTED_EXCEPTION =
|
||||
Pattern.compile("unreported exception ((\\w+\\.)*\\w+)");
|
||||
private static final Logger LOG = newInstance("JavaCodeActionUtils");
|
||||
private static final ILogger LOG = newInstance("JavaCodeActionUtils");
|
||||
|
||||
public static CodeActionItem createQuickFix(
|
||||
final CompilerProvider compiler, String title, Rewrite rewrite) {
|
||||
|
||||
@@ -77,7 +77,7 @@ import com.github.javaparser.ast.type.TypeParameter
|
||||
import com.github.javaparser.printer.DefaultPrettyPrinter
|
||||
import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration
|
||||
import com.github.javaparser.printer.configuration.PrinterConfiguration
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.java.utils.TypeUtils.toType
|
||||
import com.itsaky.lsp.java.visitors.PrettyPrintingVisitor
|
||||
import com.sun.source.tree.AnnotationTree
|
||||
@@ -115,7 +115,7 @@ import org.jetbrains.annotations.Contract
|
||||
|
||||
object JavaParserUtils {
|
||||
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
|
||||
/**
|
||||
* Collects all the type names from the given node.
|
||||
|
||||
@@ -21,7 +21,7 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.google.common.reflect.ClassPath;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
|
||||
import org.jetbrains.annotations.Contract;
|
||||
|
||||
@@ -47,7 +47,7 @@ import java.util.stream.Stream;
|
||||
|
||||
public class ScanClassPath {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("ScanClassPath");
|
||||
private static final ILogger LOG = ILogger.newInstance("ScanClassPath");
|
||||
|
||||
public Set<String> jdkTopLevelClasses() {
|
||||
LOG.info("Searching for top-level classes in the JDK");
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
package com.itsaky.lsp.java.utils;
|
||||
|
||||
import com.itsaky.androidide.utils.CharSequenceReader;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.FileStore;
|
||||
import com.itsaky.lsp.util.StringUtils;
|
||||
|
||||
@@ -522,5 +522,5 @@ public class StringSearch {
|
||||
|
||||
private static final ThreadLocal<char[]> SKIP_CHAR_BUFFER =
|
||||
ThreadLocal.withInitial(StringSearch::charArray);
|
||||
private static final Logger LOG = Logger.newInstance("StringSearch");
|
||||
private static final ILogger LOG = ILogger.newInstance("StringSearch");
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
package com.itsaky.lsp.java.visitors
|
||||
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.sun.source.tree.BlockTree
|
||||
import com.sun.source.tree.ClassTree
|
||||
import com.sun.source.tree.CompilationUnitTree
|
||||
@@ -49,7 +49,7 @@ import javax.lang.model.type.TypeMirror
|
||||
|
||||
class DiagnosticVisitor(task: JavacTaskImpl?) :
|
||||
TreeScanner<Void?, MutableMap<TreePath?, String>>() {
|
||||
private val log = Logger.newInstance(javaClass.simpleName)
|
||||
private val log = ILogger.newInstance(javaClass.simpleName)
|
||||
private val trees = Trees.instance(task)
|
||||
private val privateDeclarations = mutableMapOf<Element, TreePath>()
|
||||
private val localVariables = mutableMapOf<Element, TreePath>()
|
||||
|
||||
@@ -20,7 +20,7 @@ package com.itsaky.lsp.java.visitors;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.models.Position;
|
||||
import com.itsaky.lsp.models.Range;
|
||||
import com.sun.source.tree.CompilationUnitTree;
|
||||
@@ -57,7 +57,7 @@ public class FindBiggerRange extends TreeScanner<Range, Range> {
|
||||
|
||||
final Range treeRange = getRange(tree);
|
||||
if (treeRange != null && range.isSmallerThan(treeRange)) {
|
||||
Logger.newInstance("FindBiggerRange")
|
||||
ILogger.newInstance("FindBiggerRange")
|
||||
.debug("Selecting tree", tree, tree.getClass(), tree.getKind());
|
||||
return treeRange;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.itsaky.lsp.java.visitors;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.sun.source.tree.CaseTree;
|
||||
import com.sun.source.tree.CompilationUnitTree;
|
||||
import com.sun.source.tree.ErroneousTree;
|
||||
@@ -139,5 +139,5 @@ public class FindCompletionsAt extends TreePathScanner<TreePath, Long> {
|
||||
return b;
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("FindCompletionsAt");
|
||||
private static final ILogger LOG = ILogger.newInstance("FindCompletionsAt");
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.itsaky.lsp.java.visitors;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.sun.source.tree.AssignmentTree;
|
||||
import com.sun.source.tree.ClassTree;
|
||||
import com.sun.source.tree.CompilationUnitTree;
|
||||
@@ -260,5 +260,5 @@ public class FindMethodCallAt extends TreePathScanner<MethodInvocationTree, Inte
|
||||
return null;
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("main");
|
||||
private static final ILogger LOG = ILogger.newInstance("main");
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ import static android.text.TextUtils.substring;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.lsp.java.FileStore;
|
||||
import com.itsaky.lsp.java.compiler.CompileTask;
|
||||
import com.itsaky.lsp.models.HighlightToken;
|
||||
@@ -231,5 +231,5 @@ public class SemanticHighlighter extends TreePathScanner<Void, List<HighlightTok
|
||||
return super.visitMethod(tree, colors);
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("JavaSemanticHighlighter");
|
||||
private static final ILogger LOG = ILogger.newInstance("JavaSemanticHighlighter");
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
package com.itsaky.lsp.api
|
||||
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import com.itsaky.lsp.api.util.ReflectiveLogListener
|
||||
import java.util.*
|
||||
|
||||
@@ -31,18 +31,18 @@ abstract class LoggingTest : BaseLanguageServerTest() {
|
||||
|
||||
init {
|
||||
logListener = ReflectiveLogListener(LoggingTest::class.java)
|
||||
Logger.addLogListener(logListener)
|
||||
ILogger.addLogListener(logListener)
|
||||
}
|
||||
|
||||
@Suppress("unused")
|
||||
@JvmStatic
|
||||
fun log(priority: Int, tag: String, message: String) {
|
||||
System.out.printf(Locale.ROOT, "%-8s%-26s%-20s", Logger.priorityText(priority), tag, message)
|
||||
System.out.printf(Locale.ROOT, "%-8s%-26s%-20s", ILogger.priorityText(priority), tag, message)
|
||||
println()
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("PropertyName")
|
||||
@JvmField
|
||||
protected val LOG = Logger.newInstance(javaClass.simpleName)
|
||||
protected val LOG = ILogger.newInstance(javaClass.simpleName)
|
||||
}
|
||||
@@ -16,12 +16,12 @@
|
||||
*/
|
||||
package com.itsaky.lsp.api.util
|
||||
|
||||
import com.itsaky.androidide.utils.Logger
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
|
||||
/**
|
||||
* @author Akash Yadav
|
||||
*/
|
||||
class ReflectiveLogListener(private val receiver: Class<out Any>) : Logger.LogListener {
|
||||
class ReflectiveLogListener(private val receiver: Class<out Any>) : ILogger.LogListener {
|
||||
override fun log(priority: Int, tag: String, message: String) {
|
||||
val method = receiver.getDeclaredMethod("log", Int::class.java, String::class.java, String::class.java)
|
||||
method.isAccessible = true
|
||||
|
||||
@@ -23,7 +23,7 @@ import androidx.annotation.Nullable;
|
||||
import com.itsaky.androidide.app.BaseApplication;
|
||||
import com.itsaky.androidide.lexers.xml.XMLLexer;
|
||||
import com.itsaky.androidide.utils.CharSequenceReader;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import com.itsaky.androidide.utils.ILogger;
|
||||
import com.itsaky.attrinfo.models.Attr;
|
||||
import com.itsaky.lsp.api.AbstractServiceProvider;
|
||||
import com.itsaky.lsp.api.ICompletionProvider;
|
||||
@@ -59,7 +59,7 @@ import io.github.rosemoe.sora.lang.completion.CompletionCancelledException;
|
||||
*/
|
||||
public class CompletionProvider extends AbstractServiceProvider implements ICompletionProvider {
|
||||
|
||||
private static final Logger LOG = Logger.newInstance("XMLCompletionProvider");
|
||||
private static final ILogger LOG = ILogger.newInstance("XMLCompletionProvider");
|
||||
private static final String APP_NS = "http://schemas.android.com/apk/res/auto";
|
||||
private static final String ANDROID_NS = "http://schemas.android.com/apk/res/android";
|
||||
private static final String TOOLS_NS = "http://schemas.android.com/tools";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user