Add intention to remove trailing semicolon #80

xonixx · May 15, 2023 · 278cc0e · 278cc0e
1 parent fa03659
commit 278cc0e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 13 deletions.
diff --git a/src/main/java/intellij_awk/Awk.bnf b/src/main/java/intellij_awk/Awk.bnf
@@ -227,7 +227,7 @@ statement ::=      action
                  | EXIT expr_opt
                  | RETURN expr_opt
                  | statement_do
-                 | semicolonPsi newlines_opt
+                 | SEMICOLON newlines_opt
                  | simple_statement
                  | gawk_statement_switch
 

diff --git a/src/main/java/intellij_awk/AwkInspectionUnnecessarySemicolon.java b/src/main/java/intellij_awk/AwkInspectionUnnecessarySemicolon.java
@@ -6,7 +6,6 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import intellij_awk.psi.AwkSemicolonPsi;
-import intellij_awk.psi.AwkStatement;
 import intellij_awk.psi.AwkTypes;
 import intellij_awk.psi.AwkVisitor;
 import org.jetbrains.annotations.NotNull;
@@ -47,13 +46,7 @@ private static class DeleteUnnecessarySemicolonQuickFix implements LocalQuickFix
 
     @Override
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-      PsiElement psiElement = descriptor.getPsiElement();
-      PsiElement parent = psiElement.getParent();
-      if (parent instanceof AwkStatement) {
-        parent.delete();
-      } else {
-        psiElement.delete();
-      }
+      descriptor.getPsiElement().delete();
     }
   }
 }
diff --git a/src/test/java/intellij_awk/AwkInspectionTests.java b/src/test/java/intellij_awk/AwkInspectionTests.java
@@ -264,8 +264,20 @@ public void testUnnecessarySemicolon3() {
     checkByFile(unnecessarySemicolon);
   }
 
-  public void testUnnecessarySemicolon4() {
-    checkByFile(unnecessarySemicolon);
+  public void testUnnecessarySemicolonNecessary1() {
+    checkByFileNoProblemAtCaret(unnecessarySemicolon);
+  }
+
+  public void testUnnecessarySemicolonNecessary2() {
+    checkByFileNoProblemAtCaret(unnecessarySemicolon);
+  }
+
+  public void testUnnecessarySemicolonNecessary3() {
+    checkByFileNoProblemAtCaret(unnecessarySemicolon);
+  }
+
+  public void testUnnecessarySemicolonNecessary4() {
+    checkByFileNoProblemAtCaret(unnecessarySemicolon);
   }
 
   @Override

diff --git a/src/test/testData/inspection/unnecessarySemicolon4After.awk b/src/test/testData/inspection/unnecessarySemicolon4After.awk
diff --git a/src/test/testData/inspection/unnecessarySemicolonNecessary1.awk b/src/test/testData/inspection/unnecessarySemicolonNecessary1.awk
@@ -0,0 +1 @@
+function f() { while(1);<caret> }
diff --git a/src/test/testData/inspection/unnecessarySemicolonNecessary2.awk b/src/test/testData/inspection/unnecessarySemicolonNecessary2.awk
@@ -0,0 +1,3 @@
+function f() {
+    for(;;);<caret>
+}
diff --git a/src/test/testData/inspection/unnecessarySemicolonNecessary3.awk b/src/test/testData/inspection/unnecessarySemicolonNecessary3.awk
@@ -0,0 +1,3 @@
+{
+    if(1)  ;<caret>
+}
diff --git a/...Data/inspection/unnecessarySemicolon4.awk → ...ection/unnecessarySemicolonNecessary4.awk b/...Data/inspection/unnecessarySemicolon4.awk → ...ection/unnecessarySemicolonNecessary4.awk