From 12ae59f6eb08d6fecab1b3205ea7b8ae97b296f1 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Mon, 4 Apr 2022 11:22:19 +0530 Subject: [PATCH] Organized imports in project --- .../itsaky/androidide/DownloadActivity.java | 4 ++-- .../com/itsaky/androidide/EditorActivity.java | 11 +++++----- .../com/itsaky/androidide/MainActivity.java | 4 ++-- .../adapters/CompletionListAdapter.java | 4 ++-- .../androidide/fragments/LogViewFragment.java | 4 ++-- .../preferences/GeneralPreferences.java | 4 +++- .../language/CommonCompletionProvider.java | 12 +++++----- .../androidide/language/IDELanguage.java | 4 ++-- .../language/groovy/GroovyAnalyzer.java | 10 ++++----- .../language/groovy/GroovyAutoComplete.java | 8 +++---- .../language/groovy/GroovyLanguage.java | 10 ++++----- .../language/java/JavaAnalyzer.java | 12 +++++----- .../language/java/JavaLanguage.java | 18 +++++++-------- .../language/logs/LogLanguageImpl.java | 6 ++--- .../androidide/language/xml/XMLAnalyzer.java | 11 +++++----- .../androidide/language/xml/XMLLanguage.java | 14 ++++++------ .../androidide/lsp/IDELanguageClientImpl.java | 4 ++-- .../syntax/highlighters/JavaHighlighter.java | 4 ++-- .../utils/HighlightRangeHelper.java | 19 +++++++++++++++- .../androidide/utils/ProjectFinder.java | 4 ++-- .../utils/RecursiveFileSearcher.java | 6 ++--- .../views/editor/CodeEditorView.java | 8 +++---- .../views/editor/EditorTextActionMode.java | 8 +++---- .../views/editor/EditorTextActionWindow.java | 14 ++++++------ .../androidide/views/editor/IDEEditor.java | 12 +++++----- .../androidide/lexers/java/JavaLexer.java | 10 ++++++--- .../androidide/lexers/java/JavaParser.java | 22 +++++++++++++++---- .../lexers/javadoc/JavadocLexer.java | 11 +++++++--- .../lexers/javadoc/JavadocParser.java | 20 +++++++++++++---- .../androidide/lexers/xml/XMLLexer.java | 10 ++++++--- .../androidide/lexers/xml/XMLParser.java | 20 +++++++++++++---- lsp/api/src/main/AndroidManifest.xml | 3 +-- .../java/com/itsaky/lsp/models/Locations.kt | 1 - .../java/com/itsaky/lsp/models/Signatures.kt | 2 +- lsp/java/src/main/AndroidManifest.xml | 3 +-- .../java/com/google/googlejavaformat/Doc.java | 1 - .../googlejavaformat/java/Formatter.java | 1 - .../googlejavaformat/java/JavaInput.java | 1 - .../java/JavaInputAstVisitor.java | 1 - .../googlejavaformat/java/StringWrapper.java | 1 - .../java/javadoc/JavadocFormatter.java | 1 - .../java/javadoc/JavadocLexer.java | 1 - .../DiagnosticsCodeActionProvider.java | 4 ++++ .../lsp/java/compiler/SourceFileManager.java | 11 ++++++++-- .../lsp/java/compiler/SynchronizedTask.java | 4 ++-- .../java/providers/CompletionProvider.java | 3 +++ .../rewrite/GenerateSettersAndGetters.java | 3 +++ .../rewrite/ImplementAbstractMethods.java | 3 +++ .../com/itsaky/lsp/java/utils/EditHelper.java | 2 ++ .../lsp/java/utils/ShortTypePrinter.java | 13 ++++++++++- .../itsaky/lsp/java/visitors/FindNameAt.java | 16 ++++++++++++-- .../visitors/FindTypeDeclarationNamed.java | 3 ++- .../java/visitors/FindTypeDeclarations.java | 3 ++- .../java/com/squareup/javapoet/ClassName.java | 1 + .../com/squareup/javapoet/CodeWriter.java | 1 - .../javapoet/ImportCollectingCodeWriter.java | 1 + .../java/com/squareup/javapoet/JavaFile.java | 1 - .../com/squareup/javapoet/MethodSpec.java | 1 + .../com/sun/tools/javac/file/Locations.java | 7 +++--- .../java/jdk/internal/jrtfs/SystemImage.java | 6 ++--- .../providers/JavaCodeActionProviderTest.kt | 4 ---- .../lsp/xml/providers/CompletionProvider.java | 4 ++-- 62 files changed, 258 insertions(+), 157 deletions(-) diff --git a/app/src/main/java/com/itsaky/androidide/DownloadActivity.java b/app/src/main/java/com/itsaky/androidide/DownloadActivity.java index ad06f6f6c..4d128ad61 100755 --- a/app/src/main/java/com/itsaky/androidide/DownloadActivity.java +++ b/app/src/main/java/com/itsaky/androidide/DownloadActivity.java @@ -27,8 +27,6 @@ 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; @@ -54,6 +52,8 @@ import java.io.FileFilter; import java.io.IOException; import java.util.ArrayList; +import abhishekti7.unicorn.filepicker.UnicornFilePicker; + public class DownloadActivity extends StudioActivity { private ActivityDownloadBinding binding; diff --git a/app/src/main/java/com/itsaky/androidide/EditorActivity.java b/app/src/main/java/com/itsaky/androidide/EditorActivity.java index 478c31ccb..db495d6df 100755 --- a/app/src/main/java/com/itsaky/androidide/EditorActivity.java +++ b/app/src/main/java/com/itsaky/androidide/EditorActivity.java @@ -117,12 +117,6 @@ 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; @@ -139,6 +133,11 @@ import java.util.concurrent.CompletionException; import java.util.regex.Pattern; import java.util.stream.Collectors; +import io.github.rosemoe.sora.event.ContentChangeEvent; +import io.github.rosemoe.sora.event.Unsubscribe; +import me.piruin.quickaction.ActionItem; +import me.piruin.quickaction.QuickAction; + public class EditorActivity extends StudioActivity implements FileTreeFragment.FileActionListener, TabLayout.OnTabSelectedListener, diff --git a/app/src/main/java/com/itsaky/androidide/MainActivity.java b/app/src/main/java/com/itsaky/androidide/MainActivity.java index fdf28a768..d6b2b6f73 100755 --- a/app/src/main/java/com/itsaky/androidide/MainActivity.java +++ b/app/src/main/java/com/itsaky/androidide/MainActivity.java @@ -27,8 +27,6 @@ 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; @@ -54,6 +52,8 @@ import java.util.ArrayList; import java.util.Objects; import java.util.concurrent.Callable; +import abhishekti7.unicorn.filepicker.UnicornFilePicker; + public class MainActivity extends StudioActivity implements View.OnClickListener, ProjectWriterCallback { 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 69cf10ef4..de4b9018a 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java @@ -46,11 +46,11 @@ import com.itsaky.apiinfo.models.MethodInfo; import com.itsaky.lsp.models.CompletionItem; import com.itsaky.lsp.models.CompletionItemKind; +import java.util.List; + 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 { private static final Logger LOG = Logger.newInstance("CompletionListAdapter"); 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 2c05531e9..3b1e78369 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/LogViewFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/LogViewFragment.java @@ -27,12 +27,12 @@ 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; +import io.github.rosemoe.sora.lang.Language; + public class LogViewFragment extends NonEditableEditorFragment { private final Language language = getLanguage(); 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 f5e8f5d97..a1d272fe1 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 @@ -17,7 +17,9 @@ **************************************************************************************/ package com.itsaky.androidide.fragments.preferences; -import static com.itsaky.androidide.managers.PreferenceManager.*; +import static com.itsaky.androidide.managers.PreferenceManager.KEY_CONFIRM_PROJECT_OPEN; +import static com.itsaky.androidide.managers.PreferenceManager.KEY_OPEN_PROJECTS; +import static com.itsaky.androidide.managers.PreferenceManager.KEY_TERMINAL_USE_SYSTEM_SHELL; import android.os.Bundle; 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 d959fe660..1e19e4c8c 100644 --- a/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java +++ b/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java @@ -27,12 +27,6 @@ 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; @@ -44,6 +38,12 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; +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; + /** * Common implementation of completion provider which requests completions to provided language * server. 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 be349859b..721612aa2 100644 --- a/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java +++ b/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java @@ -22,12 +22,12 @@ 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; +import io.github.rosemoe.sora.lang.Language; + /** * Base class for language implementations in the IDE. * 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 d9eddc232..f9c173ac5 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 @@ -32,11 +32,6 @@ 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 org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.Token; @@ -44,6 +39,11 @@ import org.antlr.v4.runtime.Token; import java.io.IOException; import java.util.Stack; +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; + 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 c150281c0..69a9dfeca 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 @@ -25,16 +25,16 @@ import com.itsaky.lsp.models.CompletionItem; import com.itsaky.lsp.models.CompletionItemKind; import com.itsaky.lsp.models.InsertTextFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + 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; - public class GroovyAutoComplete { private static final List ANDROIDX_ARTIFACTS = createArtifacts(); 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 cc456d7b4..ba8df8ee1 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 @@ -26,6 +26,11 @@ import com.itsaky.androidide.lexers.groovy.GroovyLexer; import com.itsaky.androidide.utils.CharSequenceReader; import com.itsaky.androidide.utils.Logger; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.Token; + +import java.io.StringReader; + import io.github.rosemoe.sora.lang.analysis.AnalyzeManager; import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; import io.github.rosemoe.sora.lang.completion.CompletionPublisher; @@ -36,11 +41,6 @@ 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; - 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 ba8927cdd..a94bc710e 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 @@ -39,12 +39,6 @@ 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 org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.Token; @@ -55,6 +49,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Stack; +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; + /** * 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 1374f73a8..0a34bdc54 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 @@ -31,6 +31,15 @@ import com.itsaky.androidide.views.editor.IDEEditor; import com.itsaky.lsp.api.ILanguageServer; import com.itsaky.lsp.models.DiagnosticItem; +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 io.github.rosemoe.sora.lang.analysis.AnalyzeManager; import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; import io.github.rosemoe.sora.lang.completion.CompletionPublisher; @@ -41,15 +50,6 @@ 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; - public class JavaLanguage extends IDELanguage { private static final Logger LOG = Logger.newInstance("JavaLanguage"); 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 a16e3e9bb..53c3a7767 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 @@ -25,6 +25,9 @@ import com.itsaky.androidide.language.IDELanguage; import com.itsaky.androidide.models.LogLine; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; +import java.util.ArrayList; +import java.util.List; + import io.github.rosemoe.sora.lang.analysis.AnalyzeManager; import io.github.rosemoe.sora.lang.analysis.SimpleAnalyzeManager; import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; @@ -36,9 +39,6 @@ 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; - public class LogLanguageImpl extends IDELanguage { private static final LogAnalyzer analyzer = new LogAnalyzer(); 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 64da4dd1f..b6247bc40 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,7 +21,6 @@ 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; @@ -29,11 +28,6 @@ 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 org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.Token; @@ -41,6 +35,11 @@ import org.antlr.v4.runtime.Token; import java.io.IOException; import java.util.Stack; +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; + /** * 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 599680f16..116dec687 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 @@ -30,6 +30,13 @@ import com.itsaky.androidide.utils.Logger; import com.itsaky.androidide.views.editor.IDEEditor; import com.itsaky.lsp.api.ILanguageServer; +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 io.github.rosemoe.sora.lang.analysis.AnalyzeManager; import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; import io.github.rosemoe.sora.lang.completion.CompletionPublisher; @@ -38,13 +45,6 @@ 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; - public class XMLLanguage extends IDELanguage { private static final Logger LOG = Logger.newInstance("XMLLanguage"); 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 5fd5ecb72..40b5a7f31 100755 --- a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java +++ b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java @@ -52,8 +52,6 @@ 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; @@ -61,6 +59,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import io.github.rosemoe.sora.text.Content; + /** AndroidIDE specific implementation of the LanguageClient */ public class IDELanguageClientImpl implements ILanguageClient { 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 36e05d2d7..853de6281 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 @@ -23,8 +23,6 @@ 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; @@ -32,6 +30,8 @@ import java.io.StringReader; import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.github.rosemoe.sora.widget.schemes.EditorColorScheme; + public class JavaHighlighter implements Highlighter { @Override 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 ad619e6f4..f3b73649e 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java +++ b/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java @@ -17,7 +17,24 @@ package com.itsaky.androidide.utils; -import static com.itsaky.lsp.models.HighlightTokenKind.*; +import static com.itsaky.lsp.models.HighlightTokenKind.ANNOTATION; +import static com.itsaky.lsp.models.HighlightTokenKind.CONSTRUCTOR; +import static com.itsaky.lsp.models.HighlightTokenKind.ENUM; +import static com.itsaky.lsp.models.HighlightTokenKind.ENUM_TYPE; +import static com.itsaky.lsp.models.HighlightTokenKind.EXCEPTION_PARAMETER; +import static com.itsaky.lsp.models.HighlightTokenKind.FIELD; +import static com.itsaky.lsp.models.HighlightTokenKind.INSTANCE_INIT; +import static com.itsaky.lsp.models.HighlightTokenKind.INTERFACE; +import static com.itsaky.lsp.models.HighlightTokenKind.LOCAL_VARIABLE; +import static com.itsaky.lsp.models.HighlightTokenKind.METHOD_DECLARATION; +import static com.itsaky.lsp.models.HighlightTokenKind.METHOD_INVOCATION; +import static com.itsaky.lsp.models.HighlightTokenKind.PACKAGE_NAME; +import static com.itsaky.lsp.models.HighlightTokenKind.PARAMETER; +import static com.itsaky.lsp.models.HighlightTokenKind.RESOURCE_VARIABLE; +import static com.itsaky.lsp.models.HighlightTokenKind.STATIC_FIELD; +import static com.itsaky.lsp.models.HighlightTokenKind.STATIC_INIT; +import static com.itsaky.lsp.models.HighlightTokenKind.TYPE_NAME; +import static com.itsaky.lsp.models.HighlightTokenKind.TYPE_PARAMETER; import com.itsaky.lsp.models.HighlightToken; import com.itsaky.lsp.models.HighlightTokenKind; 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 69846cf21..741b3cc86 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/ProjectFinder.java +++ b/app/src/main/java/com/itsaky/androidide/utils/ProjectFinder.java @@ -25,8 +25,6 @@ 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; @@ -34,6 +32,8 @@ import java.io.File; import java.io.FileFilter; import java.util.regex.Pattern; +import fr.arnaudguyon.xmltojsonlib.XmlToJson; + public class ProjectFinder { public static AndroidProject fromFolder(File file) { 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 39746b674..6a6d2bd30 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java +++ b/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java @@ -26,9 +26,6 @@ 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; @@ -39,6 +36,9 @@ import java.util.concurrent.Callable; import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.github.rosemoe.sora.text.CharPosition; +import io.github.rosemoe.sora.text.Content; + /** * This class provides API to search in files recursively * 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 1027c6045..3f3800165 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 @@ -60,10 +60,6 @@ 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; @@ -75,6 +71,10 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import io.github.rosemoe.sora.event.ContentChangeEvent; +import io.github.rosemoe.sora.lang.EmptyLanguage; +import io.github.rosemoe.sora.text.Content; + /** * A view that handles opened code editors. * 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 c810e4297..c11bc0dc4 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 @@ -28,15 +28,15 @@ 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; import java.util.stream.Collectors; +import io.github.rosemoe.sora.event.ClickEvent; +import io.github.rosemoe.sora.event.SelectionChangeEvent; +import io.github.rosemoe.sora.widget.component.EditorTextActionWindow; + /** * Text action mode actions for the editor. * 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 d8929b779..ad982ae62 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 @@ -33,6 +33,13 @@ import com.itsaky.androidide.adapters.TextActionItemAdapter; import com.itsaky.androidide.databinding.LayoutEditorActionsBinding; import com.itsaky.androidide.utils.Logger; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; + import io.github.rosemoe.sora.event.HandleStateChangeEvent; import io.github.rosemoe.sora.event.ScrollEvent; import io.github.rosemoe.sora.event.SelectionChangeEvent; @@ -42,13 +49,6 @@ 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; -import java.util.Set; -import java.util.TreeSet; -import java.util.stream.Collectors; - /** * Presents text actions in a popup widow. * 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 1fdfc886d..7f1292d33 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 @@ -62,12 +62,6 @@ 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; @@ -77,6 +71,12 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; +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; + public class IDEEditor extends CodeEditor { public static final String KEY_FILE = "editor_file"; diff --git a/lexers/src/main/java/com/itsaky/androidide/lexers/java/JavaLexer.java b/lexers/src/main/java/com/itsaky/androidide/lexers/java/JavaLexer.java index bef8a4eca..26a04cf56 100755 --- a/lexers/src/main/java/com/itsaky/androidide/lexers/java/JavaLexer.java +++ b/lexers/src/main/java/com/itsaky/androidide/lexers/java/JavaLexer.java @@ -20,12 +20,16 @@ // Generated from JavaLexer.g4 by ANTLR 4.9.2 package com.itsaky.androidide.lexers.java; -import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.RuntimeMetaData; +import org.antlr.v4.runtime.Vocabulary; +import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JavaLexer extends Lexer { 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 bab0bee84..c8c8fd876 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,11 +20,25 @@ // Generated from JavaParser.g4 by ANTLR 4.9.2 package com.itsaky.androidide.lexers.java; -import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.FailedPredicateException; +import org.antlr.v4.runtime.NoViableAltException; +import org.antlr.v4.runtime.Parser; +import org.antlr.v4.runtime.ParserRuleContext; +import org.antlr.v4.runtime.RecognitionException; +import org.antlr.v4.runtime.RuleContext; +import org.antlr.v4.runtime.RuntimeMetaData; +import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.TokenStream; +import org.antlr.v4.runtime.Vocabulary; +import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.ParserATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; -import org.antlr.v4.runtime.tree.*; +import org.antlr.v4.runtime.tree.ParseTreeListener; +import org.antlr.v4.runtime.tree.ParseTreeVisitor; +import org.antlr.v4.runtime.tree.TerminalNode; import java.util.List; diff --git a/lexers/src/main/java/com/itsaky/androidide/lexers/javadoc/JavadocLexer.java b/lexers/src/main/java/com/itsaky/androidide/lexers/javadoc/JavadocLexer.java index 197eff880..6e52a9477 100755 --- a/lexers/src/main/java/com/itsaky/androidide/lexers/javadoc/JavadocLexer.java +++ b/lexers/src/main/java/com/itsaky/androidide/lexers/javadoc/JavadocLexer.java @@ -20,12 +20,17 @@ // Generated from JavadocLexer.g4 by ANTLR 4.9.2 package com.itsaky.androidide.antlr4.javadoc; -import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.RuleContext; +import org.antlr.v4.runtime.RuntimeMetaData; +import org.antlr.v4.runtime.Vocabulary; +import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JavadocLexer extends Lexer { 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 f8121adb2..e6be9205d 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,11 +20,23 @@ // Generated from JavadocParser.g4 by ANTLR 4.9.2 package com.itsaky.androidide.antlr4.javadoc; -import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.NoViableAltException; +import org.antlr.v4.runtime.Parser; +import org.antlr.v4.runtime.ParserRuleContext; +import org.antlr.v4.runtime.RecognitionException; +import org.antlr.v4.runtime.RuntimeMetaData; +import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.TokenStream; +import org.antlr.v4.runtime.Vocabulary; +import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.ParserATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; -import org.antlr.v4.runtime.tree.*; +import org.antlr.v4.runtime.tree.ParseTreeListener; +import org.antlr.v4.runtime.tree.ParseTreeVisitor; +import org.antlr.v4.runtime.tree.TerminalNode; import java.util.List; diff --git a/lexers/src/main/java/com/itsaky/androidide/lexers/xml/XMLLexer.java b/lexers/src/main/java/com/itsaky/androidide/lexers/xml/XMLLexer.java index 91cc01abb..c97929b30 100755 --- a/lexers/src/main/java/com/itsaky/androidide/lexers/xml/XMLLexer.java +++ b/lexers/src/main/java/com/itsaky/androidide/lexers/xml/XMLLexer.java @@ -2,12 +2,16 @@ // D:/Projects/AndroidStudioProjects/AndroidIDE/lexers/src/main/java/com/itsaky/androidide/lexers/xml\XMLLexer.g4 by ANTLR 4.9.2 package com.itsaky.androidide.lexers.xml; -import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.RuntimeMetaData; +import org.antlr.v4.runtime.Vocabulary; +import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class XMLLexer extends Lexer { 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 68fa7daed..ab32ed054 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,11 +2,23 @@ // 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 org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.NoViableAltException; +import org.antlr.v4.runtime.Parser; +import org.antlr.v4.runtime.ParserRuleContext; +import org.antlr.v4.runtime.RecognitionException; +import org.antlr.v4.runtime.RuntimeMetaData; +import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.TokenStream; +import org.antlr.v4.runtime.Vocabulary; +import org.antlr.v4.runtime.VocabularyImpl; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.ParserATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; -import org.antlr.v4.runtime.tree.*; +import org.antlr.v4.runtime.tree.ParseTreeListener; +import org.antlr.v4.runtime.tree.ParseTreeVisitor; +import org.antlr.v4.runtime.tree.TerminalNode; import java.util.List; diff --git a/lsp/api/src/main/AndroidManifest.xml b/lsp/api/src/main/AndroidManifest.xml index 014375e9b..4ac3ada69 100644 --- a/lsp/api/src/main/AndroidManifest.xml +++ b/lsp/api/src/main/AndroidManifest.xml @@ -16,7 +16,6 @@ ~ along with AndroidIDE. If not, see . --> - + \ No newline at end of file diff --git a/lsp/api/src/main/java/com/itsaky/lsp/models/Locations.kt b/lsp/api/src/main/java/com/itsaky/lsp/models/Locations.kt index a576327c6..2b9ad5ec2 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/models/Locations.kt +++ b/lsp/api/src/main/java/com/itsaky/lsp/models/Locations.kt @@ -17,7 +17,6 @@ package com.itsaky.lsp.models -import java.lang.IllegalArgumentException import java.nio.file.Path data class Location (var file: Path, var range: Range) diff --git a/lsp/api/src/main/java/com/itsaky/lsp/models/Signatures.kt b/lsp/api/src/main/java/com/itsaky/lsp/models/Signatures.kt index 4eb0dc44e..7c2767c7e 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/models/Signatures.kt +++ b/lsp/api/src/main/java/com/itsaky/lsp/models/Signatures.kt @@ -18,7 +18,7 @@ package com.itsaky.lsp.models import java.nio.file.Path -import java.util.Collections +import java.util.* data class ParameterInformation (var label: String, var documentation: MarkupContent) { constructor() : this("", MarkupContent()) diff --git a/lsp/java/src/main/AndroidManifest.xml b/lsp/java/src/main/AndroidManifest.xml index 4f1493703..f6388aed0 100644 --- a/lsp/java/src/main/AndroidManifest.xml +++ b/lsp/java/src/main/AndroidManifest.xml @@ -15,7 +15,6 @@ ~ You should have received a copy of the GNU General Public License ~ along with AndroidIDE. If not, see . --> - + \ No newline at end of file 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 493478216..207032108 100644 --- a/lsp/java/src/main/java/com/google/googlejavaformat/Doc.java +++ b/lsp/java/src/main/java/com/google/googlejavaformat/Doc.java @@ -15,7 +15,6 @@ package com.google.googlejavaformat; import static com.google.common.collect.Iterables.getLast; - import static java.lang.Math.max; import com.google.common.base.MoreObjects; 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 bbaf55068..df1013974 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,7 +16,6 @@ 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; 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 d9b306f8d..5d4a9b955 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,7 +16,6 @@ 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; 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 422b4420e..4d1d392d3 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,7 +41,6 @@ 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; 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 fa6ca9755..9145f1448 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,7 +15,6 @@ 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; 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 c5139e2e1..f83230df5 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,7 +17,6 @@ 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; 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 2275651e1..abaca9e93 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,7 +45,6 @@ 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; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/DiagnosticsCodeActionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/DiagnosticsCodeActionProvider.java index e435492de..ec18c5ea3 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/DiagnosticsCodeActionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/DiagnosticsCodeActionProvider.java @@ -28,7 +28,9 @@ import static com.itsaky.lsp.java.utils.CodeActionUtils.unwrapJCDiagnostic; import android.text.TextUtils; import android.util.Pair; + import androidx.annotation.NonNull; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; @@ -50,6 +52,7 @@ import com.itsaky.lsp.models.CodeActionItem; import com.itsaky.lsp.models.DiagnosticItem; import com.itsaky.lsp.models.Range; import com.sun.tools.javac.util.JCDiagnostic; + import java.nio.file.Path; import java.time.Instant; import java.util.ArrayList; @@ -57,6 +60,7 @@ import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.stream.Collectors; + import javax.tools.Diagnostic; import javax.tools.JavaFileObject; 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 ad8c03e2f..2aa975e4f 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 @@ -25,11 +25,18 @@ import java.io.File; import java.io.IOException; import java.nio.charset.Charset; import java.nio.file.Path; -import java.util.*; +import java.util.Collection; +import java.util.Set; import java.util.logging.Logger; import java.util.stream.Stream; -import javax.tools.*; +import javax.tools.Diagnostic; +import javax.tools.FileObject; +import javax.tools.ForwardingJavaFileManager; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; public class SourceFileManager extends ForwardingJavaFileManager { 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 56007b7a5..318b5e560 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 @@ -38,11 +38,11 @@ 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 { private static final Logger LOG = Logger.newInstance("SynchronizedTask"); 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 6e8e5fdd7..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 @@ -22,6 +22,7 @@ import static com.itsaky.lsp.java.utils.EditHelper.repeatSpaces; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.utils.Logger; import com.itsaky.lsp.api.AbstractServiceProvider; import com.itsaky.lsp.api.ICompletionProvider; @@ -58,6 +59,7 @@ import com.sun.source.tree.SwitchTree; 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.time.Duration; @@ -73,6 +75,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.lang.model.element.AnnotationMirror; 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/GenerateSettersAndGetters.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateSettersAndGetters.java index 7f9fae9c1..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 @@ -17,6 +17,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; + import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.utils.EditHelper; @@ -31,6 +32,7 @@ import com.squareup.javapoet.TypeName; 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.util.ArrayList; import java.util.Collections; @@ -39,6 +41,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.TreeSet; + 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/itsaky/lsp/java/rewrite/ImplementAbstractMethods.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ImplementAbstractMethods.java index cb1c457b6..3101b0e5d 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ImplementAbstractMethods.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ImplementAbstractMethods.java @@ -18,6 +18,7 @@ package com.itsaky.lsp.java.rewrite; 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; @@ -38,6 +39,7 @@ import com.sun.source.tree.ImportTree; import com.sun.source.tree.Tree; import com.sun.source.util.Trees; import com.sun.tools.javac.util.JCDiagnostic; + import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; @@ -47,6 +49,7 @@ import java.util.Set; import java.util.StringJoiner; import java.util.TreeSet; import java.util.stream.Collectors; + 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/EditHelper.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/EditHelper.java index 30df503e2..1b54c156c 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/EditHelper.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/EditHelper.java @@ -30,6 +30,7 @@ import com.sun.source.tree.Tree; import com.sun.source.util.JavacTask; import com.sun.source.util.SourcePositions; import com.sun.source.util.Trees; + import java.nio.file.Path; import java.util.Arrays; import java.util.Collections; @@ -37,6 +38,7 @@ import java.util.List; import java.util.Objects; import java.util.Set; import java.util.StringJoiner; + import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.element.Name; 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 a34e09f8e..d1f4a45d0 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 @@ -6,7 +6,18 @@ import java.util.stream.Collectors; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.element.VariableElement; -import javax.lang.model.type.*; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.ErrorType; +import javax.lang.model.type.ExecutableType; +import javax.lang.model.type.IntersectionType; +import javax.lang.model.type.NoType; +import javax.lang.model.type.NullType; +import javax.lang.model.type.PrimitiveType; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.TypeVariable; +import javax.lang.model.type.UnionType; +import javax.lang.model.type.WildcardType; import javax.lang.model.util.AbstractTypeVisitor8; // TODO this should be package-private once completions code is refactored 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 8786d82b7..9dc2056d3 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 @@ -19,8 +19,20 @@ package com.itsaky.lsp.java.visitors; 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 com.sun.source.tree.ClassTree; +import com.sun.source.tree.CompilationUnitTree; +import com.sun.source.tree.IdentifierTree; +import com.sun.source.tree.MemberReferenceTree; +import com.sun.source.tree.MemberSelectTree; +import com.sun.source.tree.MethodTree; +import com.sun.source.tree.NewClassTree; +import com.sun.source.tree.Tree; +import com.sun.source.tree.VariableTree; +import com.sun.source.util.JavacTask; +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.Name; 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 53b410d7f..19d0c2111 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 @@ -17,7 +17,8 @@ package com.itsaky.lsp.java.visitors; -import com.sun.source.tree.*; +import com.sun.source.tree.ClassTree; +import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.TreeScanner; import java.util.ArrayList; 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 ce3a5226d..046a76389 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 @@ -17,7 +17,8 @@ package com.itsaky.lsp.java.visitors; -import com.sun.source.tree.*; +import com.sun.source.tree.ClassTree; +import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.TreeScanner; import java.util.ArrayList; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/ClassName.java b/lsp/java/src/main/java/com/squareup/javapoet/ClassName.java index b215f7457..de0012487 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/ClassName.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/ClassName.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; + import javax.lang.model.element.Element; import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; 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 7b55c3229..64dea41eb 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/CodeWriter.java @@ -19,7 +19,6 @@ 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; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/ImportCollectingCodeWriter.java b/lsp/java/src/main/java/com/squareup/javapoet/ImportCollectingCodeWriter.java index 228589920..034c098f2 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/ImportCollectingCodeWriter.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/ImportCollectingCodeWriter.java @@ -18,6 +18,7 @@ package com.squareup.javapoet; import androidx.annotation.NonNull; + import java.io.IOException; import java.util.Collections; import java.util.Map; 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 d03ce1929..38129aa8b 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/JavaFile.java @@ -17,7 +17,6 @@ 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; diff --git a/lsp/java/src/main/java/com/squareup/javapoet/MethodSpec.java b/lsp/java/src/main/java/com/squareup/javapoet/MethodSpec.java index f89cb9522..ef99c6fb1 100644 --- a/lsp/java/src/main/java/com/squareup/javapoet/MethodSpec.java +++ b/lsp/java/src/main/java/com/squareup/javapoet/MethodSpec.java @@ -28,6 +28,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; + import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; 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 21644a009..57a032550 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,7 +30,6 @@ 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; @@ -48,9 +47,6 @@ 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; @@ -101,6 +97,9 @@ 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 * File.pathSeparator-separated String form) into a boot class path, user class path, and source 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 d62041bd1..ded964cea 100644 --- a/lsp/java/src/main/java/jdk/internal/jrtfs/SystemImage.java +++ b/lsp/java/src/main/java/jdk/internal/jrtfs/SystemImage.java @@ -26,9 +26,6 @@ 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; @@ -38,6 +35,9 @@ 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. *

It is used internally in the JDK to implement jimage/jrtfs access, but also compiled and diff --git a/lsp/java/src/test/java/com/itsaky/lsp/java/providers/JavaCodeActionProviderTest.kt b/lsp/java/src/test/java/com/itsaky/lsp/java/providers/JavaCodeActionProviderTest.kt index 0f309ae2a..9be051aec 100644 --- a/lsp/java/src/test/java/com/itsaky/lsp/java/providers/JavaCodeActionProviderTest.kt +++ b/lsp/java/src/test/java/com/itsaky/lsp/java/providers/JavaCodeActionProviderTest.kt @@ -17,7 +17,6 @@ package com.itsaky.lsp.java.providers -import androidx.core.util.Pair import com.google.common.truth.Truth.assertThat import com.itsaky.lsp.api.ILanguageServer import com.itsaky.lsp.api.LoggingTest @@ -26,14 +25,11 @@ import com.itsaky.lsp.models.CodeActionParams import com.itsaky.lsp.models.DiagnosticItem import com.itsaky.lsp.models.Position import com.itsaky.lsp.models.Range -import com.squareup.javapoet.MethodSpec -import com.squareup.javapoet.TypeName import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import java.util.* -import javax.lang.model.element.Modifier /** * @author Akash Yadav 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 1d16699ec..592db180b 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 @@ -39,8 +39,6 @@ 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; @@ -52,6 +50,8 @@ import java.util.Objects; import java.util.Set; import java.util.regex.Pattern; +import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; + /** * Completion provider for the XML Language *