From 170dc73bbbacb5d6a39dfe6a5ae99eaa74f0eb20 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Fri, 15 Nov 2019 10:26:36 +0300
Subject: [PATCH] [groovy] fix warnings in StringPartInfo

GitOrigin-RevId: 0beced554224da4aba320edea8e6289d230e07c6
---
 .../refactoring/introduce/StringPartInfo.java       | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/refactoring/introduce/StringPartInfo.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/refactoring/introduce/StringPartInfo.java
index 2b1b804c3340..1872e802d908 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/refactoring/introduce/StringPartInfo.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/refactoring/introduce/StringPartInfo.java
@@ -37,6 +37,7 @@ import org.jetbrains.plugins.groovy.lang.psi.util.GrStringUtil;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author Max Medvedev
@@ -202,23 +203,19 @@ public class StringPartInfo {
 
     try {
       if (prefixExists && suffixExists) {
-        return ((GrBinaryExpression)((GrBinaryExpression)replaced).getLeftOperand()).getRightOperand();
+        return Objects.requireNonNull(((GrBinaryExpression)((GrBinaryExpression)replaced).getLeftOperand()).getRightOperand());
       }
       if (!prefixExists && suffixExists) {
         return ((GrBinaryExpression)replaced).getLeftOperand();
       }
-      if (prefixExists && !suffixExists) {
-        return ((GrBinaryExpression)replaced).getRightOperand();
-      }
-      if (!prefixExists && !suffixExists) {
-        return replaced;
+      if (prefixExists) {
+        return Objects.requireNonNull(((GrBinaryExpression)replaced).getRightOperand());
       }
+      return replaced;
     }
     catch (ClassCastException c) {
       throw new IncorrectOperationException(buffer.toString());
     }
-
-    throw new IncorrectOperationException(buffer.toString());
   }
 
   private String prepareSelected() {