mirror of
https://gitee.com/zhangsken/AndroidIDE.git
synced 2026-10-16 07:49:44 +08:00
refactor: rename package 'javax' to 'jdkx'
This commit is contained in:
Binary file not shown.
@@ -64,7 +64,7 @@ import java.io.File
|
||||
import java.util.Objects
|
||||
import java.util.regex.Pattern.compile
|
||||
import java.util.regex.Pattern.quote
|
||||
import javax.lang.model.SourceVersion
|
||||
import jdkx.lang.model.SourceVersion
|
||||
|
||||
/**
|
||||
* Handles events related to files in filetree.
|
||||
|
||||
@@ -294,7 +294,9 @@ class SubscriberMethodFinder {
|
||||
if (clazzName.startsWith("java.")
|
||||
|| clazzName.startsWith("javax.")
|
||||
|| clazzName.startsWith("android.")
|
||||
|| clazzName.startsWith("androidx.")) {
|
||||
|| clazzName.startsWith("androidx.")
|
||||
|| clazzName.startsWith("jdkx.")
|
||||
|| clazzName.startsWith("openjdk.")) {
|
||||
clazz = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ import io.github.rosemoe.sora.widget.CodeEditor
|
||||
import java.nio.file.Path
|
||||
import java.util.concurrent.CompletableFuture
|
||||
import java.util.concurrent.CompletionException
|
||||
import javax.lang.model.element.Modifier.STATIC
|
||||
import jdkx.lang.model.element.Modifier.STATIC
|
||||
|
||||
/**
|
||||
* Any action that has to work with fields in the current class can inherit this action.
|
||||
|
||||
+2
-2
@@ -36,8 +36,8 @@ import com.itsaky.androidide.lsp.models.DiagnosticItem
|
||||
import com.itsaky.androidide.projects.ProjectManager
|
||||
import com.itsaky.androidide.resources.R
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import javax.tools.Diagnostic
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.tools.Diagnostic
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/** @author Akash Yadav */
|
||||
class AddImportAction : BaseJavaCodeAction() {
|
||||
|
||||
+2
-2
@@ -25,8 +25,8 @@ import com.itsaky.androidide.lsp.java.actions.BaseJavaCodeAction
|
||||
import com.itsaky.androidide.lsp.java.models.DiagnosticCode
|
||||
import com.itsaky.androidide.lsp.java.rewrite.ImplementAbstractMethods
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import javax.tools.Diagnostic
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.tools.Diagnostic
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/** @author Akash Yadav */
|
||||
class ImplementAbstractMethodsAction : BaseJavaCodeAction() {
|
||||
|
||||
+2
-2
@@ -43,8 +43,8 @@ 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
|
||||
import javax.lang.model.element.VariableElement
|
||||
import jdkx.lang.model.element.Modifier.FINAL
|
||||
import jdkx.lang.model.element.VariableElement
|
||||
|
||||
/**
|
||||
* Allows the user to select fields from the current class, then generates setters and getters for
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ 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
|
||||
import jdkx.lang.model.element.VariableElement
|
||||
|
||||
/**
|
||||
* Generates the `toString()` method for the current class.
|
||||
|
||||
+7
-7
@@ -45,13 +45,13 @@ import io.github.rosemoe.sora.widget.CodeEditor
|
||||
import java.util.Arrays
|
||||
import java.util.Optional
|
||||
import java.util.concurrent.CompletableFuture
|
||||
import javax.lang.model.element.ElementKind
|
||||
import javax.lang.model.element.ExecutableElement
|
||||
import javax.lang.model.element.Modifier
|
||||
import javax.lang.model.element.TypeElement
|
||||
import javax.lang.model.type.DeclaredType
|
||||
import javax.lang.model.type.ExecutableType
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.lang.model.element.ElementKind
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.Modifier
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.type.DeclaredType
|
||||
import jdkx.lang.model.type.ExecutableType
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Allows the user to override multiple methods from superclass at once.
|
||||
|
||||
@@ -59,9 +59,9 @@ import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.lang.model.SourceVersion;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
public class CompileBatch implements AutoCloseable {
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@ import openjdk.tools.javac.api.JavacTaskImpl;
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
public class CompileTask implements AutoCloseable {
|
||||
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ import java.util.Optional;
|
||||
import java.util.TreeSet;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
public interface CompilerProvider {
|
||||
Path NOT_FOUND = Paths.get("");
|
||||
|
||||
+3
-3
@@ -69,9 +69,9 @@ import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.JavaFileObject;
|
||||
import javax.tools.StandardLocation;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
import jdkx.tools.StandardLocation;
|
||||
|
||||
public class JavaCompilerService implements CompilerProvider {
|
||||
|
||||
|
||||
+4
-4
@@ -51,10 +51,10 @@ import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import javax.tools.FileObject;
|
||||
import javax.tools.ForwardingJavaFileManager;
|
||||
import javax.tools.JavaFileObject;
|
||||
import javax.tools.StandardLocation;
|
||||
import jdkx.tools.FileObject;
|
||||
import jdkx.tools.ForwardingJavaFileManager;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
import jdkx.tools.StandardLocation;
|
||||
|
||||
@SuppressWarnings("Since15")
|
||||
public class SourceFileManager extends ForwardingJavaFileManager<JavacFileManager> {
|
||||
|
||||
+3
-3
@@ -31,9 +31,9 @@ import java.net.URI;
|
||||
import java.nio.file.Path;
|
||||
import java.time.Instant;
|
||||
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.NestingKind;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.NestingKind;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
public class SourceFileObject implements JavaFileObject {
|
||||
/** path is the absolute path to this file on disk */
|
||||
|
||||
@@ -19,7 +19,7 @@ package com.itsaky.androidide.lsp.java.models
|
||||
|
||||
import com.itsaky.androidide.lsp.java.compiler.CompilationTaskProcessor
|
||||
import com.itsaky.androidide.lsp.java.compiler.DefaultCompilationTaskProcessor
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Data sent to compiler to request a compilation.
|
||||
|
||||
@@ -43,8 +43,8 @@ import java.util.Collections;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.tools.JavaCompiler;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.JavaCompiler;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
public class Parser {
|
||||
|
||||
@@ -92,7 +92,7 @@ public class Parser {
|
||||
Collections.singletonList(file));
|
||||
}
|
||||
|
||||
private static void ignoreError(javax.tools.Diagnostic<? extends JavaFileObject> __) {
|
||||
private static void ignoreError(jdkx.tools.Diagnostic<? extends JavaFileObject> __) {
|
||||
// Too noisy, this only comes up in parse tasks which tend to be less important
|
||||
// LOG.warning(err.getMessage(Locale.getDefault()));
|
||||
}
|
||||
|
||||
+4
-4
@@ -42,10 +42,10 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.type.TypeKind;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.type.TypeKind;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
public class DefinitionProvider {
|
||||
public static final List<Location> NOT_SUPPORTED = Collections.emptyList();
|
||||
|
||||
+3
-3
@@ -40,9 +40,9 @@ import java.nio.file.Path
|
||||
import java.nio.file.Paths
|
||||
import java.util.Locale
|
||||
import java.util.regex.Pattern
|
||||
import javax.lang.model.element.Element
|
||||
import javax.tools.Diagnostic
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.lang.model.element.Element
|
||||
import jdkx.tools.Diagnostic
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Finds errors and warnings from a compilation task.
|
||||
|
||||
+2
-2
@@ -36,8 +36,8 @@ import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
|
||||
public class ReferenceProvider {
|
||||
|
||||
|
||||
+13
-13
@@ -55,19 +55,19 @@ import java.util.Optional;
|
||||
import java.util.StringJoiner;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.ElementKind;
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.element.VariableElement;
|
||||
import javax.lang.model.type.ArrayType;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.ErrorType;
|
||||
import javax.lang.model.type.PrimitiveType;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.type.TypeVariable;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.ElementKind;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.element.VariableElement;
|
||||
import jdkx.lang.model.type.ArrayType;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.type.ErrorType;
|
||||
import jdkx.lang.model.type.PrimitiveType;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.type.TypeVariable;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
public class SignatureProvider {
|
||||
|
||||
|
||||
+21
-21
@@ -46,27 +46,27 @@ import com.itsaky.androidide.utils.ILogger
|
||||
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
|
||||
import javax.lang.model.element.ElementKind.CLASS
|
||||
import javax.lang.model.element.ElementKind.CONSTRUCTOR
|
||||
import javax.lang.model.element.ElementKind.ENUM
|
||||
import javax.lang.model.element.ElementKind.ENUM_CONSTANT
|
||||
import javax.lang.model.element.ElementKind.EXCEPTION_PARAMETER
|
||||
import javax.lang.model.element.ElementKind.FIELD
|
||||
import javax.lang.model.element.ElementKind.INSTANCE_INIT
|
||||
import javax.lang.model.element.ElementKind.INTERFACE
|
||||
import javax.lang.model.element.ElementKind.LOCAL_VARIABLE
|
||||
import javax.lang.model.element.ElementKind.METHOD
|
||||
import javax.lang.model.element.ElementKind.OTHER
|
||||
import javax.lang.model.element.ElementKind.PACKAGE
|
||||
import javax.lang.model.element.ElementKind.PARAMETER
|
||||
import javax.lang.model.element.ElementKind.RESOURCE_VARIABLE
|
||||
import javax.lang.model.element.ElementKind.STATIC_INIT
|
||||
import javax.lang.model.element.ElementKind.TYPE_PARAMETER
|
||||
import javax.lang.model.element.ExecutableElement
|
||||
import javax.lang.model.element.TypeElement
|
||||
import javax.lang.model.element.VariableElement
|
||||
import jdkx.lang.model.element.Element
|
||||
import jdkx.lang.model.element.ElementKind.ANNOTATION_TYPE
|
||||
import jdkx.lang.model.element.ElementKind.CLASS
|
||||
import jdkx.lang.model.element.ElementKind.CONSTRUCTOR
|
||||
import jdkx.lang.model.element.ElementKind.ENUM
|
||||
import jdkx.lang.model.element.ElementKind.ENUM_CONSTANT
|
||||
import jdkx.lang.model.element.ElementKind.EXCEPTION_PARAMETER
|
||||
import jdkx.lang.model.element.ElementKind.FIELD
|
||||
import jdkx.lang.model.element.ElementKind.INSTANCE_INIT
|
||||
import jdkx.lang.model.element.ElementKind.INTERFACE
|
||||
import jdkx.lang.model.element.ElementKind.LOCAL_VARIABLE
|
||||
import jdkx.lang.model.element.ElementKind.METHOD
|
||||
import jdkx.lang.model.element.ElementKind.OTHER
|
||||
import jdkx.lang.model.element.ElementKind.PACKAGE
|
||||
import jdkx.lang.model.element.ElementKind.PARAMETER
|
||||
import jdkx.lang.model.element.ElementKind.RESOURCE_VARIABLE
|
||||
import jdkx.lang.model.element.ElementKind.STATIC_INIT
|
||||
import jdkx.lang.model.element.ElementKind.TYPE_PARAMETER
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.element.VariableElement
|
||||
|
||||
/**
|
||||
* Completion provider for Java source code.
|
||||
|
||||
+14
-14
@@ -36,20 +36,20 @@ 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
|
||||
import javax.lang.model.element.ElementKind.ANNOTATION_TYPE
|
||||
import javax.lang.model.element.ElementKind.CLASS
|
||||
import javax.lang.model.element.ElementKind.CONSTRUCTOR
|
||||
import javax.lang.model.element.ElementKind.ENUM
|
||||
import javax.lang.model.element.ElementKind.ENUM_CONSTANT
|
||||
import javax.lang.model.element.ElementKind.FIELD
|
||||
import javax.lang.model.element.ElementKind.INSTANCE_INIT
|
||||
import javax.lang.model.element.ElementKind.INTERFACE
|
||||
import javax.lang.model.element.ElementKind.METHOD
|
||||
import javax.lang.model.element.ElementKind.STATIC_INIT
|
||||
import javax.lang.model.element.Modifier.STATIC
|
||||
import javax.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.element.Element
|
||||
import jdkx.lang.model.element.ElementKind
|
||||
import jdkx.lang.model.element.ElementKind.ANNOTATION_TYPE
|
||||
import jdkx.lang.model.element.ElementKind.CLASS
|
||||
import jdkx.lang.model.element.ElementKind.CONSTRUCTOR
|
||||
import jdkx.lang.model.element.ElementKind.ENUM
|
||||
import jdkx.lang.model.element.ElementKind.ENUM_CONSTANT
|
||||
import jdkx.lang.model.element.ElementKind.FIELD
|
||||
import jdkx.lang.model.element.ElementKind.INSTANCE_INIT
|
||||
import jdkx.lang.model.element.ElementKind.INTERFACE
|
||||
import jdkx.lang.model.element.ElementKind.METHOD
|
||||
import jdkx.lang.model.element.ElementKind.STATIC_INIT
|
||||
import jdkx.lang.model.element.Modifier.STATIC
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
|
||||
/**
|
||||
* Provides completions for imports.
|
||||
|
||||
+7
-7
@@ -30,13 +30,13 @@ 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
|
||||
import javax.lang.model.element.Modifier.STATIC
|
||||
import javax.lang.model.element.TypeElement
|
||||
import javax.lang.model.type.ArrayType
|
||||
import javax.lang.model.type.DeclaredType
|
||||
import javax.lang.model.type.TypeVariable
|
||||
import jdkx.lang.model.element.ElementKind.METHOD
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.Modifier.STATIC
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.type.ArrayType
|
||||
import jdkx.lang.model.type.DeclaredType
|
||||
import jdkx.lang.model.type.TypeVariable
|
||||
|
||||
/**
|
||||
* Completions for member reference.
|
||||
|
||||
+8
-8
@@ -32,14 +32,14 @@ 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
|
||||
import javax.lang.model.element.ExecutableElement
|
||||
import javax.lang.model.element.Modifier.STATIC
|
||||
import javax.lang.model.element.TypeElement
|
||||
import javax.lang.model.type.ArrayType
|
||||
import javax.lang.model.type.DeclaredType
|
||||
import javax.lang.model.type.TypeVariable
|
||||
import jdkx.lang.model.element.ElementKind.CONSTRUCTOR
|
||||
import jdkx.lang.model.element.ElementKind.METHOD
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.Modifier.STATIC
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.type.ArrayType
|
||||
import jdkx.lang.model.type.DeclaredType
|
||||
import jdkx.lang.model.type.TypeVariable
|
||||
|
||||
/**
|
||||
* Completions for member select.
|
||||
|
||||
+8
-8
@@ -46,14 +46,14 @@ import openjdk.source.util.Trees
|
||||
import java.nio.file.Path
|
||||
import java.util.*
|
||||
import java.util.function.*
|
||||
import javax.lang.model.element.ElementKind.METHOD
|
||||
import javax.lang.model.element.ExecutableElement
|
||||
import javax.lang.model.element.Modifier.FINAL
|
||||
import javax.lang.model.element.Modifier.PRIVATE
|
||||
import javax.lang.model.element.Modifier.STATIC
|
||||
import javax.lang.model.element.TypeElement
|
||||
import javax.lang.model.type.DeclaredType
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.lang.model.element.ElementKind.METHOD
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.Modifier.FINAL
|
||||
import jdkx.lang.model.element.Modifier.PRIVATE
|
||||
import jdkx.lang.model.element.Modifier.STATIC
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.type.DeclaredType
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Provides completions using [openjdk.source.tree.Scope].
|
||||
|
||||
+6
-6
@@ -31,12 +31,12 @@ 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
|
||||
import javax.lang.model.element.ExecutableElement
|
||||
import javax.lang.model.element.Modifier.STATIC
|
||||
import javax.lang.model.element.Name
|
||||
import javax.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.element.Element
|
||||
import jdkx.lang.model.element.ElementKind.METHOD
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.Modifier.STATIC
|
||||
import jdkx.lang.model.element.Name
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
|
||||
/**
|
||||
* Completes static imports.
|
||||
|
||||
+4
-4
@@ -27,10 +27,10 @@ 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
|
||||
import javax.lang.model.element.TypeElement
|
||||
import javax.lang.model.type.DeclaredType
|
||||
import jdkx.lang.model.element.ElementKind.ENUM
|
||||
import jdkx.lang.model.element.ElementKind.ENUM_CONSTANT
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.type.DeclaredType
|
||||
|
||||
/**
|
||||
* Provides completions for switch constants.
|
||||
|
||||
+3
-3
@@ -28,9 +28,9 @@ import com.itsaky.androidide.utils.DocumentUtils.isSameFile
|
||||
import openjdk.source.util.Trees
|
||||
import java.nio.file.Path
|
||||
import java.nio.file.Paths
|
||||
import javax.lang.model.element.Element
|
||||
import javax.lang.model.element.TypeElement
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.lang.model.element.Element
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Finds definition for erroneous elements.
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ import com.itsaky.androidide.models.Location
|
||||
import com.itsaky.androidide.models.Position
|
||||
import com.itsaky.androidide.utils.ILogger
|
||||
import java.nio.file.Path
|
||||
import javax.lang.model.element.Element
|
||||
import jdkx.lang.model.element.Element
|
||||
|
||||
/**
|
||||
* Provides definition for a specific symbol in Java source code.
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ import com.itsaky.androidide.models.Location
|
||||
import com.itsaky.androidide.models.Position
|
||||
import openjdk.source.util.Trees
|
||||
import java.nio.file.Path
|
||||
import javax.lang.model.element.Element
|
||||
import jdkx.lang.model.element.Element
|
||||
|
||||
/**
|
||||
* Provides definition for local elements.
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@ import com.itsaky.androidide.lsp.java.utils.NavigationHelper
|
||||
import com.itsaky.androidide.models.Location
|
||||
import com.itsaky.androidide.models.Position
|
||||
import java.nio.file.Path
|
||||
import javax.lang.model.element.Element
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.lang.model.element.Element
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Finds definition of an element in other source locations.
|
||||
|
||||
@@ -34,7 +34,7 @@ import java.nio.file.Path;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
|
||||
public class AddException extends Rewrite {
|
||||
final String className, methodName;
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ import java.nio.file.Path;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
|
||||
public class AddSuppressWarningAnnotation extends Rewrite {
|
||||
final String className, methodName;
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@ import java.nio.file.Path;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
|
||||
public class ConvertFieldToBlock extends Rewrite {
|
||||
final Path file;
|
||||
|
||||
+4
-4
@@ -46,10 +46,10 @@ import java.util.Collections;
|
||||
import java.util.Map;
|
||||
import java.util.StringJoiner;
|
||||
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.Name;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.Name;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
|
||||
public class CreateMissingMethod extends Rewrite {
|
||||
private static final ILogger LOG = ILogger.newInstance("main");
|
||||
|
||||
+2
-2
@@ -43,8 +43,8 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.StringJoiner;
|
||||
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
|
||||
public class GenerateRecordConstructor extends Rewrite {
|
||||
|
||||
|
||||
+6
-6
@@ -50,12 +50,12 @@ import java.util.StringJoiner;
|
||||
import java.util.TreeSet;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.ElementKind;
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.util.Elements;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.ElementKind;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.util.Elements;
|
||||
|
||||
public class ImplementAbstractMethods extends Rewrite {
|
||||
|
||||
|
||||
@@ -40,9 +40,9 @@ import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
|
||||
public class RemoveException extends Rewrite {
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import java.nio.file.Path;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
|
||||
public class RemoveMethod extends Rewrite {
|
||||
|
||||
|
||||
@@ -47,10 +47,10 @@ import java.io.IOException;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/**
|
||||
* @author Akash Yadav
|
||||
|
||||
@@ -41,14 +41,14 @@ import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.StringJoiner;
|
||||
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.Name;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.type.ArrayType;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.ExecutableType;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.Name;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.type.ArrayType;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.type.ExecutableType;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
|
||||
public class EditHelper {
|
||||
|
||||
|
||||
@@ -44,12 +44,12 @@ import java.nio.file.Paths;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.ElementKind;
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.util.Types;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.ElementKind;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.util.Types;
|
||||
|
||||
public class FindHelper {
|
||||
|
||||
|
||||
@@ -101,14 +101,14 @@ import openjdk.source.tree.VariableTree
|
||||
import java.util.*
|
||||
import java.util.function.*
|
||||
import java.util.stream.*
|
||||
import javax.lang.model.element.ExecutableElement
|
||||
import javax.lang.model.element.Modifier
|
||||
import javax.lang.model.element.TypeParameterElement
|
||||
import javax.lang.model.element.VariableElement
|
||||
import javax.lang.model.type.ExecutableType
|
||||
import javax.lang.model.type.TypeKind
|
||||
import javax.lang.model.type.TypeMirror
|
||||
import javax.lang.model.type.TypeVariable
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.Modifier
|
||||
import jdkx.lang.model.element.TypeParameterElement
|
||||
import jdkx.lang.model.element.VariableElement
|
||||
import jdkx.lang.model.type.ExecutableType
|
||||
import jdkx.lang.model.type.TypeKind
|
||||
import jdkx.lang.model.type.TypeMirror
|
||||
import jdkx.lang.model.type.TypeVariable
|
||||
import kotlin.jvm.optionals.getOrNull
|
||||
import org.jetbrains.annotations.Contract
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@ package com.itsaky.androidide.lsp.java.utils
|
||||
import com.squareup.javapoet.AnnotationSpec
|
||||
import com.squareup.javapoet.ImportCollectingCodeWriter
|
||||
import com.squareup.javapoet.MethodSpec
|
||||
import javax.lang.model.element.ExecutableElement
|
||||
import javax.lang.model.element.Modifier
|
||||
import javax.lang.model.type.DeclaredType
|
||||
import javax.lang.model.type.NoType
|
||||
import javax.lang.model.type.NullType
|
||||
import javax.lang.model.type.TypeKind
|
||||
import javax.lang.model.util.Types
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.Modifier
|
||||
import jdkx.lang.model.type.DeclaredType
|
||||
import jdkx.lang.model.type.NoType
|
||||
import jdkx.lang.model.type.NullType
|
||||
import jdkx.lang.model.type.TypeKind
|
||||
import jdkx.lang.model.util.Types
|
||||
|
||||
/** @author Akash Yadav */
|
||||
class JavaPoetUtils {
|
||||
|
||||
@@ -27,12 +27,12 @@ import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Objects;
|
||||
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.element.VariableElement;
|
||||
import javax.lang.model.type.TypeKind;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.util.Types;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.element.VariableElement;
|
||||
import jdkx.lang.model.type.TypeKind;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.util.Types;
|
||||
|
||||
/**
|
||||
* @author Akash Yadav
|
||||
|
||||
@@ -42,8 +42,8 @@ import openjdk.source.util.Trees;
|
||||
|
||||
import java.nio.file.Path;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
|
||||
public class NavigationHelper {
|
||||
|
||||
|
||||
@@ -25,11 +25,11 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.util.Elements;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.util.Elements;
|
||||
|
||||
public class ScopeHelper {
|
||||
public static List<Element> scopeMembers(
|
||||
|
||||
@@ -2,19 +2,19 @@ package com.itsaky.androidide.lsp.java.utils;
|
||||
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.lang.model.type.ArrayType;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.ErrorType;
|
||||
import javax.lang.model.type.ExecutableType;
|
||||
import javax.lang.model.type.IntersectionType;
|
||||
import javax.lang.model.type.NoType;
|
||||
import javax.lang.model.type.NullType;
|
||||
import javax.lang.model.type.PrimitiveType;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.type.TypeVariable;
|
||||
import javax.lang.model.type.UnionType;
|
||||
import javax.lang.model.type.WildcardType;
|
||||
import javax.lang.model.util.AbstractTypeVisitor8;
|
||||
import jdkx.lang.model.type.ArrayType;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.type.ErrorType;
|
||||
import jdkx.lang.model.type.ExecutableType;
|
||||
import jdkx.lang.model.type.IntersectionType;
|
||||
import jdkx.lang.model.type.NoType;
|
||||
import jdkx.lang.model.type.NullType;
|
||||
import jdkx.lang.model.type.PrimitiveType;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.type.TypeVariable;
|
||||
import jdkx.lang.model.type.UnionType;
|
||||
import jdkx.lang.model.type.WildcardType;
|
||||
import jdkx.lang.model.util.AbstractTypeVisitor8;
|
||||
|
||||
public class ShortTypePrinter extends AbstractTypeVisitor8<String, Void> {
|
||||
public static final ShortTypePrinter NO_PACKAGE = new ShortTypePrinter("*");
|
||||
|
||||
@@ -49,12 +49,12 @@ import java.nio.file.Path;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.NoType;
|
||||
import javax.lang.model.type.TypeKind;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.type.TypeVariable;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.type.NoType;
|
||||
import jdkx.lang.model.type.TypeKind;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.type.TypeVariable;
|
||||
|
||||
public class TypeUtils {
|
||||
|
||||
@@ -151,21 +151,21 @@ public class TypeUtils {
|
||||
|
||||
public static Type toType(TypeMirror typeMirror) {
|
||||
if (typeMirror.getKind() == TypeKind.ARRAY) {
|
||||
return toArrayType((javax.lang.model.type.ArrayType) typeMirror);
|
||||
return toArrayType((jdkx.lang.model.type.ArrayType) typeMirror);
|
||||
}
|
||||
if (typeMirror.getKind().isPrimitive()) {
|
||||
return toPrimitiveType((javax.lang.model.type.PrimitiveType) typeMirror);
|
||||
return toPrimitiveType((jdkx.lang.model.type.PrimitiveType) typeMirror);
|
||||
}
|
||||
if (typeMirror instanceof javax.lang.model.type.IntersectionType) {
|
||||
return toIntersectionType((javax.lang.model.type.IntersectionType) typeMirror);
|
||||
if (typeMirror instanceof jdkx.lang.model.type.IntersectionType) {
|
||||
return toIntersectionType((jdkx.lang.model.type.IntersectionType) typeMirror);
|
||||
}
|
||||
if (typeMirror instanceof javax.lang.model.type.WildcardType) {
|
||||
return toWildcardType((javax.lang.model.type.WildcardType) typeMirror);
|
||||
if (typeMirror instanceof jdkx.lang.model.type.WildcardType) {
|
||||
return toWildcardType((jdkx.lang.model.type.WildcardType) typeMirror);
|
||||
}
|
||||
if (typeMirror instanceof javax.lang.model.type.DeclaredType) {
|
||||
if (typeMirror instanceof jdkx.lang.model.type.DeclaredType) {
|
||||
return toClassOrInterfaceType((DeclaredType) typeMirror);
|
||||
}
|
||||
if (typeMirror instanceof javax.lang.model.type.TypeVariable) {
|
||||
if (typeMirror instanceof jdkx.lang.model.type.TypeVariable) {
|
||||
return toType(((TypeVariable) typeMirror));
|
||||
}
|
||||
if (typeMirror instanceof NoType) {
|
||||
@@ -176,7 +176,7 @@ public class TypeUtils {
|
||||
|
||||
// type mirrors
|
||||
|
||||
public static IntersectionType toIntersectionType(javax.lang.model.type.IntersectionType type) {
|
||||
public static IntersectionType toIntersectionType(jdkx.lang.model.type.IntersectionType type) {
|
||||
NodeList<ReferenceType> collect =
|
||||
type.getBounds().stream()
|
||||
.map(TypeUtils::toType)
|
||||
@@ -207,7 +207,7 @@ public class TypeUtils {
|
||||
return typeParameter;
|
||||
}
|
||||
|
||||
public static WildcardType toWildcardType(javax.lang.model.type.WildcardType type) {
|
||||
public static WildcardType toWildcardType(jdkx.lang.model.type.WildcardType type) {
|
||||
WildcardType wildcardType = new WildcardType();
|
||||
if (type.getSuperBound() != null) {
|
||||
Type result = toType(type.getSuperBound());
|
||||
@@ -224,12 +224,12 @@ public class TypeUtils {
|
||||
return wildcardType;
|
||||
}
|
||||
|
||||
public static PrimitiveType toPrimitiveType(javax.lang.model.type.PrimitiveType type) {
|
||||
public static PrimitiveType toPrimitiveType(jdkx.lang.model.type.PrimitiveType type) {
|
||||
PrimitiveType.Primitive primitive = PrimitiveType.Primitive.valueOf(type.getKind().name());
|
||||
return new PrimitiveType(primitive);
|
||||
}
|
||||
|
||||
public static ArrayType toArrayType(javax.lang.model.type.ArrayType type) {
|
||||
public static ArrayType toArrayType(jdkx.lang.model.type.ArrayType type) {
|
||||
Type componentType = toType(type.getComponentType());
|
||||
return new ArrayType(componentType);
|
||||
}
|
||||
|
||||
@@ -39,13 +39,13 @@ 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
|
||||
import javax.lang.model.element.Modifier
|
||||
import javax.lang.model.element.TypeElement
|
||||
import javax.lang.model.type.DeclaredType
|
||||
import javax.lang.model.type.TypeKind
|
||||
import javax.lang.model.type.TypeMirror
|
||||
import jdkx.lang.model.element.Element
|
||||
import jdkx.lang.model.element.ExecutableElement
|
||||
import jdkx.lang.model.element.Modifier
|
||||
import jdkx.lang.model.element.TypeElement
|
||||
import jdkx.lang.model.type.DeclaredType
|
||||
import jdkx.lang.model.type.TypeKind
|
||||
import jdkx.lang.model.type.TypeMirror
|
||||
|
||||
class DiagnosticVisitor(task: JavacTaskImpl?) :
|
||||
TreeScanner<Void?, MutableMap<TreePath?, String>>() {
|
||||
|
||||
+5
-5
@@ -30,11 +30,11 @@ 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;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.type.TypeKind;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.NestingKind;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.type.TypeKind;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
|
||||
public class FindMethodCallAt extends TreePathScanner<MethodInvocationTree, Integer> {
|
||||
private static final ILogger LOG = ILogger.newInstance("main");
|
||||
|
||||
@@ -34,7 +34,7 @@ import openjdk.source.util.TreePath;
|
||||
import openjdk.source.util.TreePathScanner;
|
||||
import openjdk.source.util.Trees;
|
||||
|
||||
import javax.lang.model.element.Name;
|
||||
import jdkx.lang.model.element.Name;
|
||||
|
||||
public class FindNameAt extends TreePathScanner<TreePath, Long> {
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import openjdk.source.util.Trees;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.Element;
|
||||
|
||||
public class FindReferences extends TreePathScanner<Void, List<TreePath>> {
|
||||
|
||||
|
||||
+4
-4
@@ -47,10 +47,10 @@ import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.List;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.ElementKind;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.Name;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.ElementKind;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.Name;
|
||||
|
||||
public class SemanticHighlighter extends TreePathScanner<Void, List<HighlightToken>> {
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import com.itsaky.androidide.preferences.internal.tabSize
|
||||
import com.squareup.javapoet.JavaFile
|
||||
import com.squareup.javapoet.MethodSpec
|
||||
import com.squareup.javapoet.TypeSpec
|
||||
import javax.lang.model.element.Modifier.PROTECTED
|
||||
import javax.lang.model.element.Modifier.PUBLIC
|
||||
import jdkx.lang.model.element.Modifier.PROTECTED
|
||||
import jdkx.lang.model.element.Modifier.PUBLIC
|
||||
|
||||
object ClassBuilder {
|
||||
@JvmStatic
|
||||
|
||||
@@ -32,14 +32,14 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import javax.lang.model.element.AnnotationMirror;
|
||||
import javax.lang.model.element.AnnotationValue;
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.element.VariableElement;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.util.SimpleAnnotationValueVisitor8;
|
||||
import jdkx.lang.model.SourceVersion;
|
||||
import jdkx.lang.model.element.AnnotationMirror;
|
||||
import jdkx.lang.model.element.AnnotationValue;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.element.VariableElement;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.util.SimpleAnnotationValueVisitor8;
|
||||
|
||||
/** A generated annotation on a declaration. */
|
||||
public final class AnnotationSpec {
|
||||
|
||||
@@ -25,8 +25,8 @@ import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.TypeParameterElement;
|
||||
import javax.lang.model.type.ArrayType;
|
||||
import jdkx.lang.model.element.TypeParameterElement;
|
||||
import jdkx.lang.model.type.ArrayType;
|
||||
|
||||
public final class ArrayTypeName extends TypeName {
|
||||
public final TypeName componentType;
|
||||
|
||||
@@ -25,10 +25,10 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.PackageElement;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.util.SimpleElementVisitor8;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.PackageElement;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.util.SimpleElementVisitor8;
|
||||
|
||||
/** A fully-qualified class name for top-level and member classes. */
|
||||
public final class ClassName extends TypeName implements Comparable<ClassName> {
|
||||
|
||||
@@ -27,8 +27,8 @@ import java.util.regex.Pattern;
|
||||
import java.util.stream.Collector;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
|
||||
/**
|
||||
* A fragment of a .java file, potentially containing declarations, statements, and documentation.
|
||||
@@ -50,8 +50,8 @@ import javax.lang.model.type.TypeMirror;
|
||||
* <li>{@code $S} escapes the value as a <em>string</em>, wraps it with double quotes, and emits
|
||||
* that. For example, {@code 6" sandwich} is emitted {@code "6\" sandwich"}.
|
||||
* <li>{@code $T} emits a <em>type</em> reference. Types will be imported if possible. Arguments
|
||||
* for types may be {@linkplain Class classes}, {@linkplain javax.lang.model.type.TypeMirror
|
||||
* ,* type mirrors}, and {@linkplain javax.lang.model.element.Element elements}.
|
||||
* for types may be {@linkplain Class classes}, {@linkplain jdkx.lang.model.type.TypeMirror
|
||||
* ,* type mirrors}, and {@linkplain jdkx.lang.model.element.Element elements}.
|
||||
* <li>{@code $$} emits a dollar sign.
|
||||
* <li>{@code $W} emits a space or a newline, depending on its position on the line. This prefers
|
||||
* to wrap lines before 100 columns.
|
||||
|
||||
@@ -35,8 +35,8 @@ import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.SourceVersion;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
|
||||
/**
|
||||
* Converts a {@link JavaFile} to a string suitable to both human- and javac-consumption. This
|
||||
|
||||
@@ -26,8 +26,8 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.SourceVersion;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
|
||||
/** A generated field declaration. */
|
||||
public final class FieldSpec {
|
||||
|
||||
@@ -36,9 +36,9 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import javax.tools.JavaFileObject;
|
||||
import javax.tools.JavaFileObject.Kind;
|
||||
import javax.tools.SimpleJavaFileObject;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
import jdkx.tools.JavaFileObject.Kind;
|
||||
import jdkx.tools.SimpleJavaFileObject;
|
||||
|
||||
/** A Java file containing a single top level class. */
|
||||
public final class JavaFile {
|
||||
|
||||
@@ -29,16 +29,16 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.TypeParameterElement;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.ExecutableType;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.type.TypeVariable;
|
||||
import javax.lang.model.util.Types;
|
||||
import jdkx.lang.model.SourceVersion;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.TypeParameterElement;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.type.ExecutableType;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.type.TypeVariable;
|
||||
import jdkx.lang.model.util.Types;
|
||||
|
||||
/** A generated constructor or method declaration. */
|
||||
public final class MethodSpec {
|
||||
|
||||
@@ -23,7 +23,7 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import jdkx.lang.model.SourceVersion;
|
||||
|
||||
/**
|
||||
* Assigns Java identifier names to avoid collisions, keywords, and invalid characters. To use,
|
||||
|
||||
@@ -25,11 +25,11 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import javax.lang.model.element.ElementKind;
|
||||
import javax.lang.model.element.ExecutableElement;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.VariableElement;
|
||||
import jdkx.lang.model.SourceVersion;
|
||||
import jdkx.lang.model.element.ElementKind;
|
||||
import jdkx.lang.model.element.ExecutableElement;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.VariableElement;
|
||||
|
||||
/** A generated parameter declaration. */
|
||||
public final class ParameterSpec {
|
||||
|
||||
@@ -27,17 +27,17 @@ import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.element.TypeParameterElement;
|
||||
import javax.lang.model.type.ArrayType;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.ErrorType;
|
||||
import javax.lang.model.type.NoType;
|
||||
import javax.lang.model.type.PrimitiveType;
|
||||
import javax.lang.model.type.TypeKind;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.util.SimpleTypeVisitor8;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.element.TypeParameterElement;
|
||||
import jdkx.lang.model.type.ArrayType;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.type.ErrorType;
|
||||
import jdkx.lang.model.type.NoType;
|
||||
import jdkx.lang.model.type.PrimitiveType;
|
||||
import jdkx.lang.model.type.TypeKind;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.util.SimpleTypeVisitor8;
|
||||
|
||||
/**
|
||||
* Any type in Java's type system, plus {@code void}. This class is an identifier for primitive
|
||||
@@ -184,12 +184,12 @@ public class TypeName {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TypeName visitTypeVariable(javax.lang.model.type.TypeVariable t, Void p) {
|
||||
public TypeName visitTypeVariable(jdkx.lang.model.type.TypeVariable t, Void p) {
|
||||
return TypeVariableName.get(t, typeVariables);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TypeName visitWildcard(javax.lang.model.type.WildcardType t, Void p) {
|
||||
public TypeName visitWildcard(jdkx.lang.model.type.WildcardType t, Void p) {
|
||||
return WildcardTypeName.get(t, typeVariables);
|
||||
}
|
||||
|
||||
|
||||
@@ -36,14 +36,14 @@ import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.NoType;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.util.ElementFilter;
|
||||
import jdkx.lang.model.SourceVersion;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.TypeElement;
|
||||
import jdkx.lang.model.type.DeclaredType;
|
||||
import jdkx.lang.model.type.NoType;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.util.ElementFilter;
|
||||
|
||||
/** A generated class, interface, or enum declaration. */
|
||||
public final class TypeSpec {
|
||||
|
||||
@@ -27,9 +27,9 @@ import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.TypeParameterElement;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import javax.lang.model.type.TypeVariable;
|
||||
import jdkx.lang.model.element.TypeParameterElement;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.type.TypeVariable;
|
||||
|
||||
public final class TypeVariableName extends TypeName {
|
||||
public final String name;
|
||||
|
||||
@@ -27,7 +27,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
|
||||
/**
|
||||
* Like Guava, but worse and standalone. This makes it easier to mix JavaPoet with libraries that
|
||||
|
||||
@@ -26,8 +26,8 @@ import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.TypeParameterElement;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
import jdkx.lang.model.element.TypeParameterElement;
|
||||
import jdkx.lang.model.type.TypeMirror;
|
||||
|
||||
public final class WildcardTypeName extends TypeName {
|
||||
public final List<TypeName> upperBounds;
|
||||
@@ -67,12 +67,12 @@ public final class WildcardTypeName extends TypeName {
|
||||
Collections.singletonList(OBJECT), Collections.singletonList(lowerBound));
|
||||
}
|
||||
|
||||
public static TypeName get(javax.lang.model.type.WildcardType mirror) {
|
||||
public static TypeName get(jdkx.lang.model.type.WildcardType mirror) {
|
||||
return get(mirror, new LinkedHashMap<>());
|
||||
}
|
||||
|
||||
static TypeName get(
|
||||
javax.lang.model.type.WildcardType mirror,
|
||||
jdkx.lang.model.type.WildcardType mirror,
|
||||
Map<TypeParameterElement, TypeVariableName> typeVariables) {
|
||||
TypeMirror extendsBound = mirror.getExtendsBound();
|
||||
if (extendsBound == null) {
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import javax.lang.model.type.ArrayType
|
||||
import jdkx.lang.model.type.ArrayType
|
||||
|
||||
/** @author Akash Yadav */
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
|
||||
@@ -64,7 +64,7 @@ import java.util.Objects;
|
||||
* is typically used in situations where an existing API only accepts an {@link InputStream}, but
|
||||
* where the most natural way to produce the data is as a character stream, i.e. by providing a
|
||||
* {@link Reader} instance. An example of a situation where this problem may appear is when
|
||||
* implementing the {@code javax.activation.DataSource} interface from the Java Activation
|
||||
* implementing the {@code jdkx.activation.DataSource} interface from the Java Activation
|
||||
* Framework.
|
||||
*
|
||||
* <p>Given the fact that the {@link Reader} class doesn't provide any way to predict whether the
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.google.googlejavaformat.java;
|
||||
import com.google.googlejavaformat.Input;
|
||||
import openjdk.source.tree.AnnotationTree;
|
||||
|
||||
import javax.annotation.processing.Generated;
|
||||
import jdkx.annotation.processing.Generated;
|
||||
|
||||
@Generated("com.google.auto.value.processor.AutoOneOfProcessor")
|
||||
final class AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier {
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.google.googlejavaformat.java;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import openjdk.source.tree.AnnotationTree;
|
||||
|
||||
import javax.annotation.processing.Generated;
|
||||
import jdkx.annotation.processing.Generated;
|
||||
|
||||
@Generated("com.google.auto.value.processor.AutoValueProcessor")
|
||||
final class AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations
|
||||
|
||||
+6
-6
@@ -49,12 +49,12 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.DiagnosticCollector;
|
||||
import javax.tools.DiagnosticListener;
|
||||
import javax.tools.JavaFileObject;
|
||||
import javax.tools.SimpleJavaFileObject;
|
||||
import javax.tools.StandardLocation;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.DiagnosticCollector;
|
||||
import jdkx.tools.DiagnosticListener;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
import jdkx.tools.SimpleJavaFileObject;
|
||||
import jdkx.tools.StandardLocation;
|
||||
|
||||
/**
|
||||
* This is google-java-format, a new Java formatter that follows the Google Java Style Guide quite
|
||||
|
||||
+2
-2
@@ -22,8 +22,8 @@ import com.google.googlejavaformat.FormatterDiagnostic;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/** Checked exception class for formatter errors. */
|
||||
public final class FormatterException extends Exception {
|
||||
|
||||
+6
-6
@@ -48,12 +48,12 @@ import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.DiagnosticCollector;
|
||||
import javax.tools.DiagnosticListener;
|
||||
import javax.tools.JavaFileObject;
|
||||
import javax.tools.JavaFileObject.Kind;
|
||||
import javax.tools.SimpleJavaFileObject;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.DiagnosticCollector;
|
||||
import jdkx.tools.DiagnosticListener;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
import jdkx.tools.JavaFileObject.Kind;
|
||||
import jdkx.tools.SimpleJavaFileObject;
|
||||
|
||||
/** {@code JavaInput} extends {@link Input} to represent a Java input document. */
|
||||
public final class JavaInput extends Input {
|
||||
|
||||
+1
-1
@@ -161,7 +161,7 @@ import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import javax.lang.model.element.Name;
|
||||
import jdkx.lang.model.element.Name;
|
||||
|
||||
/**
|
||||
* An AST visitor that builds a stream of {@link Op}s to format from the given {@link
|
||||
|
||||
+2
-2
@@ -33,7 +33,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import javax.lang.model.element.Modifier;
|
||||
import jdkx.lang.model.element.Modifier;
|
||||
|
||||
/** Fixes sequences of modifiers to be in JLS order. */
|
||||
final class ModifierOrderer {
|
||||
@@ -112,7 +112,7 @@ final class ModifierOrderer {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the given token as a {@link javax.lang.model.element.Modifier}, or {@code null} if it
|
||||
* Returns the given token as a {@link jdkx.lang.model.element.Modifier}, or {@code null} if it
|
||||
* is not a modifier.
|
||||
*/
|
||||
private static Modifier asModifier(Token token) {
|
||||
|
||||
+6
-6
@@ -64,12 +64,12 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.DiagnosticCollector;
|
||||
import javax.tools.DiagnosticListener;
|
||||
import javax.tools.JavaFileObject;
|
||||
import javax.tools.SimpleJavaFileObject;
|
||||
import javax.tools.StandardLocation;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.DiagnosticCollector;
|
||||
import jdkx.tools.DiagnosticListener;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
import jdkx.tools.SimpleJavaFileObject;
|
||||
import jdkx.tools.StandardLocation;
|
||||
|
||||
/**
|
||||
* Removes unused imports from a source file. Imports that are only used in javadoc are also
|
||||
|
||||
+6
-6
@@ -54,12 +54,12 @@ import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.DiagnosticCollector;
|
||||
import javax.tools.DiagnosticListener;
|
||||
import javax.tools.JavaFileObject;
|
||||
import javax.tools.SimpleJavaFileObject;
|
||||
import javax.tools.StandardLocation;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.DiagnosticCollector;
|
||||
import jdkx.tools.DiagnosticListener;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
import jdkx.tools.SimpleJavaFileObject;
|
||||
import jdkx.tools.StandardLocation;
|
||||
|
||||
/** Wraps string literals that exceed the column limit. */
|
||||
public final class StringWrapper {
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ import openjdk.tools.javac.tree.TreeInfo;
|
||||
import java.io.IOError;
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.lang.model.element.Name;
|
||||
import jdkx.lang.model.element.Name;
|
||||
|
||||
/** Utilities for working with {@link Tree}s. */
|
||||
class Trees {
|
||||
|
||||
+6
-6
@@ -22,12 +22,12 @@ import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.annotation.processing.Filer;
|
||||
import javax.annotation.processing.Messager;
|
||||
import javax.lang.model.element.Element;
|
||||
import javax.tools.FileObject;
|
||||
import javax.tools.JavaFileManager;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.annotation.processing.Filer;
|
||||
import jdkx.annotation.processing.Messager;
|
||||
import jdkx.lang.model.element.Element;
|
||||
import jdkx.tools.FileObject;
|
||||
import jdkx.tools.JavaFileManager;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/**
|
||||
* A decorating {@link Filer} implementation which formats Java source files with a {@link
|
||||
|
||||
+4
-4
@@ -26,10 +26,10 @@ import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
import java.io.IOException;
|
||||
import java.io.Writer;
|
||||
|
||||
import javax.annotation.processing.Messager;
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.ForwardingJavaFileObject;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.annotation.processing.Messager;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.ForwardingJavaFileObject;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/** A {@link JavaFileObject} decorator which {@linkplain Formatter formats} source code. */
|
||||
final class FormattingJavaFileObject extends ForwardingJavaFileObject<JavaFileObject> {
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ import java.util.function.Supplier;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/**
|
||||
* @author lahvac
|
||||
|
||||
+2
-2
@@ -59,8 +59,8 @@ import java.util.Set;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.tools.ForwardingJavaFileObject;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.ForwardingJavaFileObject;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/**
|
||||
* @author lahvac
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ import openjdk.tools.javac.util.Context;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.lang.model.element.Element;
|
||||
import jdkx.lang.model.element.Element;
|
||||
|
||||
/**
|
||||
* @author lahvac
|
||||
|
||||
+2
-2
@@ -49,8 +49,8 @@ import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/**
|
||||
* @author Tomas Zezula
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import androidx.annotation.NonNull;
|
||||
|
||||
import openjdk.tools.javac.util.Context;
|
||||
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/**
|
||||
* @author Akash Yadav
|
||||
|
||||
+4
-4
@@ -20,9 +20,9 @@ package com.itsaky.androidide.javac.services.compiler
|
||||
import com.itsaky.androidide.javac.services.CancelService
|
||||
import openjdk.tools.javac.api.JavacTaskImpl
|
||||
import openjdk.tools.javac.api.JavacTool
|
||||
import javax.tools.DiagnosticListener
|
||||
import javax.tools.JavaFileManager
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.tools.DiagnosticListener
|
||||
import jdkx.tools.JavaFileManager
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* A pool of reusable JavacTasks. When a task is no valid anymore, it is returned to the pool, and
|
||||
@@ -56,7 +56,7 @@ class ReusableCompiler {
|
||||
internal var checkedOut = false
|
||||
|
||||
/**
|
||||
* Creates a new task as if by [javax.tools.JavaCompiler.getTask] and runs the provided worker
|
||||
* Creates a new task as if by [jdkx.tools.JavaCompiler.getTask] and runs the provided worker
|
||||
* with it. The task is only valid while the worker is running. The internal structures may be
|
||||
* reused from some previous compilation.
|
||||
*
|
||||
|
||||
+3
-3
@@ -55,9 +55,9 @@ import openjdk.tools.javac.util.DefinedBy.Api.COMPILER_TREE
|
||||
import openjdk.tools.javac.util.Log
|
||||
import java.io.PrintWriter
|
||||
import java.net.URI
|
||||
import javax.tools.DiagnosticListener
|
||||
import javax.tools.JavaFileManager
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.tools.DiagnosticListener
|
||||
import jdkx.tools.JavaFileManager
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Reusable [Context] for [ReusableCompiler].
|
||||
|
||||
+3
-3
@@ -22,9 +22,9 @@ import openjdk.tools.javac.util.DefinedBy
|
||||
import openjdk.tools.javac.util.DefinedBy.Api.COMPILER
|
||||
import openjdk.tools.javac.util.Log
|
||||
import java.io.PrintWriter
|
||||
import javax.tools.Diagnostic
|
||||
import javax.tools.DiagnosticListener
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.tools.Diagnostic
|
||||
import jdkx.tools.DiagnosticListener
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Reusable Log; exposes a method to clean up the component from leftovers associated with
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ import com.itsaky.androidide.zipfs2.ZipFileSystemProvider
|
||||
import openjdk.tools.javac.file.RelativePath.RelativeDirectory
|
||||
import java.io.IOException
|
||||
import java.nio.file.Path
|
||||
import javax.lang.model.SourceVersion
|
||||
import jdkx.lang.model.SourceVersion
|
||||
|
||||
/**
|
||||
* A cached file system for JAR files.
|
||||
|
||||
+2
-2
@@ -20,8 +20,8 @@ package com.itsaky.androidide.javac.services.partial
|
||||
import openjdk.source.tree.CompilationUnitTree
|
||||
import openjdk.tools.javac.api.JavacTaskImpl
|
||||
import openjdk.tools.javac.api.JavacTrees
|
||||
import javax.tools.DiagnosticListener
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.tools.DiagnosticListener
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/**
|
||||
* Information about a compilation.
|
||||
|
||||
+3
-3
@@ -34,9 +34,9 @@ import java.util.Map;
|
||||
import java.util.SortedMap;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.DiagnosticListener;
|
||||
import javax.tools.JavaFileObject;
|
||||
import jdkx.tools.Diagnostic;
|
||||
import jdkx.tools.DiagnosticListener;
|
||||
import jdkx.tools.JavaFileObject;
|
||||
|
||||
/**
|
||||
* @author Akash Yadav
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ import openjdk.tools.javac.util.JCDiagnostic;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
import javax.tools.Diagnostic;
|
||||
import jdkx.tools.Diagnostic;
|
||||
|
||||
/**
|
||||
* @author Akash Yadav
|
||||
|
||||
+2
-2
@@ -19,8 +19,8 @@ package com.itsaky.androidide.javac.services.util
|
||||
|
||||
import openjdk.tools.javac.api.ClientCodeWrapper
|
||||
import openjdk.tools.javac.util.JCDiagnostic
|
||||
import javax.tools.Diagnostic
|
||||
import javax.tools.JavaFileObject
|
||||
import jdkx.tools.Diagnostic
|
||||
import jdkx.tools.JavaFileObject
|
||||
|
||||
/** @author Akash Yadav */
|
||||
class JavaDiagnosticUtils {
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user