User: joe
Date: 24 Sep 23 16:35
Revision: 48452ccaa31a19fed5ca7c3aa1d073a28ee22536
Summary:
Merge branch '2023.1' into 2023.2
TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8784&personal=false
Index: src/main/kotlin/util/class-utils.kt
===================================================================
--- src/main/kotlin/util/class-utils.kt (revision bc1227cde804e6f1958198dd692c17887b06ee98)
+++ src/main/kotlin/util/class-utils.kt (revision 48452ccaa31a19fed5ca7c3aa1d073a28ee22536)
@@ -23,7 +23,6 @@
import com.intellij.codeInsight.daemon.impl.quickfix.AddMethodFix
import com.intellij.navigation.AnonymousElementProvider
import com.intellij.openapi.project.Project
-import com.intellij.psi.CommonClassNames
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiClassType
@@ -305,10 +304,6 @@
return true
}
-fun PsiClass.isJavaOptional(): Boolean = this.qualifiedName == CommonClassNames.JAVA_UTIL_OPTIONAL
-
-fun PsiClassType.isJavaOptional(): Boolean = this.fullQualifiedName == CommonClassNames.JAVA_UTIL_OPTIONAL
-
class ClassNameResolutionFailedException : Exception {
constructor() : super()
constructor(message: String) : super(message)
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml (revision bc1227cde804e6f1958198dd692c17887b06ee98)
+++ src/main/resources/META-INF/plugin.xml (revision 48452ccaa31a19fed5ca7c3aa1d073a28ee22536)
@@ -651,13 +651,6 @@
-