From 9c6db435ad397d95e1cf5af4b35970bf5db62cb1 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Fri, 24 Sep 2021 20:41:58 +0530 Subject: [PATCH] Backup --- .../androidide/adapters/EditorPagerAdapter.java | 3 ++- .../editor/widget/EditorTextActionModeStarter.java | 11 ++--------- lsp/src/main/java/com/itsaky/lsp/Diagnostic.java | 3 --- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/itsaky/androidide/adapters/EditorPagerAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/EditorPagerAdapter.java index e45db4be4..d12ac0729 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/EditorPagerAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/EditorPagerAdapter.java @@ -80,7 +80,8 @@ public class EditorPagerAdapter extends FragmentStatePagerAdapter implements Edi mFragments.add(EditorFragment .newInstance(file, project, selection) .setFileOpenListener(listener) - .setJLSRequestor(jlsRequestor)); + .setJLSRequestor(jlsRequestor) + .setModificationStateListener(this)); mOpenedFiles.add(file); notifyDataSetChanged(); return mFragments.size() - 1; diff --git a/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java b/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java index ec61a6603..9647cb442 100644 --- a/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java +++ b/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java @@ -71,15 +71,8 @@ class EditorTextActionModeStarter implements CodeEditor.EditorTextActionPresente android.R.attr.actionModePasteDrawable, }); - List diags = mEditor.findDiagnosticsContainingLine(mEditor.getCursor().getLeftLine()); - if(diags != null && diags.size() > 0) { - this.actions = new ArrayList<>(); - for(Diagnostic d : diags) { - if(d != null && d.codeActions != null) { - this.actions.addAll(d.codeActions); - } - } - } else actions = null; + // TODO: Request code actions on selection change + actions = null; if(actions != null && actions.size() > 0) { menu.add(0, 8, 0, mEditor.getContext().getString(com.itsaky.androidide.R.string.msg_code_actions)) diff --git a/lsp/src/main/java/com/itsaky/lsp/Diagnostic.java b/lsp/src/main/java/com/itsaky/lsp/Diagnostic.java index fdf60b20e..115807f4b 100644 --- a/lsp/src/main/java/com/itsaky/lsp/Diagnostic.java +++ b/lsp/src/main/java/com/itsaky/lsp/Diagnostic.java @@ -22,7 +22,4 @@ public class Diagnostic { @SerializedName("tags") public List tags; - - @SerializedName("codeActions") - public List codeActions = new ArrayList<>(); }