PY-73076 Ctrl+Z doesn't work in RemDev

GitOrigin-RevId: e80b54e1a43e9f83be921096a1bc3a0059795cb7

python/python-ast/src/com/jetbrains/python/ast/PyAstFile.java

@@ -19,6 +19,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNamedElement;
 import com.jetbrains.python.ast.controlFlow.AstScopeOwner;
+import com.jetbrains.python.ast.docstring.DocStringUtilCore;
 import com.jetbrains.python.psi.FutureFeature;
 import com.jetbrains.python.psi.LanguageLevel;
 import org.jetbrains.annotations.ApiStatus;
@@ -67,4 +68,16 @@ public interface PyAstFile extends PyAstElement, PsiFile, PyAstDocStringOwner, A
   default boolean isAcceptedFor(@NotNull Class<?> visitorClass) {
     return true;
   }
+
+  @Nullable
+  @Override
+  default String getDocStringValue() {
+    return DocStringUtilCore.getDocStringValue(this);
+  }
+
+  @Nullable
+  @Override
+  default PyAstStringLiteralExpression getDocStringExpression() {
+    return DocStringUtilCore.findDocStringExpression(this);
+  }
 }

python/python-psi-api/src/com/jetbrains/python/psi/PyFile.java

@@ -128,4 +128,10 @@ public interface PyFile extends PyAstFile, PyElement, PsiFile, PyDocStringOwner,
    * Returns the sequential list of import statements in the beginning of the file.
    */
   List<PyImportStatementBase> getImportBlock();
+
+  @Nullable
+  @Override
+  default PyStringLiteralExpression getDocStringExpression() {
+    return (PyStringLiteralExpression)PyAstFile.super.getDocStringExpression();
+  }
 }

python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringUtil.java

@@ -5,9 +5,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.jetbrains.python.ast.impl.PyPsiUtilsCore;
-import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
+import com.jetbrains.python.ast.PyAstDocStringOwner;
 import com.jetbrains.python.ast.docstring.DocStringUtilCore;
+import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
 import com.jetbrains.python.psi.*;
 import com.jetbrains.python.psi.impl.PyPsiUtils;
 import com.jetbrains.python.toolbox.Substring;
@@ -18,6 +18,10 @@ public final class DocStringUtil {
   private DocStringUtil() {
   }
 
+  /**
+   * @deprecated Use {@link DocStringUtilCore#getDocStringValue(PyAstDocStringOwner)}
+   */
+  @Deprecated
   @Nullable
   public static String getDocStringValue(@NotNull PyDocStringOwner owner) {
     return DocStringUtilCore.getDocStringValue(owner);

python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFileImpl.java

@@ -738,24 +738,12 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression {
     return myType;
   }
 
-  @Nullable
-  @Override
-  public String getDocStringValue() {
-    return DocStringUtil.getDocStringValue(this);
-  }
-
   @Nullable
   @Override
   public StructuredDocString getStructuredDocString() {
     return DocStringUtil.getStructuredDocString(this);
   }
 
-  @Nullable
-  @Override
-  public PyStringLiteralExpression getDocStringExpression() {
-    return DocStringUtil.findDocStringExpression(this);
-  }
-
   @Override
   public void clearCaches() {
     super.clearCaches();