Skip to content
This repository has been archived by the owner on Oct 18, 2024. It is now read-only.

fix(java/lsp): fix bugs when overriding methods #1917

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

fix(java/lsp): fix bugs when overriding methods #1917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6b2d3f
fix: do not import java keywords and primitive types when overriding …
teixeira0x Oct 11, 2024
c6bbfce
fix: do not add duplicate Override annotation when overriding a method
teixeira0x Oct 15, 2024
03beee0
fix: name isPresend to isPresent
teixeira0x Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import com.itsaky.androidide.projects.IProjectManager
import com.itsaky.androidide.resources.R
import com.itsaky.androidide.utils.flashError
import io.github.rosemoe.sora.widget.CodeEditor
import jdkx.lang.model.SourceVersion
import jdkx.lang.model.element.ElementKind
import jdkx.lang.model.element.ExecutableElement
import jdkx.lang.model.element.Modifier
Expand Down Expand Up @@ -249,7 +250,7 @@ class OverrideSuperclassMethodsAction : BaseJavaCodeAction() {
sb.append("\n")

newImports.removeIf {
it.startsWith("java.lang.") || it.startsWith(filePackage) || fileImports.contains(it)
it.startsWith("java.lang.") || it.startsWith(filePackage) || SourceVersion.isKeyword(it) || fileImports.contains(it)
}

imports.addAll(newImports)
Expand Down
6 changes: 5 additions & 1 deletion java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,11 @@ object JavaParserUtils {
methodDeclaration: MethodDeclaration,
method: ExecutableElement,
) {
methodDeclaration.addMarkerAnnotation(Override::class.java)
val overrideAnnotation = methodDeclaration.getAnnotationByClass(Override::class.java)
if (!overrideAnnotation.isPresent) {
methodDeclaration.addMarkerAnnotation(Override::class.java)
}

val recentlyNonNull = methodDeclaration.getAnnotationByName("RecentlyNonNull")
if (recentlyNonNull.isPresent) {
methodDeclaration.remove(recentlyNonNull.get())
Expand Down