Enum warnings fixed: deprecated delimiters, short super constructors, both in project and in libraries
This commit is contained in:
@@ -81,7 +81,7 @@ class FuzzyType(
|
||||
= matchedSubstitutor(otherType, MatchKind.IS_SUPERTYPE)
|
||||
|
||||
private enum class MatchKind {
|
||||
IS_SUBTYPE
|
||||
IS_SUBTYPE,
|
||||
IS_SUPERTYPE
|
||||
}
|
||||
|
||||
|
||||
@@ -80,8 +80,8 @@ private fun JetType.hasAnnotationMaybeExternal(fqName: FqName) = with (getAnnota
|
||||
} != null
|
||||
|
||||
public enum class TypeNullability {
|
||||
NOT_NULL
|
||||
NULLABLE
|
||||
NOT_NULL,
|
||||
NULLABLE,
|
||||
FLEXIBLE
|
||||
}
|
||||
|
||||
|
||||
@@ -26,18 +26,18 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils
|
||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||
|
||||
public enum class CallType {
|
||||
NORMAL
|
||||
SAFE
|
||||
NORMAL,
|
||||
SAFE,
|
||||
|
||||
INFIX {
|
||||
override fun canCall(descriptor: DeclarationDescriptor)
|
||||
= descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size() == 1
|
||||
}
|
||||
},
|
||||
|
||||
UNARY {
|
||||
override fun canCall(descriptor: DeclarationDescriptor)
|
||||
= descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size() == 0
|
||||
}
|
||||
};
|
||||
|
||||
public open fun canCall(descriptor: DeclarationDescriptor): Boolean = true
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
package org.jetbrains.kotlin.resolve.lazy
|
||||
|
||||
public enum class BodyResolveMode {
|
||||
FULL
|
||||
PARTIAL
|
||||
FULL,
|
||||
PARTIAL,
|
||||
PARTIAL_FOR_COMPLETION
|
||||
}
|
||||
|
||||
@@ -531,9 +531,9 @@ class PartialBodyResolveFilter(
|
||||
}
|
||||
|
||||
private enum class MarkLevel {
|
||||
SKIP
|
||||
TAKE
|
||||
NEED_REFERENCE_RESOLVE
|
||||
SKIP,
|
||||
TAKE,
|
||||
NEED_REFERENCE_RESOLVE,
|
||||
NEED_COMPLETION
|
||||
}
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ class ModuleTypeCacheManager private (project: Project) {
|
||||
}
|
||||
|
||||
enum class ModuleType {
|
||||
GRADLE
|
||||
GRADLE,
|
||||
OTHER
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -118,7 +118,7 @@ enum class FlagsToModifiers {
|
||||
else -> throw IllegalStateException("Unexpected modality: $modality")
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
VISIBILITY {
|
||||
override fun getModifiers(flags: Int): JetModifierKeywordToken? {
|
||||
@@ -131,13 +131,13 @@ enum class FlagsToModifiers {
|
||||
else -> throw IllegalStateException("Unexpected visibility: $visibility")
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
INNER {
|
||||
override fun getModifiers(flags: Int): JetModifierKeywordToken? {
|
||||
return if (Flags.INNER.get(flags)) JetTokens.INNER_KEYWORD else null
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
abstract fun getModifiers(flags: Int): JetModifierKeywordToken?
|
||||
}
|
||||
|
||||
@@ -224,39 +224,39 @@ public object UsageTypeUtils {
|
||||
}
|
||||
|
||||
enum class UsageTypeEnum {
|
||||
TYPE_CONSTRAINT
|
||||
VALUE_PARAMETER_TYPE
|
||||
NON_LOCAL_PROPERTY_TYPE
|
||||
FUNCTION_RETURN_TYPE
|
||||
SUPER_TYPE
|
||||
TYPE_DEFINITION
|
||||
IS
|
||||
CLASS_OBJECT_ACCESS
|
||||
COMPANION_OBJECT_ACCESS
|
||||
EXTENSION_RECEIVER_TYPE
|
||||
SUPER_TYPE_QUALIFIER
|
||||
TYPE_CONSTRAINT,
|
||||
VALUE_PARAMETER_TYPE,
|
||||
NON_LOCAL_PROPERTY_TYPE,
|
||||
FUNCTION_RETURN_TYPE,
|
||||
SUPER_TYPE,
|
||||
TYPE_DEFINITION,
|
||||
IS,
|
||||
CLASS_OBJECT_ACCESS,
|
||||
COMPANION_OBJECT_ACCESS,
|
||||
EXTENSION_RECEIVER_TYPE,
|
||||
SUPER_TYPE_QUALIFIER,
|
||||
|
||||
FUNCTION_CALL
|
||||
IMPLICIT_GET
|
||||
IMPLICIT_SET
|
||||
IMPLICIT_INVOKE
|
||||
IMPLICIT_ITERATION
|
||||
PROPERTY_DELEGATION
|
||||
FUNCTION_CALL,
|
||||
IMPLICIT_GET,
|
||||
IMPLICIT_SET,
|
||||
IMPLICIT_INVOKE,
|
||||
IMPLICIT_ITERATION,
|
||||
PROPERTY_DELEGATION,
|
||||
|
||||
RECEIVER
|
||||
DELEGATE
|
||||
RECEIVER,
|
||||
DELEGATE,
|
||||
|
||||
PACKAGE_DIRECTIVE
|
||||
PACKAGE_MEMBER_ACCESS
|
||||
PACKAGE_DIRECTIVE,
|
||||
PACKAGE_MEMBER_ACCESS,
|
||||
|
||||
CALLABLE_REFERENCE
|
||||
CALLABLE_REFERENCE,
|
||||
|
||||
READ
|
||||
WRITE
|
||||
CLASS_IMPORT
|
||||
CLASS_LOCAL_VAR_DECLARATION
|
||||
TYPE_PARAMETER
|
||||
CLASS_CAST_TO
|
||||
ANNOTATION
|
||||
READ,
|
||||
WRITE,
|
||||
CLASS_IMPORT,
|
||||
CLASS_LOCAL_VAR_DECLARATION,
|
||||
TYPE_PARAMETER,
|
||||
CLASS_CAST_TO,
|
||||
ANNOTATION,
|
||||
CLASS_NEW_OPERATOR
|
||||
}
|
||||
|
||||
+2
-2
@@ -134,8 +134,8 @@ public class JetSimpleNameReference(
|
||||
}
|
||||
|
||||
public enum class ShorteningMode {
|
||||
NO_SHORTENING
|
||||
DELAYED_SHORTENING
|
||||
NO_SHORTENING,
|
||||
DELAYED_SHORTENING,
|
||||
FORCED_SHORTENING
|
||||
}
|
||||
|
||||
|
||||
@@ -37,8 +37,8 @@ public abstract class ImportInsertHelper {
|
||||
public abstract val importSortComparator: Comparator<ImportPath>
|
||||
|
||||
public enum class ImportDescriptorResult {
|
||||
FAIL
|
||||
IMPORT_ADDED
|
||||
FAIL,
|
||||
IMPORT_ADDED,
|
||||
ALREADY_IMPORTED
|
||||
}
|
||||
|
||||
|
||||
@@ -121,8 +121,8 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options.
|
||||
}
|
||||
|
||||
private enum class FilterResult {
|
||||
SKIP
|
||||
GO_INSIDE
|
||||
SKIP,
|
||||
GO_INSIDE,
|
||||
PROCESS
|
||||
}
|
||||
|
||||
|
||||
@@ -241,11 +241,11 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
|
||||
: CompletionSessionBase(configuration, parameters, resultSet) {
|
||||
|
||||
public enum class CompletionKind {
|
||||
KEYWORDS_ONLY
|
||||
NAMED_PARAMETERS_ONLY
|
||||
ALL
|
||||
TYPES
|
||||
ANNOTATION_TYPES
|
||||
KEYWORDS_ONLY,
|
||||
NAMED_PARAMETERS_ONLY,
|
||||
ALL,
|
||||
TYPES,
|
||||
ANNOTATION_TYPES,
|
||||
ANNOTATION_TYPES_OR_PARAMETER_NAME
|
||||
}
|
||||
|
||||
|
||||
+11
-11
@@ -69,10 +69,10 @@ private object SmartCompletionPriorityWeigher : LookupElementWeigher("kotlin.sma
|
||||
|
||||
private object KindWeigher : LookupElementWeigher("kotlin.kind") {
|
||||
private enum class Weight {
|
||||
variable // variable or property
|
||||
function
|
||||
keyword
|
||||
`default`
|
||||
variable, // variable or property
|
||||
function,
|
||||
keyword,
|
||||
`default`,
|
||||
packages
|
||||
}
|
||||
|
||||
@@ -124,13 +124,13 @@ private class JetDeclarationRemotenessWeigher(private val file: JetFile) : Looku
|
||||
private val importCache = ImportCache()
|
||||
|
||||
private enum class Weight {
|
||||
thisFile
|
||||
kotlinDefaultImport
|
||||
preciseImport
|
||||
allUnderImport
|
||||
`default`
|
||||
hasImportFromSamePackage
|
||||
notImported
|
||||
thisFile,
|
||||
kotlinDefaultImport,
|
||||
preciseImport,
|
||||
allUnderImport,
|
||||
`default`,
|
||||
hasImportFromSamePackage,
|
||||
notImported,
|
||||
notToBeUsedInKotlin
|
||||
}
|
||||
|
||||
|
||||
@@ -44,9 +44,9 @@ import org.jetbrains.kotlin.types.typeUtil.equalTypesOrNulls
|
||||
import java.util.ArrayList
|
||||
|
||||
enum class ItemPriority {
|
||||
MULTIPLE_ARGUMENTS_ITEM
|
||||
DEFAULT
|
||||
BACKING_FIELD
|
||||
MULTIPLE_ARGUMENTS_ITEM,
|
||||
DEFAULT,
|
||||
BACKING_FIELD,
|
||||
NAMED_PARAMETER
|
||||
}
|
||||
|
||||
@@ -125,12 +125,12 @@ fun LookupElementPresentation.prependTailText(text: String, grayed: Boolean) {
|
||||
}
|
||||
|
||||
enum class CallableWeight {
|
||||
local // local non-extension
|
||||
thisClassMember
|
||||
baseClassMember
|
||||
thisTypeExtension
|
||||
baseTypeExtension
|
||||
global // global non-extension
|
||||
local, // local non-extension
|
||||
thisClassMember,
|
||||
baseClassMember,
|
||||
thisTypeExtension,
|
||||
baseTypeExtension,
|
||||
global, // global non-extension
|
||||
notApplicableReceiverNullable
|
||||
}
|
||||
|
||||
|
||||
@@ -49,8 +49,8 @@ import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
|
||||
import java.util.HashSet
|
||||
|
||||
enum class Tail {
|
||||
COMMA
|
||||
RPARENTH
|
||||
COMMA,
|
||||
RPARENTH,
|
||||
ELSE
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -92,8 +92,8 @@ public class LookupElementFactory(
|
||||
}
|
||||
|
||||
private enum class Style {
|
||||
NORMAL
|
||||
BOLD
|
||||
NORMAL,
|
||||
BOLD,
|
||||
GRAYED
|
||||
}
|
||||
|
||||
|
||||
@@ -281,19 +281,19 @@ fun <T : Any> T?.toList(): List<T> = if (this != null) listOf(this) else listOf(
|
||||
fun <T : Any> T?.toSet(): Set<T> = if (this != null) setOf(this) else setOf()
|
||||
|
||||
enum class SmartCompletionItemPriority {
|
||||
IT
|
||||
TRUE
|
||||
FALSE
|
||||
THIS
|
||||
DEFAULT
|
||||
NULLABLE
|
||||
INSTANTIATION
|
||||
STATIC_MEMBER
|
||||
ANONYMOUS_OBJECT
|
||||
LAMBDA_NO_PARAMS
|
||||
LAMBDA
|
||||
FUNCTION_REFERENCE
|
||||
NULL
|
||||
IT,
|
||||
TRUE,
|
||||
FALSE,
|
||||
THIS,
|
||||
DEFAULT,
|
||||
NULLABLE,
|
||||
INSTANTIATION,
|
||||
STATIC_MEMBER,
|
||||
ANONYMOUS_OBJECT,
|
||||
LAMBDA_NO_PARAMS,
|
||||
LAMBDA,
|
||||
FUNCTION_REFERENCE,
|
||||
NULL,
|
||||
INHERITOR_INSTANTIATION
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
|
||||
import org.jetbrains.kotlin.psi.JetFile
|
||||
|
||||
public enum class ModuleKind {
|
||||
KOTLIN_JVM_WITH_STDLIB_SOURCES
|
||||
KOTLIN_JVM_WITH_STDLIB_SOURCES,
|
||||
KOTLIN_JAVASCRIPT
|
||||
}
|
||||
|
||||
|
||||
@@ -59,8 +59,8 @@ public class JetAddImportAction(
|
||||
private val module = ModuleUtilCore.findModuleForPsiElement(element)
|
||||
|
||||
private enum class Priority {
|
||||
MODULE
|
||||
PROJECT
|
||||
MODULE,
|
||||
PROJECT,
|
||||
OTHER
|
||||
}
|
||||
|
||||
|
||||
@@ -61,11 +61,11 @@ public class KotlinReferenceData(
|
||||
) : Cloneable, Serializable {
|
||||
|
||||
public enum class Kind {
|
||||
CLASS
|
||||
PACKAGE
|
||||
NON_EXTENSION_CALLABLE
|
||||
EXTENSION_FUNCTION
|
||||
EXTENSION_PROPERTY
|
||||
CLASS,
|
||||
PACKAGE,
|
||||
NON_EXTENSION_CALLABLE,
|
||||
EXTENSION_FUNCTION,
|
||||
EXTENSION_PROPERTY;
|
||||
|
||||
companion object {
|
||||
public fun fromDescriptor(descriptor: DeclarationDescriptor): KotlinReferenceData.Kind? {
|
||||
|
||||
@@ -76,8 +76,8 @@ public class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor {
|
||||
}
|
||||
|
||||
private enum class RangeFilterResult {
|
||||
SKIP
|
||||
GO_INSIDE
|
||||
SKIP,
|
||||
GO_INSIDE,
|
||||
PROCESS
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -119,9 +119,9 @@ class ParameterInfo(
|
||||
)
|
||||
|
||||
enum class CallableKind {
|
||||
FUNCTION
|
||||
CLASS_WITH_PRIMARY_CONSTRUCTOR
|
||||
SECONDARY_CONSTRUCTOR
|
||||
FUNCTION,
|
||||
CLASS_WITH_PRIMARY_CONSTRUCTOR,
|
||||
SECONDARY_CONSTRUCTOR,
|
||||
PROPERTY
|
||||
}
|
||||
|
||||
|
||||
+6
-6
@@ -40,12 +40,12 @@ import java.util.Collections
|
||||
import java.util.HashMap
|
||||
|
||||
enum class ClassKind(val keyword: String, val description: String) {
|
||||
PLAIN_CLASS: ClassKind("class", "class")
|
||||
ENUM_CLASS: ClassKind("enum class", "enum")
|
||||
ENUM_ENTRY: ClassKind("", "enum constant")
|
||||
ANNOTATION_CLASS: ClassKind("annotation class", "annotation")
|
||||
TRAIT: ClassKind("interface", "interface")
|
||||
OBJECT: ClassKind("object", "object")
|
||||
PLAIN_CLASS("class", "class"),
|
||||
ENUM_CLASS("enum class", "enum"),
|
||||
ENUM_ENTRY("", "enum constant"),
|
||||
ANNOTATION_CLASS("annotation class", "annotation"),
|
||||
TRAIT("interface", "interface"),
|
||||
OBJECT("object", "object")
|
||||
}
|
||||
|
||||
public class ClassInfo(
|
||||
|
||||
+3
-3
@@ -27,9 +27,9 @@ import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
|
||||
|
||||
public trait JetMethodDescriptor : MethodDescriptor<JetParameterInfo, Visibility> {
|
||||
enum class Kind(val isConstructor: Boolean) {
|
||||
FUNCTION: Kind(false)
|
||||
PRIMARY_CONSTRUCTOR: Kind(true)
|
||||
SECONDARY_CONSTRUCTOR: Kind(true)
|
||||
FUNCTION(false),
|
||||
PRIMARY_CONSTRUCTOR(true),
|
||||
SECONDARY_CONSTRUCTOR(true)
|
||||
}
|
||||
|
||||
val kind: Kind get() {
|
||||
|
||||
@@ -20,9 +20,9 @@ import com.intellij.lang.ASTNode
|
||||
import org.jetbrains.kotlin.lexer.JetTokens
|
||||
|
||||
public enum class JetValVar(val name: String) {
|
||||
None: JetValVar("none")
|
||||
Val: JetValVar("val")
|
||||
Var: JetValVar("var")
|
||||
None("none"),
|
||||
Val("val"),
|
||||
Var("var");
|
||||
|
||||
override fun toString(): String = name
|
||||
}
|
||||
|
||||
+22
-22
@@ -310,17 +310,17 @@ data class ExtractableCodeDescriptor(
|
||||
}
|
||||
|
||||
enum class ExtractionTarget(val name: String) {
|
||||
FUNCTION : ExtractionTarget("function") {
|
||||
FUNCTION("function") {
|
||||
override fun isAvailable(descriptor: ExtractableCodeDescriptor) = true
|
||||
}
|
||||
},
|
||||
|
||||
FAKE_LAMBDALIKE_FUNCTION : ExtractionTarget("lambda parameter") {
|
||||
FAKE_LAMBDALIKE_FUNCTION("lambda parameter") {
|
||||
override fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean {
|
||||
return checkSimpleControlFlow(descriptor) || descriptor.controlFlow.outputValues.isEmpty()
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
PROPERTY_WITH_INITIALIZER : ExtractionTarget("property with initializer") {
|
||||
PROPERTY_WITH_INITIALIZER("property with initializer") {
|
||||
override fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean {
|
||||
return checkSignatureAndParent(descriptor)
|
||||
&& checkSimpleControlFlow(descriptor)
|
||||
@@ -328,22 +328,22 @@ enum class ExtractionTarget(val name: String) {
|
||||
&& checkNotTrait(descriptor)
|
||||
&& descriptor.receiverParameter == null
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
PROPERTY_WITH_GETTER : ExtractionTarget("property with getter") {
|
||||
PROPERTY_WITH_GETTER("property with getter") {
|
||||
override fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean {
|
||||
return checkSignatureAndParent(descriptor)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
LAZY_PROPERTY : ExtractionTarget("lazy property") {
|
||||
LAZY_PROPERTY("lazy property") {
|
||||
override fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean {
|
||||
return checkSignatureAndParent(descriptor)
|
||||
&& checkSimpleControlFlow(descriptor)
|
||||
&& checkNotTrait(descriptor)
|
||||
&& descriptor.receiverParameter == null
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
abstract fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean
|
||||
|
||||
@@ -407,22 +407,22 @@ class AnalysisResult (
|
||||
val messages: List<ErrorMessage>
|
||||
) {
|
||||
enum class Status {
|
||||
SUCCESS
|
||||
NON_CRITICAL_ERROR
|
||||
SUCCESS,
|
||||
NON_CRITICAL_ERROR,
|
||||
CRITICAL_ERROR
|
||||
}
|
||||
|
||||
enum class ErrorMessage {
|
||||
NO_EXPRESSION
|
||||
NO_CONTAINER
|
||||
SUPER_CALL
|
||||
DENOTABLE_TYPES
|
||||
ERROR_TYPES
|
||||
MULTIPLE_OUTPUT
|
||||
OUTPUT_AND_EXIT_POINT
|
||||
MULTIPLE_EXIT_POINTS
|
||||
DECLARATIONS_ARE_USED_OUTSIDE
|
||||
DECLARATIONS_OUT_OF_SCOPE
|
||||
NO_EXPRESSION,
|
||||
NO_CONTAINER,
|
||||
SUPER_CALL,
|
||||
DENOTABLE_TYPES,
|
||||
ERROR_TYPES,
|
||||
MULTIPLE_OUTPUT,
|
||||
OUTPUT_AND_EXIT_POINT,
|
||||
MULTIPLE_EXIT_POINTS,
|
||||
DECLARATIONS_ARE_USED_OUTSIDE,
|
||||
DECLARATIONS_OUT_OF_SCOPE;
|
||||
|
||||
var additionalInfo: List<String>? = null
|
||||
|
||||
|
||||
+4
-4
@@ -91,21 +91,21 @@ public class KotlinInplaceParameterIntroducer(
|
||||
}
|
||||
|
||||
enum class PreviewDecorator {
|
||||
FOR_ADD: PreviewDecorator() {
|
||||
FOR_ADD() {
|
||||
override val textAttributes: TextAttributes = with(TextAttributes()) {
|
||||
setEffectType(EffectType.ROUNDED_BOX)
|
||||
setEffectColor(JBColor.RED)
|
||||
this
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
FOR_REMOVAL: PreviewDecorator() {
|
||||
FOR_REMOVAL() {
|
||||
override val textAttributes: TextAttributes = with(TextAttributes()) {
|
||||
setEffectType(EffectType.STRIKEOUT)
|
||||
setEffectColor(Color.BLACK)
|
||||
this
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
protected abstract val textAttributes: TextAttributes
|
||||
|
||||
|
||||
+2
-2
@@ -91,8 +91,8 @@ public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() {
|
||||
}
|
||||
|
||||
private enum class UsageKind {
|
||||
SIMPLE_PROPERTY_USAGE
|
||||
GETTER_USAGE
|
||||
SIMPLE_PROPERTY_USAGE,
|
||||
GETTER_USAGE,
|
||||
SETTER_USAGE
|
||||
}
|
||||
|
||||
|
||||
@@ -94,11 +94,11 @@ public trait UnificationResult {
|
||||
public enum class Status {
|
||||
MATCHED {
|
||||
override fun and(other: Status): Status = other
|
||||
}
|
||||
},
|
||||
|
||||
UNMATCHED {
|
||||
override fun and(other: Status): Status = this
|
||||
}
|
||||
};
|
||||
|
||||
public abstract fun and(other: Status): Status
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ enum class MoveAction {
|
||||
|
||||
MoveMembersProcessor(elementAtCaret.getProject(), options).run()
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
MOVE_TOP_LEVEL_CLASSES {
|
||||
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) {
|
||||
@@ -152,7 +152,7 @@ enum class MoveAction {
|
||||
/* moveCallback = */ null
|
||||
).run()
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
MOVE_PACKAGES {
|
||||
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) {
|
||||
@@ -169,7 +169,7 @@ enum class MoveAction {
|
||||
/* moveCallback = */ null
|
||||
).run()
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
MOVE_TOP_LEVEL_CLASSES_TO_INNER {
|
||||
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) {
|
||||
@@ -187,7 +187,7 @@ enum class MoveAction {
|
||||
/* moveCallback = */ null
|
||||
).run()
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
MOVE_INNER_CLASS {
|
||||
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) {
|
||||
@@ -207,7 +207,7 @@ enum class MoveAction {
|
||||
JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.getDirectories()[0]
|
||||
).run()
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
MOVE_FILES {
|
||||
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) {
|
||||
@@ -238,7 +238,7 @@ enum class MoveAction {
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS {
|
||||
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) {
|
||||
@@ -254,13 +254,13 @@ enum class MoveAction {
|
||||
val options = MoveKotlinTopLevelDeclarationsOptions(listOf(elementToMove), moveTarget)
|
||||
MoveKotlinTopLevelDeclarationsProcessor(mainFile.getProject(), options).run()
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
CHANGE_PACKAGE_DIRECTIVE {
|
||||
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) {
|
||||
KotlinChangePackageRefactoring(mainFile as JetFile).run(FqName(config.getString("newPackageName")))
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
abstract fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject)
|
||||
}
|
||||
|
||||
@@ -51,11 +51,11 @@ import org.junit.Assert
|
||||
import java.io.File
|
||||
|
||||
private enum class RenameType {
|
||||
JAVA_CLASS
|
||||
JAVA_METHOD
|
||||
KOTLIN_CLASS
|
||||
KOTLIN_FUNCTION
|
||||
KOTLIN_PROPERTY
|
||||
JAVA_CLASS,
|
||||
JAVA_METHOD,
|
||||
KOTLIN_CLASS,
|
||||
KOTLIN_FUNCTION,
|
||||
KOTLIN_PROPERTY,
|
||||
KOTLIN_PACKAGE
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user