refactor(javac): update nb-javac-android

This replaces the usage of 'com.sun' package from javac to 'openjdk'.

app/proguard-rules.pro

@@ -7,7 +7,7 @@
 -keep class javax.** { *; }
 
 # keep javac classes
--keep class com.sun.** { *; }
+-keep class openjdk.** { *; }
 
 # Android builder model interfaces
 -keep class com.android.** { *; }
@@ -83,4 +83,4 @@
 -keepclasseswithmembers class ** {
     native <methods>;
 }
--keep class com.itsaky.androidide.treesitter.** { *; }
+-keep class com.itsaky.androidide.treesitter.** { *; }

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt

@@ -30,9 +30,9 @@ import com.itsaky.androidide.projects.ProjectManager
 import com.itsaky.androidide.resources.R
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.utils.flashInfo
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.Tree.Kind.VARIABLE
-import com.sun.source.tree.VariableTree
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.Tree.Kind.VARIABLE
+import openjdk.source.tree.VariableTree
 import io.github.rosemoe.sora.widget.CodeEditor
 import java.nio.file.Path
 import java.util.concurrent.CompletableFuture

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateConstructorAction.kt

@@ -34,16 +34,16 @@ import com.itsaky.androidide.projects.ProjectManager
 import com.itsaky.androidide.resources.R.string
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.utils.flashError
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.VariableTree
-import com.sun.source.util.TreePath
-import com.sun.tools.javac.api.JavacTrees
-import com.sun.tools.javac.code.Symbol.ClassSymbol
-import com.sun.tools.javac.code.Symbol.VarSymbol
-import com.sun.tools.javac.code.Type
-import com.sun.tools.javac.tree.JCTree
-import com.sun.tools.javac.tree.TreeInfo
-import com.sun.tools.javac.util.ListBuffer
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.VariableTree
+import openjdk.source.util.TreePath
+import openjdk.tools.javac.api.JavacTrees
+import openjdk.tools.javac.code.Symbol.ClassSymbol
+import openjdk.tools.javac.code.Symbol.VarSymbol
+import openjdk.tools.javac.code.Type
+import openjdk.tools.javac.tree.JCTree
+import openjdk.tools.javac.tree.TreeInfo
+import openjdk.tools.javac.util.ListBuffer
 import io.github.rosemoe.sora.widget.CodeEditor
 import java.util.concurrent.CompletableFuture
 
@@ -152,7 +152,7 @@ class GenerateConstructorAction : FieldBasedAction() {
     return constructor
   }
 
-  private fun mapTypes(paths: List<TreePath>): com.sun.tools.javac.util.List<Type> {
+  private fun mapTypes(paths: List<TreePath>): openjdk.tools.javac.util.List<Type> {
     val buffer = ListBuffer<Type>()
     for (path in paths) {
       val leaf = path.leaf

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt

@@ -38,9 +38,9 @@ import com.itsaky.androidide.projects.ProjectManager
 import com.itsaky.androidide.resources.R
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.utils.flashError
-import com.sun.source.tree.ClassTree
-import com.sun.source.util.TreePath
-import com.sun.source.util.Trees
+import openjdk.source.tree.ClassTree
+import openjdk.source.util.TreePath
+import openjdk.source.util.Trees
 import io.github.rosemoe.sora.widget.CodeEditor
 import java.util.concurrent.CompletableFuture
 import javax.lang.model.element.Modifier.FINAL

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt

@@ -34,15 +34,15 @@ import com.itsaky.androidide.resources.R
 import com.itsaky.androidide.resources.R.string
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.utils.flashError
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.VariableTree
-import com.sun.source.util.TreePath
-import com.sun.tools.javac.api.JavacTrees
-import com.sun.tools.javac.code.Symbol.ClassSymbol
-import com.sun.tools.javac.code.Symbol.MethodSymbol
-import com.sun.tools.javac.tree.JCTree
-import com.sun.tools.javac.tree.TreeInfo
-import com.sun.tools.javac.util.Names
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.VariableTree
+import openjdk.source.util.TreePath
+import openjdk.tools.javac.api.JavacTrees
+import openjdk.tools.javac.code.Symbol.ClassSymbol
+import openjdk.tools.javac.code.Symbol.MethodSymbol
+import openjdk.tools.javac.tree.JCTree
+import openjdk.tools.javac.tree.TreeInfo
+import openjdk.tools.javac.util.Names
 import io.github.rosemoe.sora.widget.CodeEditor
 import java.util.concurrent.CompletableFuture
 import javax.lang.model.element.VariableElement

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt

@@ -39,8 +39,8 @@ import com.itsaky.androidide.projects.ProjectManager
 import com.itsaky.androidide.resources.R
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.utils.flashError
-import com.sun.source.tree.MethodTree
-import com.sun.source.util.Trees
+import openjdk.source.tree.MethodTree
+import openjdk.source.util.Trees
 import io.github.rosemoe.sora.widget.CodeEditor
 import java.util.Arrays
 import java.util.Optional

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilationTaskProcessor.kt

@@ -17,8 +17,8 @@
 
 package com.itsaky.androidide.lsp.java.compiler
 
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.tools.javac.api.JavacTaskImpl
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.tools.javac.api.JavacTaskImpl
 import java.util.function.*
 
 /**

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java

@@ -38,12 +38,12 @@ import com.itsaky.androidide.tooling.api.IProject;
 import com.itsaky.androidide.utils.ClassTrie;
 import com.itsaky.androidide.utils.SourceClassTrie;
 import com.itsaky.androidide.utils.StopWatch;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.util.TreePath;
-import com.sun.tools.javac.api.ClientCodeWrapper;
-import com.sun.tools.javac.api.JavacTaskImpl;
-import com.sun.tools.javac.code.Kinds;
-import com.sun.tools.javac.util.JCDiagnostic;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.util.TreePath;
+import openjdk.tools.javac.api.ClientCodeWrapper;
+import openjdk.tools.javac.api.JavacTaskImpl;
+import openjdk.tools.javac.code.Kinds;
+import openjdk.tools.javac.util.JCDiagnostic;
 
 import java.io.File;
 import java.nio.file.Path;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java

@@ -20,8 +20,8 @@ package com.itsaky.androidide.lsp.java.compiler;
 import androidx.annotation.NonNull;
 
 import com.itsaky.androidide.javac.services.partial.DiagnosticListenerImpl;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.tools.javac.api.JavacTaskImpl;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.tools.javac.api.JavacTaskImpl;
 
 import java.nio.file.Path;
 import java.util.List;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/DefaultCompilationTaskProcessor.kt

@@ -19,8 +19,8 @@ package com.itsaky.androidide.lsp.java.compiler
 
 import com.itsaky.androidide.javac.services.util.JavacTaskUtil
 import com.itsaky.androidide.utils.StopWatch
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.tools.javac.api.JavacTaskImpl
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.tools.javac.api.JavacTaskImpl
 import java.util.function.Consumer
 
 /**

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java

@@ -44,11 +44,11 @@ import com.itsaky.androidide.utils.Environment;
 import com.itsaky.androidide.utils.ILogger;
 import com.itsaky.androidide.utils.SourceClassTrie;
 import com.itsaky.androidide.utils.StopWatch;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.Trees;
 
 import java.io.BufferedReader;
 import java.io.File;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java

@@ -33,9 +33,9 @@ import com.itsaky.androidide.utils.ClassTrie;
 import com.itsaky.androidide.utils.Environment;
 import com.itsaky.androidide.utils.ILogger;
 import com.itsaky.androidide.utils.SourceClassTrie;
-import com.sun.tools.javac.api.JavacTool;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.Context;
+import openjdk.tools.javac.api.JavacTool;
+import openjdk.tools.javac.file.JavacFileManager;
+import openjdk.tools.javac.util.Context;
 
 import java.io.File;
 import java.io.IOException;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ParseTask.java

@@ -17,8 +17,8 @@
 
 package com.itsaky.androidide.lsp.java.parser;
 
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.util.JavacTask;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.util.JavacTask;
 
 public class ParseTask {
   public final JavacTask task;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java

@@ -24,17 +24,17 @@ import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.projects.ProjectManager;
 import com.itsaky.androidide.projects.api.ModuleProject;
 import com.itsaky.androidide.utils.ILogger;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodTree;
-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.Trees;
-import com.sun.tools.javac.api.JavacTool;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.Trees;
+import openjdk.tools.javac.api.JavacTool;
 
 import java.io.IOException;
 import java.nio.file.Path;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/CompletionProvider.java

@@ -51,8 +51,8 @@ import com.itsaky.androidide.lsp.models.CompletionResult;
 import com.itsaky.androidide.utils.DocumentUtils;
 import com.itsaky.androidide.utils.ILogger;
 import com.itsaky.androidide.utils.StopWatch;
-import com.sun.source.tree.Tree;
-import com.sun.source.util.TreePath;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.TreePath;
 
 import java.nio.file.Path;
 import java.time.Duration;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt

@@ -28,14 +28,14 @@ import com.itsaky.androidide.models.Range
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
 import com.itsaky.androidide.projects.FileManager
 import com.itsaky.androidide.utils.DocumentUtils.isSameFile
-import com.sun.source.tree.BlockTree
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.tree.LineMap
-import com.sun.source.tree.MethodTree
-import com.sun.source.tree.VariableTree
-import com.sun.source.util.TreePath
-import com.sun.source.util.Trees
+import openjdk.source.tree.BlockTree
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.tree.LineMap
+import openjdk.source.tree.MethodTree
+import openjdk.source.tree.VariableTree
+import openjdk.source.util.TreePath
+import openjdk.source.util.Trees
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.Locale

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProvider.java

@@ -24,7 +24,7 @@ import com.itsaky.androidide.lsp.java.compiler.CompilerProvider;
 import com.itsaky.androidide.lsp.java.visitors.FindBiggerRange;
 import com.itsaky.androidide.lsp.models.ExpandSelectionParams;
 import com.itsaky.androidide.models.Range;
-import com.sun.source.tree.CompilationUnitTree;
+import openjdk.source.tree.CompilationUnitTree;
 
 /**
  * Selection provider implementation for Java.

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java

@@ -28,8 +28,8 @@ import com.itsaky.androidide.lsp.java.visitors.FindReferences;
 import com.itsaky.androidide.lsp.models.ReferenceParams;
 import com.itsaky.androidide.lsp.models.ReferenceResult;
 import com.itsaky.androidide.models.Location;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.util.TreePath;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.util.TreePath;
 
 import java.nio.file.Path;
 import java.util.ArrayList;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java

@@ -32,20 +32,20 @@ import com.itsaky.androidide.lsp.models.ParameterInformation;
 import com.itsaky.androidide.lsp.models.SignatureHelp;
 import com.itsaky.androidide.lsp.models.SignatureHelpParams;
 import com.itsaky.androidide.lsp.models.SignatureInformation;
-import com.sun.source.doctree.DocCommentTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.NewClassTree;
-import com.sun.source.tree.Scope;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.DocTrees;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
+import openjdk.source.doctree.DocCommentTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.ExpressionTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodInvocationTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.NewClassTree;
+import openjdk.source.tree.Scope;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.DocTrees;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.util.ArrayList;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ClassNamesCompletionProvider.kt

@@ -24,9 +24,9 @@ import com.itsaky.androidide.lsp.java.providers.CompletionProvider
 import com.itsaky.androidide.lsp.models.CompletionResult
 import com.itsaky.androidide.lsp.models.MatchLevel.NO_MATCH
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.util.TreePath
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.util.TreePath
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.Objects

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt

@@ -43,8 +43,8 @@ import com.itsaky.androidide.lsp.models.MatchLevel
 import com.itsaky.androidide.lsp.models.MethodCompletionData
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
 import com.itsaky.androidide.utils.ILogger
-import com.sun.source.tree.Tree
-import com.sun.source.util.TreePath
+import openjdk.source.tree.Tree
+import openjdk.source.util.TreePath
 import java.nio.file.Path
 import javax.lang.model.element.Element
 import javax.lang.model.element.ElementKind.ANNOTATION_TYPE

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IdentifierCompletionProvider.kt

@@ -23,7 +23,7 @@ import com.itsaky.androidide.lsp.java.compiler.JavaCompilerService
 import com.itsaky.androidide.lsp.models.CompletionItem
 import com.itsaky.androidide.lsp.models.CompletionResult
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
-import com.sun.source.util.TreePath
+import openjdk.source.util.TreePath
 import java.nio.file.Path
 
 /** @author Akash Yadav */

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt

@@ -30,11 +30,11 @@ import com.itsaky.androidide.projects.api.ModuleProject
 import com.itsaky.androidide.projects.util.BootClasspathProvider
 import com.itsaky.androidide.utils.ClassTrie
 import com.itsaky.androidide.utils.ClassTrie.Node
-import com.sun.source.util.TreePath
-import com.sun.tools.javac.api.JavacTrees
-import com.sun.tools.javac.code.Symbol.MethodSymbol
-import com.sun.tools.javac.model.JavacTypes
-import com.sun.tools.javac.tree.JCTree.JCImport
+import openjdk.source.util.TreePath
+import openjdk.tools.javac.api.JavacTrees
+import openjdk.tools.javac.code.Symbol.MethodSymbol
+import openjdk.tools.javac.model.JavacTypes
+import openjdk.tools.javac.tree.JCTree.JCImport
 import java.nio.file.Path
 import javax.lang.model.element.Element
 import javax.lang.model.element.ElementKind

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/KeywordCompletionProvider.kt

@@ -24,11 +24,11 @@ import com.itsaky.androidide.lsp.models.CompletionItem
 import com.itsaky.androidide.lsp.models.CompletionResult
 import com.itsaky.androidide.lsp.models.MatchLevel.NO_MATCH
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.tree.MethodTree
-import com.sun.source.tree.Tree
-import com.sun.source.util.TreePath
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.tree.MethodTree
+import openjdk.source.tree.Tree
+import openjdk.source.util.TreePath
 import java.nio.file.Path
 
 /**

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt

@@ -25,10 +25,10 @@ import com.itsaky.androidide.lsp.models.CompletionResult
 import com.itsaky.androidide.lsp.models.MatchLevel
 import com.itsaky.androidide.lsp.models.MatchLevel.NO_MATCH
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
-import com.sun.source.tree.MemberReferenceTree
-import com.sun.source.tree.Scope
-import com.sun.source.util.TreePath
-import com.sun.source.util.Trees
+import openjdk.source.tree.MemberReferenceTree
+import openjdk.source.tree.Scope
+import openjdk.source.util.TreePath
+import openjdk.source.util.Trees
 import java.nio.file.Path
 import javax.lang.model.element.ElementKind.METHOD
 import javax.lang.model.element.ExecutableElement

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt

@@ -26,11 +26,11 @@ import com.itsaky.androidide.lsp.models.CompletionResult
 import com.itsaky.androidide.lsp.models.MatchLevel
 import com.itsaky.androidide.lsp.models.MatchLevel.NO_MATCH
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
-import com.sun.source.tree.MemberSelectTree
-import com.sun.source.tree.Scope
-import com.sun.source.util.TreePath
-import com.sun.source.util.Trees
-import com.sun.tools.javac.code.Symbol
+import openjdk.source.tree.MemberSelectTree
+import openjdk.source.tree.Scope
+import openjdk.source.util.TreePath
+import openjdk.source.util.Trees
+import openjdk.tools.javac.code.Symbol
 import java.nio.file.Path
 import javax.lang.model.element.ElementKind.CONSTRUCTOR
 import javax.lang.model.element.ElementKind.METHOD

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt

@@ -38,11 +38,11 @@ import com.itsaky.androidide.lsp.models.MatchLevel.NO_MATCH
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
 import com.itsaky.androidide.projects.FileManager
 import com.squareup.javapoet.MethodSpec.Builder
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.MethodTree
-import com.sun.source.tree.Tree.Kind.CLASS
-import com.sun.source.util.TreePath
-import com.sun.source.util.Trees
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.MethodTree
+import openjdk.source.tree.Tree.Kind.CLASS
+import openjdk.source.util.TreePath
+import openjdk.source.util.Trees
 import java.nio.file.Path
 import java.util.*
 import java.util.function.*
@@ -56,7 +56,7 @@ import javax.lang.model.type.DeclaredType
 import javax.tools.JavaFileObject
 
 /**
- * Provides completions using [com.sun.source.tree.Scope].
+ * Provides completions using [openjdk.source.tree.Scope].
  *
  * @author Akash Yadav
  */

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt

@@ -26,10 +26,10 @@ import com.itsaky.androidide.lsp.models.CompletionResult
 import com.itsaky.androidide.lsp.models.MatchLevel
 import com.itsaky.androidide.lsp.models.MatchLevel.NO_MATCH
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.tree.MemberSelectTree
-import com.sun.source.util.TreePath
-import com.sun.source.util.Trees
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.tree.MemberSelectTree
+import openjdk.source.util.TreePath
+import openjdk.source.util.Trees
 import java.nio.file.Path
 import javax.lang.model.element.Element
 import javax.lang.model.element.ElementKind.METHOD

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt

@@ -23,9 +23,9 @@ import com.itsaky.androidide.lsp.java.compiler.JavaCompilerService
 import com.itsaky.androidide.lsp.models.CompletionResult
 import com.itsaky.androidide.lsp.models.MatchLevel.NO_MATCH
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
-import com.sun.source.tree.SwitchTree
-import com.sun.source.util.TreePath
-import com.sun.source.util.Trees
+import openjdk.source.tree.SwitchTree
+import openjdk.source.util.TreePath
+import openjdk.source.util.Trees
 import java.nio.file.Path
 import javax.lang.model.element.ElementKind.ENUM
 import javax.lang.model.element.ElementKind.ENUM_CONSTANT

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/TopLevelSnippetsProvider.kt

@@ -29,8 +29,8 @@ import com.itsaky.androidide.lsp.models.MatchLevel.CASE_INSENSITIVE_EQUAL
 import com.itsaky.androidide.lsp.models.SnippetDescription
 import com.itsaky.androidide.progress.ProgressManager.Companion.abortIfCancelled
 import com.itsaky.androidide.projects.ProjectManager
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.tree.Tree.Kind.ERRONEOUS
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.tree.Tree.Kind.ERRONEOUS
 import java.nio.file.Path
 import java.nio.file.Paths
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt

@@ -25,7 +25,7 @@ import com.itsaky.androidide.lsp.java.utils.FindHelper
 import com.itsaky.androidide.models.Location
 import com.itsaky.androidide.models.Position
 import com.itsaky.androidide.utils.DocumentUtils.isSameFile
-import com.sun.source.util.Trees
+import openjdk.source.util.Trees
 import java.nio.file.Path
 import java.nio.file.Paths
 import javax.lang.model.element.Element

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt

@@ -22,7 +22,7 @@ import com.itsaky.androidide.lsp.java.compiler.JavaCompilerService
 import com.itsaky.androidide.lsp.java.utils.FindHelper
 import com.itsaky.androidide.models.Location
 import com.itsaky.androidide.models.Position
-import com.sun.source.util.Trees
+import openjdk.source.util.Trees
 import java.nio.file.Path
 import javax.lang.model.element.Element
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java

@@ -25,10 +25,10 @@ import com.itsaky.androidide.lsp.java.utils.FindHelper;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.util.Collections;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddImport.java

@@ -25,10 +25,10 @@ import com.itsaky.androidide.lsp.java.parser.ParseTask;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.ImportTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.ImportTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.util.Collections;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java

@@ -26,10 +26,10 @@ import com.itsaky.androidide.lsp.java.utils.FindHelper;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.util.Collections;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java

@@ -27,11 +27,11 @@ import com.itsaky.androidide.lsp.java.parser.ParseTask;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.ExpressionTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.util.Collections;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertVariableToStatement.java

@@ -25,12 +25,12 @@ import com.itsaky.androidide.lsp.java.visitors.FindVariableAtCursor;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.ExpressionTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.util.Collections;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java

@@ -28,17 +28,17 @@ import com.itsaky.androidide.lsp.java.visitors.FindMethodCallAt;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.MemberReferenceTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.ExpressionTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.MemberReferenceTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodInvocationTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java

@@ -27,12 +27,12 @@ import com.itsaky.androidide.lsp.java.utils.EditHelper;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.Trees;
 
 import java.io.IOException;
 import java.nio.file.Path;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java

@@ -33,12 +33,12 @@ import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
 import com.squareup.javapoet.MethodSpec;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-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 openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.ImportTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.Trees;
+import openjdk.tools.javac.util.JCDiagnostic;
 
 import java.nio.file.Path;
 import java.util.ArrayList;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveClass.java

@@ -24,7 +24,7 @@ import com.itsaky.androidide.lsp.java.parser.ParseTask;
 import com.itsaky.androidide.lsp.java.utils.EditHelper;
 import com.itsaky.androidide.lsp.java.visitors.FindTypeDeclarationAt;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.ClassTree;
+import openjdk.source.tree.ClassTree;
 
 import java.nio.file.Path;
 import java.util.Collections;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java

@@ -24,14 +24,14 @@ import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
 import com.itsaky.androidide.utils.ILogger;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.util.JavacTask;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.ExpressionTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.Trees;
 
 import java.io.IOException;
 import java.nio.file.Path;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java

@@ -20,8 +20,8 @@ import com.itsaky.androidide.lsp.java.compiler.CompilerProvider;
 import com.itsaky.androidide.lsp.java.utils.EditHelper;
 import com.itsaky.androidide.lsp.java.utils.FindHelper;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.util.Collections;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ASTFixer.java

@@ -22,12 +22,12 @@ import androidx.annotation.NonNull;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
-import com.sun.source.tree.LineMap;
-import com.sun.tools.javac.parser.Scanner;
-import com.sun.tools.javac.parser.ScannerFactory;
-import com.sun.tools.javac.parser.Tokens;
-import com.sun.tools.javac.parser.Tokens.TokenKind;
-import com.sun.tools.javac.util.Context;
+import openjdk.source.tree.LineMap;
+import openjdk.tools.javac.parser.Scanner;
+import openjdk.tools.javac.parser.ScannerFactory;
+import openjdk.tools.javac.parser.Tokens;
+import openjdk.tools.javac.parser.Tokens.TokenKind;
+import openjdk.tools.javac.util.Context;
 
 import org.jetbrains.annotations.Contract;
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java

@@ -32,14 +32,14 @@ import com.itsaky.androidide.lsp.java.visitors.FindTypeDeclarationAt;
 import com.itsaky.androidide.lsp.models.CodeActionItem;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
-import com.sun.tools.javac.util.JCDiagnostic;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.Trees;
+import openjdk.tools.javac.util.JCDiagnostic;
 
 import org.jetbrains.annotations.Contract;
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java

@@ -24,14 +24,14 @@ import com.itsaky.androidide.lsp.java.rewrite.AddImport;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.lsp.models.TextEdit;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MethodTree;
-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 openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.util.Arrays;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java

@@ -23,20 +23,20 @@ import com.itsaky.androidide.lsp.java.visitors.FindTypeDeclarationNamed;
 import com.itsaky.androidide.models.Location;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
-import com.sun.source.tree.ArrayTypeTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.ParameterizedTypeTree;
-import com.sun.source.tree.PrimitiveTypeTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.ArrayTypeTree;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.ParameterizedTypeTree;
+import openjdk.source.tree.PrimitiveTypeTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.Trees;
 
 import java.io.IOException;
 import java.net.URI;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt

@@ -79,25 +79,25 @@ import com.github.javaparser.printer.configuration.PrinterConfiguration
 import com.itsaky.androidide.lsp.java.utils.TypeUtils.toType
 import com.itsaky.androidide.lsp.java.visitors.PrettyPrintingVisitor
 import com.itsaky.androidide.utils.ILogger
-import com.sun.source.tree.AnnotationTree
-import com.sun.source.tree.AssignmentTree
-import com.sun.source.tree.BlockTree
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.tree.ErroneousTree
-import com.sun.source.tree.ExpressionStatementTree
-import com.sun.source.tree.ExpressionTree
-import com.sun.source.tree.IdentifierTree
-import com.sun.source.tree.ImportTree
-import com.sun.source.tree.LiteralTree
-import com.sun.source.tree.MemberSelectTree
-import com.sun.source.tree.MethodInvocationTree
-import com.sun.source.tree.MethodTree
-import com.sun.source.tree.PackageTree
-import com.sun.source.tree.StatementTree
-import com.sun.source.tree.Tree
-import com.sun.source.tree.TypeParameterTree
-import com.sun.source.tree.VariableTree
+import openjdk.source.tree.AnnotationTree
+import openjdk.source.tree.AssignmentTree
+import openjdk.source.tree.BlockTree
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.tree.ErroneousTree
+import openjdk.source.tree.ExpressionStatementTree
+import openjdk.source.tree.ExpressionTree
+import openjdk.source.tree.IdentifierTree
+import openjdk.source.tree.ImportTree
+import openjdk.source.tree.LiteralTree
+import openjdk.source.tree.MemberSelectTree
+import openjdk.source.tree.MethodInvocationTree
+import openjdk.source.tree.MethodTree
+import openjdk.source.tree.PackageTree
+import openjdk.source.tree.StatementTree
+import openjdk.source.tree.Tree
+import openjdk.source.tree.TypeParameterTree
+import openjdk.source.tree.VariableTree
 import java.util.*
 import java.util.function.*
 import java.util.stream.*
@@ -670,7 +670,7 @@ object JavaParserUtils {
     val parameter = Parameter()
     parameter.setType(EditHelper.printType(type))
     if (parameter.type.isArrayType) {
-      if ((type as com.sun.tools.javac.code.Type.ArrayType?)!!.isVarargs) {
+      if ((type as openjdk.tools.javac.code.Type.ArrayType?)!!.isVarargs) {
         parameter.type = parameter.type.asArrayType().componentType
         parameter.isVarArgs = true
       }

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MarkdownHelper.java

@@ -19,8 +19,8 @@ package com.itsaky.androidide.lsp.java.utils;
 
 import com.itsaky.androidide.lsp.models.MarkupContent;
 import com.itsaky.androidide.lsp.models.MarkupKind;
-import com.sun.source.doctree.DocCommentTree;
-import com.sun.source.doctree.DocTree;
+import openjdk.source.doctree.DocCommentTree;
+import openjdk.source.doctree.DocTree;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java

@@ -21,7 +21,7 @@ import androidx.annotation.NonNull;
 
 import com.squareup.javapoet.ImportCollectingCodeWriter;
 import com.squareup.javapoet.TypeName;
-import com.sun.source.util.JavacTask;
+import openjdk.source.util.JavacTask;
 
 import java.io.IOException;
 import java.util.Arrays;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java

@@ -36,9 +36,9 @@ package com.itsaky.androidide.lsp.java.utils;
 
 import com.itsaky.androidide.lsp.java.compiler.CompileTask;
 import com.itsaky.androidide.lsp.java.visitors.FindNameAt;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java

@@ -18,8 +18,8 @@
 package com.itsaky.androidide.lsp.java.utils;
 
 import com.itsaky.androidide.lsp.java.compiler.CompileTask;
-import com.sun.source.tree.Scope;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.Scope;
+import openjdk.source.util.Trees;
 
 import java.util.ArrayList;
 import java.util.List;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TreeUtils.kt

@@ -17,13 +17,13 @@
 
 package com.itsaky.androidide.lsp.java.utils
 
-import com.sun.source.tree.MethodTree
-import com.sun.source.tree.Tree
-import com.sun.source.tree.Tree.Kind.ANNOTATION_TYPE
-import com.sun.source.tree.Tree.Kind.CLASS
-import com.sun.source.tree.Tree.Kind.ENUM
-import com.sun.source.tree.Tree.Kind.INTERFACE
-import com.sun.source.tree.Tree.Kind.METHOD
+import openjdk.source.tree.MethodTree
+import openjdk.source.tree.Tree
+import openjdk.source.tree.Tree.Kind.ANNOTATION_TYPE
+import openjdk.source.tree.Tree.Kind.CLASS
+import openjdk.source.tree.Tree.Kind.ENUM
+import openjdk.source.tree.Tree.Kind.INTERFACE
+import openjdk.source.tree.Tree.Kind.METHOD
 
 /**
  * Utility methods for Javac Trees.

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java

@@ -36,14 +36,14 @@ import com.github.javaparser.printer.DefaultPrettyPrinter;
 import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration;
 import com.github.javaparser.printer.configuration.PrinterConfiguration;
 import com.itsaky.androidide.lsp.java.visitors.PrettyPrintingVisitor;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.ParameterizedTypeTree;
-import com.sun.source.tree.PrimitiveTypeTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.TypeParameterTree;
-import com.sun.source.tree.WildcardTree;
-import com.sun.tools.javac.code.BoundKind;
-import com.sun.tools.javac.tree.JCTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.ParameterizedTypeTree;
+import openjdk.source.tree.PrimitiveTypeTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.TypeParameterTree;
+import openjdk.source.tree.WildcardTree;
+import openjdk.tools.javac.code.BoundKind;
+import openjdk.tools.javac.tree.JCTree;
 
 import java.nio.file.Path;
 import java.util.Objects;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt

@@ -17,27 +17,27 @@
 package com.itsaky.androidide.lsp.java.visitors
 
 import com.itsaky.androidide.utils.ILogger
-import com.sun.source.tree.BlockTree
-import com.sun.source.tree.ClassTree
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.tree.DoWhileLoopTree
-import com.sun.source.tree.ForLoopTree
-import com.sun.source.tree.IdentifierTree
-import com.sun.source.tree.IfTree
-import com.sun.source.tree.MemberReferenceTree
-import com.sun.source.tree.MemberSelectTree
-import com.sun.source.tree.MethodInvocationTree
-import com.sun.source.tree.MethodTree
-import com.sun.source.tree.NewClassTree
-import com.sun.source.tree.ThrowTree
-import com.sun.source.tree.Tree
-import com.sun.source.tree.TryTree
-import com.sun.source.tree.VariableTree
-import com.sun.source.tree.WhileLoopTree
-import com.sun.source.util.TreePath
-import com.sun.source.util.TreeScanner
-import com.sun.source.util.Trees
-import com.sun.tools.javac.api.JavacTaskImpl
+import openjdk.source.tree.BlockTree
+import openjdk.source.tree.ClassTree
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.tree.DoWhileLoopTree
+import openjdk.source.tree.ForLoopTree
+import openjdk.source.tree.IdentifierTree
+import openjdk.source.tree.IfTree
+import openjdk.source.tree.MemberReferenceTree
+import openjdk.source.tree.MemberSelectTree
+import openjdk.source.tree.MethodInvocationTree
+import openjdk.source.tree.MethodTree
+import openjdk.source.tree.NewClassTree
+import openjdk.source.tree.ThrowTree
+import openjdk.source.tree.Tree
+import openjdk.source.tree.TryTree
+import openjdk.source.tree.VariableTree
+import openjdk.source.tree.WhileLoopTree
+import openjdk.source.util.TreePath
+import openjdk.source.util.TreeScanner
+import openjdk.source.util.Trees
+import openjdk.tools.javac.api.JavacTaskImpl
 import java.util.*
 import javax.lang.model.element.Element
 import javax.lang.model.element.ExecutableElement

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindAnonymousTypeDeclaration.java

@@ -17,14 +17,14 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.NewClassTree;
-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 openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.NewClassTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 /**
  * @author Akash Yadav

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindBiggerRange.java

@@ -23,15 +23,15 @@ import androidx.annotation.Nullable;
 import com.itsaky.androidide.utils.ILogger;
 import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.TryTree;
-import com.sun.source.util.JavacTask;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreeScanner;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.TryTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreeScanner;
+import openjdk.source.util.Trees;
 
 /**
  * @author Akash Yadav

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindCompletionsAt.java

@@ -17,19 +17,19 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.CaseTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ErroneousTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.ImportTree;
-import com.sun.source.tree.MemberReferenceTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.Tree;
-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 openjdk.source.tree.CaseTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.ErroneousTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.ImportTree;
+import openjdk.source.tree.MemberReferenceTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 public class FindCompletionsAt extends TreePathScanner<TreePath, Long> {
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindInvocationAt.java

@@ -17,14 +17,14 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.NewClassTree;
-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 openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.MethodInvocationTree;
+import openjdk.source.tree.NewClassTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 public class FindInvocationAt extends TreePathScanner<TreePath, Long> {
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodAt.kt

@@ -17,12 +17,12 @@
 
 package com.itsaky.androidide.lsp.java.visitors
 
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.tree.MethodTree
-import com.sun.source.util.JavacTask
-import com.sun.source.util.TreePath
-import com.sun.source.util.TreePathScanner
-import com.sun.source.util.Trees
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.tree.MethodTree
+import openjdk.source.util.JavacTask
+import openjdk.source.util.TreePath
+import openjdk.source.util.TreePathScanner
+import openjdk.source.util.Trees
 
 /**
  * Finds method declaration at the given cursor position.

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java

@@ -18,17 +18,17 @@
 package com.itsaky.androidide.lsp.java.visitors;
 
 import com.itsaky.androidide.utils.ILogger;
-import com.sun.source.tree.AssignmentTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-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 openjdk.source.tree.AssignmentTree;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodInvocationTree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.NestingKind;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodDeclarationAt.java

@@ -17,12 +17,12 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.util.JavacTask;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreeScanner;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreeScanner;
+import openjdk.source.util.Trees;
 
 public class FindMethodDeclarationAt extends TreeScanner<MethodTree, Long> {
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java

@@ -19,20 +19,20 @@ package com.itsaky.androidide.lsp.java.visitors;
 
 import com.itsaky.androidide.lsp.java.compiler.CompileTask;
 import com.itsaky.androidide.lsp.java.utils.FindHelper;
-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 openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.MemberReferenceTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.NewClassTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 import javax.lang.model.element.Name;
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java

@@ -17,14 +17,14 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.MemberReferenceTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.NewClassTree;
-import com.sun.source.util.JavacTask;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.TreePathScanner;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.MemberReferenceTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.NewClassTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 import java.util.List;
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationAt.java

@@ -17,13 +17,13 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-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 openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 public class FindTypeDeclarationAt extends TreePathScanner<ClassTree, Long> {
   private final SourcePositions pos;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationNamed.java

@@ -17,9 +17,9 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.util.TreeScanner;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.util.TreeScanner;
 
 import java.util.ArrayList;
 import java.util.List;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarations.java

@@ -17,9 +17,9 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.util.TreeScanner;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.util.TreeScanner;
 
 import java.util.ArrayList;
 import java.util.List;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariableAtCursor.java

@@ -17,12 +17,12 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.JavacTask;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreeScanner;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreeScanner;
+import openjdk.source.util.Trees;
 
 public class FindVariableAtCursor extends TreeScanner<VariableTree, Integer> {
   private final SourcePositions pos;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariablesBetween.java

@@ -19,13 +19,13 @@ package com.itsaky.androidide.lsp.java.visitors;
 
 import androidx.annotation.NonNull;
 
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.JavacTask;
-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 openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 import java.util.ArrayList;
 import java.util.List;

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/MethodRangeScanner.kt

@@ -21,13 +21,13 @@ import androidx.core.util.Pair
 import com.itsaky.androidide.models.Position
 import com.itsaky.androidide.models.Range
 import com.itsaky.androidide.utils.ILogger
-import com.sun.source.tree.CompilationUnitTree
-import com.sun.source.tree.LineMap
-import com.sun.source.tree.MethodTree
-import com.sun.source.util.TreePath
-import com.sun.source.util.TreePathScanner
-import com.sun.source.util.Trees
-import com.sun.tools.javac.api.JavacTaskImpl
+import openjdk.source.tree.CompilationUnitTree
+import openjdk.source.tree.LineMap
+import openjdk.source.tree.MethodTree
+import openjdk.source.util.TreePath
+import openjdk.source.util.TreePathScanner
+import openjdk.source.util.Trees
+import openjdk.tools.javac.api.JavacTaskImpl
 
 /**
  * Visits all methods and adds them to the given list of pair of method range and its tree.

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrintingVisitor.kt

@@ -18,9 +18,9 @@
 package com.itsaky.androidide.lsp.java.visitors
 
 import com.itsaky.androidide.utils.ILogger
-import com.sun.tools.javac.tree.JCTree
-import com.sun.tools.javac.tree.JCTree.JCErroneous
-import com.sun.tools.javac.tree.TreeScanner
+import openjdk.tools.javac.tree.JCTree
+import openjdk.tools.javac.tree.JCTree.JCErroneous
+import openjdk.tools.javac.tree.TreeScanner
 
 /**
  * Prints all the trees it visits. For debugging/testing purposes only.

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/PruneMethodBodies.java

@@ -17,12 +17,12 @@
 
 package com.itsaky.androidide.lsp.java.visitors;
 
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.util.JavacTask;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreeScanner;
-import com.sun.source.util.Trees;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.util.JavacTask;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreeScanner;
+import openjdk.source.util.Trees;
 
 import java.io.IOException;
 

lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/SemanticHighlighter.java

@@ -28,20 +28,20 @@ import com.itsaky.androidide.models.Position;
 import com.itsaky.androidide.models.Range;
 import com.itsaky.androidide.projects.FileManager;
 import com.itsaky.androidide.utils.ILogger;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.LineMap;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.VariableTree;
-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 openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.ExpressionTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.LineMap;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodInvocationTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.SourcePositions;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.Trees;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

lsp/java/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt

@@ -26,14 +26,14 @@ import com.itsaky.androidide.lsp.java.models.CompilationRequest
 import com.itsaky.androidide.lsp.java.models.PartialReparseRequest
 import com.itsaky.androidide.lsp.java.visitors.PrintingVisitor
 import com.itsaky.androidide.models.Range
-import com.sun.source.tree.ExpressionStatementTree
-import com.sun.source.tree.LiteralTree
-import com.sun.source.tree.Tree
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl
-import com.sun.tools.javac.tree.JCTree.JCMethodInvocation
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl
-import com.sun.tools.javac.tree.TreeScanner
+import openjdk.source.tree.ExpressionStatementTree
+import openjdk.source.tree.LiteralTree
+import openjdk.source.tree.Tree
+import openjdk.tools.javac.tree.JCTree.JCCompilationUnit
+import openjdk.tools.javac.tree.JCTree.JCMethodDecl
+import openjdk.tools.javac.tree.JCTree.JCMethodInvocation
+import openjdk.tools.javac.tree.JCTree.JCVariableDecl
+import openjdk.tools.javac.tree.TreeScanner
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Test

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java

@@ -1,7 +1,7 @@
 package com.google.googlejavaformat.java;
 
 import com.google.googlejavaformat.Input;
-import com.sun.source.tree.AnnotationTree;
+import openjdk.source.tree.AnnotationTree;
 
 import javax.annotation.processing.Generated;
 

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java

@@ -1,7 +1,7 @@
 package com.google.googlejavaformat.java;
 
 import com.google.common.collect.ImmutableList;
-import com.sun.source.tree.AnnotationTree;
+import openjdk.source.tree.AnnotationTree;
 
 import javax.annotation.processing.Generated;
 

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java

@@ -15,11 +15,11 @@
 package com.google.googlejavaformat.java;
 
 import com.google.common.collect.ImmutableList;
-import com.sun.source.tree.AnnotatedTypeTree;
-import com.sun.source.tree.AnnotationTree;
-import com.sun.source.tree.ArrayTypeTree;
-import com.sun.source.tree.Tree;
-import com.sun.tools.javac.tree.JCTree;
+import openjdk.source.tree.AnnotatedTypeTree;
+import openjdk.source.tree.AnnotationTree;
+import openjdk.source.tree.ArrayTypeTree;
+import openjdk.source.tree.Tree;
+import openjdk.tools.javac.tree.JCTree;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java

@@ -33,13 +33,13 @@ import com.google.googlejavaformat.FormattingError;
 import com.google.googlejavaformat.Newlines;
 import com.google.googlejavaformat.Op;
 import com.google.googlejavaformat.OpsBuilder;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.parser.JavacParser;
-import com.sun.tools.javac.parser.ParserFactory;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Options;
+import openjdk.tools.javac.file.JavacFileManager;
+import openjdk.tools.javac.parser.JavacParser;
+import openjdk.tools.javac.parser.ParserFactory;
+import openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.Log;
+import openjdk.tools.javac.util.Options;
 
 import java.io.IOError;
 import java.io.IOException;

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java

@@ -25,7 +25,7 @@ import com.google.common.collect.ImmutableSortedSet;
 import com.google.googlejavaformat.Newlines;
 import com.google.googlejavaformat.java.JavaFormatterOptions.Style;
 import com.google.googlejavaformat.java.JavaInput.Tok;
-import com.sun.tools.javac.parser.Tokens.TokenKind;
+import openjdk.tools.javac.parser.Tokens.TokenKind;
 
 import java.util.ArrayList;
 import java.util.Comparator;

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java

@@ -33,13 +33,13 @@ import com.google.common.collect.TreeRangeSet;
 import com.google.googlejavaformat.Input;
 import com.google.googlejavaformat.Newlines;
 import com.google.googlejavaformat.java.JavacTokens.RawTok;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.parser.Tokens.TokenKind;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Log.DeferredDiagnosticHandler;
-import com.sun.tools.javac.util.Options;
+import openjdk.tools.javac.file.JavacFileManager;
+import openjdk.tools.javac.parser.Tokens.TokenKind;
+import openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.Log;
+import openjdk.tools.javac.util.Log.DeferredDiagnosticHandler;
+import openjdk.tools.javac.util.Options;
 
 import java.io.IOException;
 import java.net.URI;

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java

@@ -29,18 +29,18 @@ import static com.google.googlejavaformat.java.Trees.getStartPosition;
 import static com.google.googlejavaformat.java.Trees.operatorName;
 import static com.google.googlejavaformat.java.Trees.precedence;
 import static com.google.googlejavaformat.java.Trees.skipParen;
-import static com.sun.source.tree.Tree.Kind.ANNOTATION;
-import static com.sun.source.tree.Tree.Kind.ARRAY_ACCESS;
-import static com.sun.source.tree.Tree.Kind.ASSIGNMENT;
-import static com.sun.source.tree.Tree.Kind.BLOCK;
-import static com.sun.source.tree.Tree.Kind.EXTENDS_WILDCARD;
-import static com.sun.source.tree.Tree.Kind.IF;
-import static com.sun.source.tree.Tree.Kind.METHOD_INVOCATION;
-import static com.sun.source.tree.Tree.Kind.NEW_ARRAY;
-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 openjdk.source.tree.Tree.Kind.ANNOTATION;
+import static openjdk.source.tree.Tree.Kind.ARRAY_ACCESS;
+import static openjdk.source.tree.Tree.Kind.ASSIGNMENT;
+import static openjdk.source.tree.Tree.Kind.BLOCK;
+import static openjdk.source.tree.Tree.Kind.EXTENDS_WILDCARD;
+import static openjdk.source.tree.Tree.Kind.IF;
+import static openjdk.source.tree.Tree.Kind.METHOD_INVOCATION;
+import static openjdk.source.tree.Tree.Kind.NEW_ARRAY;
+import static openjdk.source.tree.Tree.Kind.NEW_CLASS;
+import static openjdk.source.tree.Tree.Kind.STRING_LITERAL;
+import static openjdk.source.tree.Tree.Kind.UNION_TYPE;
+import static openjdk.source.tree.Tree.Kind.VARIABLE;
 import static java.util.stream.Collectors.toList;
 
 import com.google.auto.value.AutoOneOf;
@@ -77,73 +77,73 @@ import com.google.googlejavaformat.OpsBuilder.BlankLineWanted;
 import com.google.googlejavaformat.Output.BreakTag;
 import com.google.googlejavaformat.java.DimensionHelpers.SortedDims;
 import com.google.googlejavaformat.java.DimensionHelpers.TypeWithDims;
-import com.sun.source.tree.AnnotatedTypeTree;
-import com.sun.source.tree.AnnotationTree;
-import com.sun.source.tree.ArrayAccessTree;
-import com.sun.source.tree.ArrayTypeTree;
-import com.sun.source.tree.AssertTree;
-import com.sun.source.tree.AssignmentTree;
-import com.sun.source.tree.BinaryTree;
-import com.sun.source.tree.BlockTree;
-import com.sun.source.tree.BreakTree;
-import com.sun.source.tree.CaseTree;
-import com.sun.source.tree.CatchTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.CompoundAssignmentTree;
-import com.sun.source.tree.ConditionalExpressionTree;
-import com.sun.source.tree.ContinueTree;
-import com.sun.source.tree.DirectiveTree;
-import com.sun.source.tree.DoWhileLoopTree;
-import com.sun.source.tree.EmptyStatementTree;
-import com.sun.source.tree.EnhancedForLoopTree;
-import com.sun.source.tree.ExportsTree;
-import com.sun.source.tree.ExpressionStatementTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.ForLoopTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.IfTree;
-import com.sun.source.tree.ImportTree;
-import com.sun.source.tree.InstanceOfTree;
-import com.sun.source.tree.IntersectionTypeTree;
-import com.sun.source.tree.LabeledStatementTree;
-import com.sun.source.tree.LambdaExpressionTree;
-import com.sun.source.tree.LiteralTree;
-import com.sun.source.tree.MemberReferenceTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.ModifiersTree;
-import com.sun.source.tree.ModuleTree;
-import com.sun.source.tree.NewArrayTree;
-import com.sun.source.tree.NewClassTree;
-import com.sun.source.tree.OpensTree;
-import com.sun.source.tree.ParameterizedTypeTree;
-import com.sun.source.tree.ParenthesizedTree;
-import com.sun.source.tree.PrimitiveTypeTree;
-import com.sun.source.tree.ProvidesTree;
-import com.sun.source.tree.RequiresTree;
-import com.sun.source.tree.ReturnTree;
-import com.sun.source.tree.StatementTree;
-import com.sun.source.tree.SwitchTree;
-import com.sun.source.tree.SynchronizedTree;
-import com.sun.source.tree.ThrowTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.TryTree;
-import com.sun.source.tree.TypeCastTree;
-import com.sun.source.tree.TypeParameterTree;
-import com.sun.source.tree.UnaryTree;
-import com.sun.source.tree.UnionTypeTree;
-import com.sun.source.tree.UsesTree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.tree.WhileLoopTree;
-import com.sun.source.tree.WildcardTree;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.TreePathScanner;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.TreeScanner;
+import openjdk.source.tree.AnnotatedTypeTree;
+import openjdk.source.tree.AnnotationTree;
+import openjdk.source.tree.ArrayAccessTree;
+import openjdk.source.tree.ArrayTypeTree;
+import openjdk.source.tree.AssertTree;
+import openjdk.source.tree.AssignmentTree;
+import openjdk.source.tree.BinaryTree;
+import openjdk.source.tree.BlockTree;
+import openjdk.source.tree.BreakTree;
+import openjdk.source.tree.CaseTree;
+import openjdk.source.tree.CatchTree;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompilationUnitTree;
+import openjdk.source.tree.CompoundAssignmentTree;
+import openjdk.source.tree.ConditionalExpressionTree;
+import openjdk.source.tree.ContinueTree;
+import openjdk.source.tree.DirectiveTree;
+import openjdk.source.tree.DoWhileLoopTree;
+import openjdk.source.tree.EmptyStatementTree;
+import openjdk.source.tree.EnhancedForLoopTree;
+import openjdk.source.tree.ExportsTree;
+import openjdk.source.tree.ExpressionStatementTree;
+import openjdk.source.tree.ExpressionTree;
+import openjdk.source.tree.ForLoopTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.IfTree;
+import openjdk.source.tree.ImportTree;
+import openjdk.source.tree.InstanceOfTree;
+import openjdk.source.tree.IntersectionTypeTree;
+import openjdk.source.tree.LabeledStatementTree;
+import openjdk.source.tree.LambdaExpressionTree;
+import openjdk.source.tree.LiteralTree;
+import openjdk.source.tree.MemberReferenceTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodInvocationTree;
+import openjdk.source.tree.MethodTree;
+import openjdk.source.tree.ModifiersTree;
+import openjdk.source.tree.ModuleTree;
+import openjdk.source.tree.NewArrayTree;
+import openjdk.source.tree.NewClassTree;
+import openjdk.source.tree.OpensTree;
+import openjdk.source.tree.ParameterizedTypeTree;
+import openjdk.source.tree.ParenthesizedTree;
+import openjdk.source.tree.PrimitiveTypeTree;
+import openjdk.source.tree.ProvidesTree;
+import openjdk.source.tree.RequiresTree;
+import openjdk.source.tree.ReturnTree;
+import openjdk.source.tree.StatementTree;
+import openjdk.source.tree.SwitchTree;
+import openjdk.source.tree.SynchronizedTree;
+import openjdk.source.tree.ThrowTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.TryTree;
+import openjdk.source.tree.TypeCastTree;
+import openjdk.source.tree.TypeParameterTree;
+import openjdk.source.tree.UnaryTree;
+import openjdk.source.tree.UnionTypeTree;
+import openjdk.source.tree.UsesTree;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.tree.WhileLoopTree;
+import openjdk.source.tree.WildcardTree;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.tools.javac.code.Flags;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.tree.JCTree.JCMethodDecl;
+import openjdk.tools.javac.tree.TreeScanner;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/JavacTokens.java

@@ -18,15 +18,15 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import com.sun.tools.javac.parser.JavaTokenizer;
-import com.sun.tools.javac.parser.Scanner;
-import com.sun.tools.javac.parser.ScannerFactory;
-import com.sun.tools.javac.parser.Tokens.Comment;
-import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
-import com.sun.tools.javac.parser.Tokens.Token;
-import com.sun.tools.javac.parser.Tokens.TokenKind;
-import com.sun.tools.javac.parser.UnicodeReader;
-import com.sun.tools.javac.util.Context;
+import openjdk.tools.javac.parser.JavaTokenizer;
+import openjdk.tools.javac.parser.Scanner;
+import openjdk.tools.javac.parser.ScannerFactory;
+import openjdk.tools.javac.parser.Tokens.Comment;
+import openjdk.tools.javac.parser.Tokens.Comment.CommentStyle;
+import openjdk.tools.javac.parser.Tokens.Token;
+import openjdk.tools.javac.parser.Tokens.TokenKind;
+import openjdk.tools.javac.parser.UnicodeReader;
+import openjdk.tools.javac.util.Context;
 
 import java.util.Set;
 

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java

@@ -23,7 +23,7 @@ import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeMap;
 import com.google.googlejavaformat.Input.Tok;
 import com.google.googlejavaformat.Input.Token;
-import com.sun.tools.javac.parser.Tokens.TokenKind;
+import openjdk.tools.javac.parser.Tokens.TokenKind;
 
 import java.util.ArrayList;
 import java.util.Collection;

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java

@@ -30,30 +30,30 @@ import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeMap;
 import com.google.common.collect.TreeRangeSet;
 import com.google.googlejavaformat.Newlines;
-import com.sun.source.doctree.DocCommentTree;
-import com.sun.source.doctree.ReferenceTree;
-import com.sun.source.tree.CaseTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.ImportTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.util.DocTreePath;
-import com.sun.source.util.DocTreePathScanner;
-import com.sun.source.util.TreePathScanner;
-import com.sun.source.util.TreeScanner;
-import com.sun.tools.javac.api.JavacTrees;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.parser.JavacParser;
-import com.sun.tools.javac.parser.ParserFactory;
-import com.sun.tools.javac.tree.DCTree;
-import com.sun.tools.javac.tree.DCTree.DCReference;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCIdent;
-import com.sun.tools.javac.tree.JCTree.JCImport;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Options;
+import openjdk.source.doctree.DocCommentTree;
+import openjdk.source.doctree.ReferenceTree;
+import openjdk.source.tree.CaseTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.ImportTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.DocTreePath;
+import openjdk.source.util.DocTreePathScanner;
+import openjdk.source.util.TreePathScanner;
+import openjdk.source.util.TreeScanner;
+import openjdk.tools.javac.api.JavacTrees;
+import openjdk.tools.javac.file.JavacFileManager;
+import openjdk.tools.javac.parser.JavacParser;
+import openjdk.tools.javac.parser.ParserFactory;
+import openjdk.tools.javac.tree.DCTree;
+import openjdk.tools.javac.tree.DCTree.DCReference;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
+import openjdk.tools.javac.tree.JCTree.JCFieldAccess;
+import openjdk.tools.javac.tree.JCTree.JCIdent;
+import openjdk.tools.javac.tree.JCTree.JCImport;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.Log;
+import openjdk.tools.javac.util.Options;
 
 import java.io.IOError;
 import java.io.IOException;
@@ -303,7 +303,7 @@ public class RemoveUnusedImports {
     // scan javadoc comments, checking for references to imported types
     class DocTreeScanner extends DocTreePathScanner<Void, Void> {
       @Override
-      public Void visitIdentifier(com.sun.source.doctree.IdentifierTree node, Void aVoid) {
+      public Void visitIdentifier(openjdk.source.doctree.IdentifierTree node, Void aVoid) {
         return null;
       }
 

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java

@@ -26,21 +26,21 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Range;
 import com.google.common.collect.TreeRangeMap;
 import com.google.googlejavaformat.Newlines;
-import com.sun.source.tree.BinaryTree;
-import com.sun.source.tree.LiteralTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.Tree.Kind;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.TreePathScanner;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.parser.JavacParser;
-import com.sun.tools.javac.parser.ParserFactory;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Options;
-import com.sun.tools.javac.util.Position;
+import openjdk.source.tree.BinaryTree;
+import openjdk.source.tree.LiteralTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.tree.Tree.Kind;
+import openjdk.source.util.TreePath;
+import openjdk.source.util.TreePathScanner;
+import openjdk.tools.javac.file.JavacFileManager;
+import openjdk.tools.javac.parser.JavacParser;
+import openjdk.tools.javac.parser.ParserFactory;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.Log;
+import openjdk.tools.javac.util.Options;
+import openjdk.tools.javac.util.Position;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java

@@ -14,18 +14,18 @@
 
 package com.google.googlejavaformat.java;
 
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompoundAssignmentTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.ParenthesizedTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.util.TreePath;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.Pretty;
-import com.sun.tools.javac.tree.TreeInfo;
+import openjdk.source.tree.ClassTree;
+import openjdk.source.tree.CompoundAssignmentTree;
+import openjdk.source.tree.ExpressionTree;
+import openjdk.source.tree.IdentifierTree;
+import openjdk.source.tree.MemberSelectTree;
+import openjdk.source.tree.MethodInvocationTree;
+import openjdk.source.tree.ParenthesizedTree;
+import openjdk.source.tree.Tree;
+import openjdk.source.util.TreePath;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.tree.Pretty;
+import openjdk.tools.javac.tree.TreeInfo;
 
 import java.io.IOError;
 import java.io.IOException;

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelAbort.java

@@ -36,7 +36,7 @@
 
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.util.Abort;
+import openjdk.tools.javac.util.Abort;
 
 /**
  * @author Tomas Zezula

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelService.java

@@ -36,7 +36,7 @@
 
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.util.Context;
+import openjdk.tools.javac.util.Context;
 
 /**
  * @author Tomas Zezula

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBAttr.java

@@ -35,20 +35,20 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.comp.Attr;
-import com.sun.tools.javac.comp.AttrContext;
-import com.sun.tools.javac.comp.Env;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCCatch;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.List;
+import openjdk.tools.javac.code.Type;
+import openjdk.tools.javac.comp.Attr;
+import openjdk.tools.javac.comp.AttrContext;
+import openjdk.tools.javac.comp.Env;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.tree.JCTree.JCBlock;
+import openjdk.tools.javac.tree.JCTree.JCCatch;
+import openjdk.tools.javac.tree.JCTree.JCClassDecl;
+import openjdk.tools.javac.tree.JCTree.JCExpression;
+import openjdk.tools.javac.tree.JCTree.JCMethodDecl;
+import openjdk.tools.javac.tree.JCTree.JCVariableDecl;
+import openjdk.tools.javac.tree.TreeMaker;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.List;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java

@@ -35,19 +35,19 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.code.ClassFinder;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.Kinds.Kind;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.Completer;
-import com.sun.tools.javac.code.Symbol.CompletionFailure;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JCDiagnostic;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticInfo;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
-import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Names;
+import openjdk.tools.javac.code.ClassFinder;
+import openjdk.tools.javac.code.Flags;
+import openjdk.tools.javac.code.Kinds.Kind;
+import openjdk.tools.javac.code.Symbol;
+import openjdk.tools.javac.code.Symbol.Completer;
+import openjdk.tools.javac.code.Symbol.CompletionFailure;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.JCDiagnostic;
+import openjdk.tools.javac.util.JCDiagnostic.DiagnosticInfo;
+import openjdk.tools.javac.util.JCDiagnostic.DiagnosticType;
+import openjdk.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
+import openjdk.tools.javac.util.Log;
+import openjdk.tools.javac.util.Names;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -85,7 +85,7 @@ public class NBClassFinder extends ClassFinder {
   public Completer getCompleter() {
     if (completer == null) {
       try {
-        Class.forName("com.sun.tools.javac.model.LazyTreeLoader");
+        Class.forName("openjdk.tools.javac.model.LazyTreeLoader");
         // patched nb-javac, handles missing java.lang itself:
         completer = super.getCompleter();
       } catch (ClassNotFoundException e) {
@@ -99,7 +99,7 @@ public class NBClassFinder extends ClassFinder {
                 sym.flags_field |= Flags.EXISTS;
                 try {
                   Class<?> dcfhClass =
-                      Class.forName("com.sun.tools.javac.code.DeferredCompletionFailureHandler");
+                      Class.forName("openjdk.tools.javac.code.DeferredCompletionFailureHandler");
                   Constructor<CompletionFailure> constr =
                       CompletionFailure.class.getDeclaredConstructor(
                           Symbol.class, Supplier.class, dcfhClass);

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java

@@ -35,21 +35,21 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import static com.sun.tools.javac.jvm.ClassFile.Version.V45_3;
+import static openjdk.tools.javac.jvm.ClassFile.Version.V45_3;
 
 import android.text.TextUtils;
 
 import com.itsaky.androidide.utils.ILogger;
-import com.sun.tools.javac.code.ClassFinder.BadClassFile;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-import com.sun.tools.javac.jvm.ClassFile;
-import com.sun.tools.javac.jvm.ClassFile.Version;
-import com.sun.tools.javac.jvm.ClassReader;
-import com.sun.tools.javac.resources.CompilerProperties.Warnings;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Name;
+import openjdk.tools.javac.code.ClassFinder.BadClassFile;
+import openjdk.tools.javac.code.Symbol;
+import openjdk.tools.javac.code.Symbol.ClassSymbol;
+import openjdk.tools.javac.jvm.ClassFile;
+import openjdk.tools.javac.jvm.ClassFile.Version;
+import openjdk.tools.javac.jvm.ClassReader;
+import openjdk.tools.javac.resources.CompilerProperties.Warnings;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.Log;
+import openjdk.tools.javac.util.Name;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassWriter.java

@@ -35,9 +35,9 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.code.Types;
-import com.sun.tools.javac.jvm.ClassWriter;
-import com.sun.tools.javac.util.Context;
+import openjdk.tools.javac.code.Types;
+import openjdk.tools.javac.jvm.ClassWriter;
+import openjdk.tools.javac.util.Context;
 
 /**
  * @author lahvac

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBEnter.java

@@ -35,16 +35,16 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.code.Symbol.TypeSymbol;
-import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.comp.AttrContext;
-import com.sun.tools.javac.comp.Enter;
-import com.sun.tools.javac.comp.Env;
-import com.sun.tools.javac.main.JavaCompiler;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.TreeInfo;
-import com.sun.tools.javac.util.Context;
+import openjdk.tools.javac.code.Symbol.TypeSymbol;
+import openjdk.tools.javac.code.Symtab;
+import openjdk.tools.javac.comp.AttrContext;
+import openjdk.tools.javac.comp.Enter;
+import openjdk.tools.javac.comp.Env;
+import openjdk.tools.javac.main.JavaCompiler;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.tree.JCTree.JCClassDecl;
+import openjdk.tools.javac.tree.TreeInfo;
+import openjdk.tools.javac.util.Context;
 
 /**
  * @author lahvac

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavaCompiler.java

@@ -35,13 +35,13 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.comp.AttrContext;
-import com.sun.tools.javac.comp.Env;
-import com.sun.tools.javac.main.JavaCompiler;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Pair;
+import openjdk.tools.javac.comp.AttrContext;
+import openjdk.tools.javac.comp.Env;
+import openjdk.tools.javac.main.JavaCompiler;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.List;
+import openjdk.tools.javac.util.Pair;
 
 import java.util.Collection;
 import java.util.Collections;

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java

@@ -35,16 +35,16 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.TreePath;
-import com.sun.tools.javac.api.JavacTrees;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.tree.TreeInfo;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.util.Context;
+import openjdk.source.tree.VariableTree;
+import openjdk.source.util.TreePath;
+import openjdk.tools.javac.api.JavacTrees;
+import openjdk.tools.javac.code.Flags;
+import openjdk.tools.javac.code.Symbol;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.tree.JCTree.JCVariableDecl;
+import openjdk.tools.javac.tree.TreeInfo;
+import openjdk.tools.javac.tree.TreeMaker;
+import openjdk.tools.javac.util.Context;
 
 import java.util.HashMap;
 import java.util.Map;

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java

@@ -35,10 +35,10 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JCDiagnostic;
-import com.sun.tools.javac.util.Log;
+import openjdk.tools.javac.code.Symbol;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.JCDiagnostic;
+import openjdk.tools.javac.util.Log;
 
 import java.io.PrintWriter;
 import java.net.URI;

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBMemberEnter.java

@@ -35,14 +35,14 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.source.util.TreePath;
-import com.sun.tools.javac.api.JavacTrees;
-import com.sun.tools.javac.comp.MemberEnter;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCImport;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.Context;
+import openjdk.source.util.TreePath;
+import openjdk.tools.javac.api.JavacTrees;
+import openjdk.tools.javac.comp.MemberEnter;
+import openjdk.tools.javac.tree.JCTree.JCCompilationUnit;
+import openjdk.tools.javac.tree.JCTree.JCImport;
+import openjdk.tools.javac.tree.JCTree.JCMethodDecl;
+import openjdk.tools.javac.tree.JCTree.JCVariableDecl;
+import openjdk.tools.javac.util.Context;
 
 /**
  * @author lahvac

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBNames.java

@@ -35,9 +35,9 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.Names;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.Name;
+import openjdk.tools.javac.util.Names;
 
 /**
  * @author lahvac

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java

@@ -35,24 +35,24 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.parser.JavacParser;
-import com.sun.tools.javac.parser.Lexer;
-import com.sun.tools.javac.parser.ParserFactory;
-import com.sun.tools.javac.parser.ScannerFactory;
-import com.sun.tools.javac.parser.Tokens.Comment;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCEnhancedForLoop;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCModifiers;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
-import com.sun.tools.javac.tree.TreeInfo;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.Names;
-import com.sun.tools.javac.util.Position;
+import openjdk.tools.javac.parser.JavacParser;
+import openjdk.tools.javac.parser.Lexer;
+import openjdk.tools.javac.parser.ParserFactory;
+import openjdk.tools.javac.parser.ScannerFactory;
+import openjdk.tools.javac.parser.Tokens.Comment;
+import openjdk.tools.javac.tree.JCTree;
+import openjdk.tools.javac.tree.JCTree.JCClassDecl;
+import openjdk.tools.javac.tree.JCTree.JCEnhancedForLoop;
+import openjdk.tools.javac.tree.JCTree.JCExpression;
+import openjdk.tools.javac.tree.JCTree.JCModifiers;
+import openjdk.tools.javac.tree.JCTree.JCStatement;
+import openjdk.tools.javac.tree.JCTree.JCTypeParameter;
+import openjdk.tools.javac.tree.TreeInfo;
+import openjdk.tools.javac.util.Context;
+import openjdk.tools.javac.util.List;
+import openjdk.tools.javac.util.Name;
+import openjdk.tools.javac.util.Names;
+import openjdk.tools.javac.util.Position;
 
 /**
  * @author lahvac

subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBResolve.java

@@ -35,13 +35,13 @@
  */
 package com.itsaky.androidide.javac.services;
 
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.TypeSymbol;
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.comp.AttrContext;
-import com.sun.tools.javac.comp.Env;
-import com.sun.tools.javac.comp.Resolve;
-import com.sun.tools.javac.util.Context;
+import openjdk.tools.javac.code.Symbol;
+import openjdk.tools.javac.code.Symbol.TypeSymbol;
+import openjdk.tools.javac.code.Type;
+import openjdk.tools.javac.comp.AttrContext;
+import openjdk.tools.javac.comp.Env;
+import openjdk.tools.javac.comp.Resolve;
+import openjdk.tools.javac.util.Context;
 
 /**
  * @author lahvac