Documenting intentions and fixing bug in SplitIntoDeclarationAndAssig…

…nment
HaxeFoundation · Jan 21, 2024 · 643b4c4 · 643b4c4
1 parent afd6d91
commit 643b4c4
Show file tree

Hide file tree

Showing 40 changed files with 245 additions and 7 deletions.
diff --git a/src/main/java/com/intellij/plugins/haxe/ide/intention/SplitIntoDeclarationAndAssignment.java b/src/main/java/com/intellij/plugins/haxe/ide/intention/SplitIntoDeclarationAndAssignment.java
@@ -64,12 +64,15 @@ public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file
   @Override
   public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
     PsiElement elementAt = file.findElementAt(editor.getCaretModel().getOffset());
-    HaxeLocalVarDeclaration localVarDeclaration = PsiTreeUtil.getParentOfType(elementAt, HaxeLocalVarDeclaration.class);
+    HaxeLocalVarDeclarationList localVarDeclarationList = PsiTreeUtil.getParentOfType(elementAt, HaxeLocalVarDeclarationList.class);
 
-    if (localVarDeclaration == null) return;
-    String name = localVarDeclaration.getComponentName().getName();
-    HaxeTypeTag typeTag = localVarDeclaration.getTypeTag();
-    HaxeVarInit varInit = localVarDeclaration.getVarInit();
+    if (localVarDeclarationList == null) return;
+    List<HaxeLocalVarDeclaration> list = localVarDeclarationList.getLocalVarDeclarationList();
+    if (list.size() != 1) return;
+    HaxeLocalVarDeclaration declaration = list.get(0);
+    String name = declaration.getComponentName().getName();
+    HaxeTypeTag typeTag = declaration.getTypeTag();
+    HaxeVarInit varInit = declaration.getVarInit();
 
     String text = "var " + name;
     if (typeTag != null) {
@@ -83,8 +86,8 @@ public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws
     PsiElement statementFromText = HaxeElementGenerator.createStatementFromText(project, text);
     statementFromText.getNode().addLeaf(HaxeTokenTypes.OSEMI, ";", null);
 
-    localVarDeclaration.getParent().addBefore(varDeclaration, localVarDeclaration);
-    PsiElement replace = localVarDeclaration.replace(statementFromText);
+    localVarDeclarationList.getParent().addBefore(varDeclaration, localVarDeclarationList);
+    PsiElement replace = localVarDeclarationList.replace(statementFromText);
 
     final TextRange range = replace.getTextRange();
     final PsiFile baseFile = file.getViewProvider().getPsi(file.getViewProvider().getBaseLanguage());

diff --git a/src/main/resources/intentionDescriptions/AddReturnTypeTagIntention/after.hx.template b/src/main/resources/intentionDescriptions/AddReturnTypeTagIntention/after.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    public function myFunction()<spot>:String</spot> {
+        var stringVar = "MyString";
+        return stringVar;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/AddReturnTypeTagIntention/before.hx.template b/src/main/resources/intentionDescriptions/AddReturnTypeTagIntention/before.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    public function myFunction()<spot></spot> {
+        var stringVar = "MyString";
+        return stringVar;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/AddReturnTypeTagIntention/description.html b/src/main/resources/intentionDescriptions/AddReturnTypeTagIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Resolves return type and adds it to the method declarations
+</body>
+</html>
diff --git a/src/main/resources/intentionDescriptions/AddTypeTagToFieldIntention/after.hx.template b/src/main/resources/intentionDescriptions/AddTypeTagToFieldIntention/after.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    public function myFunction() {
+        var stringVar<spot>:String</spot> = "MyString";
+        return stringVar;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/AddTypeTagToFieldIntention/before.hx.template b/src/main/resources/intentionDescriptions/AddTypeTagToFieldIntention/before.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    public function myFunction() {
+        var stringVar<spot></spot> = "MyString";
+        return stringVar;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/AddTypeTagToFieldIntention/description.html b/src/main/resources/intentionDescriptions/AddTypeTagToFieldIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Resolves variable type and adds it to the variable declarations
+</body>
+</html>
diff --git a/...main/resources/intentionDescriptions/ConvertPropertyToVariableIntention/after.hx.template b/...main/resources/intentionDescriptions/ConvertPropertyToVariableIntention/after.hx.template
@@ -0,0 +1,4 @@
+package ;
+class SomeClass {
+    public var variable<spot></spot>:String;
+}
diff --git a/...ain/resources/intentionDescriptions/ConvertPropertyToVariableIntention/before.hx.template b/...ain/resources/intentionDescriptions/ConvertPropertyToVariableIntention/before.hx.template
@@ -0,0 +1,4 @@
+package ;
+class SomeClass {
+    public var variable<spot>(default, default)</spot>:String;
+}
diff --git a/src/main/resources/intentionDescriptions/ConvertPropertyToVariableIntention/description.html b/src/main/resources/intentionDescriptions/ConvertPropertyToVariableIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Converts a property into a variable
+</body>
+</html>
diff --git a/src/main/resources/intentionDescriptions/ConvertQuotesIntention/after.hx.template b/src/main/resources/intentionDescriptions/ConvertQuotesIntention/after.hx.template
@@ -0,0 +1,6 @@
+package ;
+class SomeClass {
+    function myFun(intValue:Int) {
+        return <spot>'</spot>value = $intValue<spot>'</spot>;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/ConvertQuotesIntention/before.hx.template b/src/main/resources/intentionDescriptions/ConvertQuotesIntention/before.hx.template
@@ -0,0 +1,6 @@
+package ;
+class SomeClass {
+    function myFun(intValue:Int) {
+        return <spot>"</spot>value = $intValue<spot>"</spot>;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/ConvertQuotesIntention/description.html b/src/main/resources/intentionDescriptions/ConvertQuotesIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Replaces double quotes with single quotes for string interpolation support
+</body>
+</html>
diff --git a/...sources/intentionDescriptions/ConvertVariableToPropertyDefaultIntention/after.hx.template b/...sources/intentionDescriptions/ConvertVariableToPropertyDefaultIntention/after.hx.template
@@ -0,0 +1,5 @@
+package ;
+class SomeClass {
+    public var variable<spot>(default, default)</spot>:String;
+}
+
diff --git a/...ources/intentionDescriptions/ConvertVariableToPropertyDefaultIntention/before.hx.template b/...ources/intentionDescriptions/ConvertVariableToPropertyDefaultIntention/before.hx.template
@@ -0,0 +1,4 @@
+package ;
+class SomeClass {
+    public var variable<spot></spot>:String;
+}
diff --git a/...esources/intentionDescriptions/ConvertVariableToPropertyDefaultIntention/description.html b/...esources/intentionDescriptions/ConvertVariableToPropertyDefaultIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Converts a variable into a property with default accessors
+</body>
+</html>
diff --git a/...esources/intentionDescriptions/ConvertVariableToPropertyGetSetIntention/after.hx.template b/...esources/intentionDescriptions/ConvertVariableToPropertyGetSetIntention/after.hx.template
@@ -0,0 +1,5 @@
+package ;
+class SomeClass {
+    public var variable<spot>(get, set)</spot>:String;
+}
+
diff --git a/...sources/intentionDescriptions/ConvertVariableToPropertyGetSetIntention/before.hx.template b/...sources/intentionDescriptions/ConvertVariableToPropertyGetSetIntention/before.hx.template
@@ -0,0 +1,4 @@
+package ;
+class SomeClass {
+    public var variable<spot></spot>:String;
+}
diff --git a/...resources/intentionDescriptions/ConvertVariableToPropertyGetSetIntention/description.html b/...resources/intentionDescriptions/ConvertVariableToPropertyGetSetIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Converts a variable into a property with getter and setter accessors
+</body>
+</html>
diff --git a/...ources/intentionDescriptions/ConvertVariableToPropertyReadOnlyIntention/after.hx.template b/...ources/intentionDescriptions/ConvertVariableToPropertyReadOnlyIntention/after.hx.template
@@ -0,0 +1,5 @@
+package ;
+class SomeClass {
+    public var variable<spot>(get, never)</spot>:String;
+}
+
diff --git a/...urces/intentionDescriptions/ConvertVariableToPropertyReadOnlyIntention/before.hx.template b/...urces/intentionDescriptions/ConvertVariableToPropertyReadOnlyIntention/before.hx.template
@@ -0,0 +1,4 @@
+package ;
+class SomeClass {
+    public var variable<spot></spot>:String;
+}
diff --git a/...sources/intentionDescriptions/ConvertVariableToPropertyReadOnlyIntention/description.html b/...sources/intentionDescriptions/ConvertVariableToPropertyReadOnlyIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Converts a variable into a property with read-only accessors
+</body>
+</html>
diff --git a/src/main/resources/intentionDescriptions/IteratorForLoopIntention/after.hx.template b/src/main/resources/intentionDescriptions/IteratorForLoopIntention/after.hx.template
@@ -0,0 +1,9 @@
+package ;
+class SomeClass {
+    function myFun() {
+        var myArray = ["A", "B", "C"];
+        <spot>for (itr in myArray) {
+
+        }</spot>
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/IteratorForLoopIntention/before.hx.template b/src/main/resources/intentionDescriptions/IteratorForLoopIntention/before.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    function myFun() {
+        var myArray = ["A", "B", "C"];
+        myArray<spot></spot>
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/IteratorForLoopIntention/description.html b/src/main/resources/intentionDescriptions/IteratorForLoopIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Introduces a for-loop using iterator from selected variable
+</body>
+</html>
diff --git a/src/main/resources/intentionDescriptions/KeyValueIteratorForLoopIntention/after.hx.template b/src/main/resources/intentionDescriptions/KeyValueIteratorForLoopIntention/after.hx.template
@@ -0,0 +1,9 @@
+package ;
+class SomeClass {
+    function myFun() {
+        var myMap = ["A" => 1, "B" => 2, "C" => 3];
+        <spot>for (key => value in myMap) {
+
+        }</spot>
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/KeyValueIteratorForLoopIntention/before.hx.template b/src/main/resources/intentionDescriptions/KeyValueIteratorForLoopIntention/before.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    function myFun() {
+        var myMap = ["A" => 1, "B" => 2, "C" => 3];
+        myMap<spot></spot>
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/KeyValueIteratorForLoopIntention/description.html b/src/main/resources/intentionDescriptions/KeyValueIteratorForLoopIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Introduces a for-each loop using key-value iterator from selected variable
+</body>
+</html>
diff --git a/src/main/resources/intentionDescriptions/RemoveReturnTypeTagIntention/after.hx.template b/src/main/resources/intentionDescriptions/RemoveReturnTypeTagIntention/after.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    public function myFunction()<spot></spot> {
+        var stringVar = "MyString";
+        return stringVar;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/RemoveReturnTypeTagIntention/before.hx.template b/src/main/resources/intentionDescriptions/RemoveReturnTypeTagIntention/before.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    public function myFunction()<spot>:String</spot> {
+        var stringVar = "MyString";
+        return stringVar;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/RemoveReturnTypeTagIntention/description.html b/src/main/resources/intentionDescriptions/RemoveReturnTypeTagIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Removes type information from method declaration
+</body>
+</html>
diff --git a/src/main/resources/intentionDescriptions/RemoveTypeTagFromFieldIntention/after.hx.template b/src/main/resources/intentionDescriptions/RemoveTypeTagFromFieldIntention/after.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    public function myFunction() {
+        var stringVar<spot></spot> = "MyString";
+        return stringVar;
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/RemoveTypeTagFromFieldIntention/before.hx.template b/src/main/resources/intentionDescriptions/RemoveTypeTagFromFieldIntention/before.hx.template
@@ -0,0 +1,8 @@
+package ;
+class SomeClass {
+    public function myFunction() {
+        var stringVar<spot>:String</spot> = "MyString";
+        return stringVar;
+    }
+}
+
diff --git a/src/main/resources/intentionDescriptions/RemoveTypeTagFromFieldIntention/description.html b/src/main/resources/intentionDescriptions/RemoveTypeTagFromFieldIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Removes type information from variable declaration
+</body>
+</html>
diff --git a/...onDescriptions/ReplaceImportStatementWithWildcardWithSingleClassImports/after.hx.template b/...onDescriptions/ReplaceImportStatementWithWildcardWithSingleClassImports/after.hx.template
@@ -0,0 +1,11 @@
+package ;
+
+<spot>import sys.Http;
+import sys.FileSystem;</spot>
+
+class SomeClass {
+    public function myFunction() {
+        var url = Http.requestUrl("url");
+        var path = FileSystem.absolutePath("path");
+    }
+}
diff --git a/...nDescriptions/ReplaceImportStatementWithWildcardWithSingleClassImports/before.hx.template b/...nDescriptions/ReplaceImportStatementWithWildcardWithSingleClassImports/before.hx.template
@@ -0,0 +1,10 @@
+package ;
+
+import sys.*<spot></spot>;
+
+class SomeClass {
+    public function myFunction() {
+        var url = Http.requestUrl("url");
+        var path = FileSystem.absolutePath("path");
+    }
+}
diff --git a/...ionDescriptions/ReplaceImportStatementWithWildcardWithSingleClassImports/description.html b/...ionDescriptions/ReplaceImportStatementWithWildcardWithSingleClassImports/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Replaces wildcard import statement with concrete import statements for each reference used.
+</body>
+</html>
diff --git a/src/main/resources/intentionDescriptions/SplitIntoDeclarationAndAssignment/after.hx.template b/src/main/resources/intentionDescriptions/SplitIntoDeclarationAndAssignment/after.hx.template
@@ -0,0 +1,7 @@
+package ;
+class SomeClass {
+    public function myFunction() {
+        <spot>var stringVar;
+        stringVar = "MyString";</spot>
+    }
+}
diff --git a/...main/resources/intentionDescriptions/SplitIntoDeclarationAndAssignment/before.hx.template b/...main/resources/intentionDescriptions/SplitIntoDeclarationAndAssignment/before.hx.template
@@ -0,0 +1,6 @@
+package ;
+class SomeClass {
+    public function myFunction() {
+        <spot>var stringVar = "MyString";</spot>
+    }
+}
diff --git a/src/main/resources/intentionDescriptions/SplitIntoDeclarationAndAssignment/description.html b/src/main/resources/intentionDescriptions/SplitIntoDeclarationAndAssignment/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Splits variable declaration and variable assignment into separate expressions
+</body>
+</html>