MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 05:10:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

disable "create enum constant" when executing it would result in psi/text inconsistency

Browse Source
This commit is contained in:
peter
2017-11-30 16:39:43 +01:00
parent 92795f0d27
commit bf9a49d1be
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/lang/java/actions/CreateEnumConstantAction.kt
View File

@@ -30,6 +30,7 @@ import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiEnumConstant
import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiTreeUtil
class CreateEnumConstantAction(targetClass: PsiClass, request: CreateFieldRequest) : CreateFieldActionBase(targetClass, request) {
@@ -87,6 +88,10 @@ private class EnumConstantData(
private fun extractRenderData(targetClass: PsiClass, request: CreateFieldRequest): EnumConstantData? {
if (!targetClass.isEnum) return null
val lastConstant = targetClass.fields.filterIsInstance<PsiEnumConstant>().lastOrNull()
if (lastConstant != null && PsiTreeUtil.hasErrorElements(lastConstant)) return null
if (!checkExpectedTypes(request.fieldType, targetClass, targetClass.project)) return null
return EnumConstantData(targetClass, request.fieldName)
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createEnumConstantFromUsage/beforeNoSuggestionWhenEnumIsBroken.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create enum constant 'Natural'" "false"
class ParagraphStyle {
TextDirection textDirection = TextDirection.Nat<caret>ural;
public enum TextDirection {
a(b;
int x;
}
}