diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotateFix.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotateFix.java
index 15afd5066ec5..f6789d46c692 100644
--- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotateFix.java
+++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotateFix.java
@@ -83,14 +83,10 @@ public class AnnotateFix implements LocalQuickFix {
 
         final String argList;
         if (myArgList == null) {
-          switch (requirement) {
-            case VALUE_REQUIRED:
-            case OTHER_REQUIRED:
-              argList = "(\"\")";
-              break;
-            default:
-              argList = "";
-          }
+          argList = switch (requirement) {
+            case VALUE_REQUIRED, OTHER_REQUIRED -> "(\"\")";
+            default -> "";
+          };
         }
         else {
           argList = myArgList;
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/PropertyProviderFinder.java b/plugins/ant/src/com/intellij/lang/ant/dom/PropertyProviderFinder.java
index 3537fce9d89b..aa38861e33d9 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/PropertyProviderFinder.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/PropertyProviderFinder.java
@@ -124,7 +124,7 @@ public abstract class PropertyProviderFinder extends AntDomRecursiveVisitor {
       String effectiveTargetName;
       final InclusionKind inclusionKind = myNameContext.getCurrentInclusionKind();
       switch (inclusionKind) {
-        case IMPORT:
+        case IMPORT -> {
           final String alias = myNameContext.getShortPrefix() + declaredTargetName;
           if (!myTargetsResolveMap.containsKey(declaredTargetName)) {
             effectiveTargetName = declaredTargetName;
@@ -133,15 +133,9 @@ public abstract class PropertyProviderFinder extends AntDomRecursiveVisitor {
           else {
             effectiveTargetName = alias;
           }
-          break;
-
-        case INCLUDE:
-          effectiveTargetName = myNameContext.getFQPrefix() + declaredTargetName;
-          break;
-
-        default:
-          effectiveTargetName = declaredTargetName;
-          break;
+        }
+        case INCLUDE -> effectiveTargetName = myNameContext.getFQPrefix() + declaredTargetName;
+        default -> effectiveTargetName = declaredTargetName;
       }
       if (effectiveTargetName != null) {
         final AntDomTarget existingTarget = myTargetsResolveMap.get(effectiveTargetName);