bugfix "Execute cell in console"

guoci · May 20, 2023 · 4c9e3f7 · 4c9e3f7
1 parent 826bc3d
commit 4c9e3f7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/src/main/java/com/jetbrains/python/actions/PyCellExecuteAction.java b/src/main/java/com/jetbrains/python/actions/PyCellExecuteAction.java
@@ -42,48 +42,44 @@ private static void cellExecute(final AnActionEvent e, final Editor editor) {
  final int line = logicalPos.line;
 
  int start = 6666, end = 6666;
- for (int i = 0; i > -666; --i) {
+ for (int i = 0; ; --i) {
  final int cline = line + i;
- int offset = 666;
- boolean outOfDoc = false;
+ int offset;
  try {
  offset = DocumentUtil.getFirstNonSpaceCharOffset(document, cline);
  start = offset;
  } catch (IndexOutOfBoundsException ex) {
- outOfDoc = true;
- }
- PsiElement psiElement = null;
- if (!outOfDoc) {
- psiElement = psiFile.findElementAt(offset);
- if (outOfDoc || !(psiElement.getNode().getElementType() instanceof PyElementType)) {
- break;
- }
+ break;
  }
+ final PsiElement psiElement = psiFile.findElementAt(offset);
+ final var elementType = psiElement.getNode().getElementType();
 // System.out.println("i = " + i);
 // System.out.println("cline = " + cline);
 // System.out.println("psiElement = " + psiElement);
+// System.out.println("psiElement.getNode() = " + psiElement.getNode());
+// System.out.println("elementType = " + elementType);
+ if (!((elementType instanceof PyElementType) || (psiElement.getNode() instanceof PsiWhiteSpace)))
+ break;
  }
 // System.out.println("forward");
- for (int i = 0; i < 666; ++i) {
+ for (int i = 0; ; ++i) {
  final int cline = line + i;
- int offset = 666;
- boolean outOfDoc = false;
+ int offset;
  try {
  offset = DocumentUtil.getFirstNonSpaceCharOffset(document, cline);
  end = offset;
  } catch (IndexOutOfBoundsException ex) {
- outOfDoc = true;
- }
- PsiElement psiElement = null;
- if (!outOfDoc) {
- psiElement = psiFile.findElementAt(offset);
- if (outOfDoc || !(psiElement.getNode().getElementType() instanceof PyElementType)) {
- break;
- }
+ break;
  }
+ final PsiElement psiElement = psiFile.findElementAt(offset);
+ final var elementType = psiElement.getNode().getElementType();
 // System.out.println("i = " + i);
 // System.out.println("cline = " + cline);
 // System.out.println("psiElement = " + psiElement);
+// System.out.println("psiElement.getNode() = " + psiElement.getNode());
+// System.out.println("elementType = " + elementType);
+ if (!((elementType instanceof PyElementType) || (psiElement.getNode() instanceof PsiWhiteSpace)))
+ break;
  }
  {
  start = DocumentUtil.getLineEndOffset(start, document);

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -6,7 +6,7 @@
 <idea-plugin>
  <id>python-smart-execute</id>
  <name>Python Smart Execute</name>
- <version>0.1.11</version>
+ <version>0.1.12</version>
  <vendor email="[email protected]" url="https://github.com/JetBrains/intellij-community/pull/711">Guo Ci Teo</vendor>
 
  <description><![CDATA[