Incorrect auto-insertion of } on Enter #216 : implementation attempt

xonixx · Jul 6, 2024 · 9a48618 · 9a48618
1 parent 8503909
commit 9a48618
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/intellij_awk/AwkEnterAfterUnmatchedBraceHandler.java b/src/main/java/intellij_awk/AwkEnterAfterUnmatchedBraceHandler.java
@@ -34,12 +34,11 @@ protected Pair<PsiElement, Integer> calculateOffsetToInsertClosingBrace(
 
     AwkStatement awkStatement = (AwkStatement) AwkUtil.findFirstMatchedDeep(awkFile, AwkStatement.class::isInstance);
 
-    System.out.println("zzz:"+CharArrayUtil.shiftForwardUntil(text, offset, "\n")+":"+(offset + awkStatement.getTextLength()+1));
-
     if (awkStatement == null) {
       return Pair.create(null, CharArrayUtil.shiftForwardUntil(text, offset, "\n"));
     }
 
+    System.out.println("zzz:"+CharArrayUtil.shiftForwardUntil(text, offset, "\n")+":"+(offset + awkStatement.getTextLength()+1));
     System.out.println("awkStatement="+awkStatement.getTextLength());
     System.out.println("awkStatement="+awkStatement.getText());
 

diff --git a/src/test/java/intellij_awk/AwkBracesAndQuoteAutoCloseTests.java b/src/test/java/intellij_awk/AwkBracesAndQuoteAutoCloseTests.java
@@ -112,15 +112,21 @@ public void testEnterCurlyBrace7() {
   public void testEnterCurlyBrace8() {
     doTest('\n', "function f()\n{<caret>print 123", "function f()\n{\n    <caret>print 123\n}");
   }
-  public void testEnterCurlyBrace9() {
+  public void testEnterCurlyBrace9_1() {
     doTestEnterCurlyBraceComplex("if (2)");
   }
-  public void testEnterCurlyBrace10() {
+  public void testEnterCurlyBrace9_2() {
     doTestEnterCurlyBraceComplex("while (2)");
   }
-  public void testEnterCurlyBrace11() {
+  public void testEnterCurlyBrace9_3() {
     doTestEnterCurlyBraceComplex("for(;;)");
   }
+  public void testEnterCurlyBrace10() {
+    doTest(
+        '\n',
+        "function f() {\n    if(1){<caret>\n}",
+        "function f() {\n    if(1){\n        <caret>\n    }\n}");
+  }
 
   private void doTestEnterCurlyBraceComplex(String opener) {
     doTest(