fix case with parentheses expressions

rename

Author: Sergey Ibragimov

src/com/goide/inspections/GoStructInitializationInspection.java

@@ -108,7 +108,7 @@ public GoReplaceWithNamedStructFieldQuickFix(@NotNull String structField) {
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
       PsiElement startElement = descriptor.getStartElement();
       if (startElement instanceof GoElement) {
-        startElement.replace(GoElementFactory.createNamedStructField(project, myStructField, startElement.getText()));
+        startElement.replace(GoElementFactory.createLiteralValueElement(project, myStructField, startElement.getText()));
       }
     }
   }

src/com/goide/intentions/GoMoveToStructInitializationIntention.java

@@ -92,8 +92,16 @@ private static GoReferenceExpression getFieldReferenceExpression(@NotNull PsiEle
 
   @NotNull
   private static List<GoReferenceExpression> getFieldReferenceExpressions(@NotNull GoAssignmentStatement assignment) {
-    return map(filter(getLeftHandElements(assignment), GoMoveToStructInitializationIntention::isFieldReferenceExpression),
-               GoReferenceExpression.class::cast);
+    return filter(map(getLeftHandElements(assignment), GoMoveToStructInitializationIntention::unwrapParensAndCast),
+                  GoMoveToStructInitializationIntention::isFieldReferenceExpression);
+  }
+
+  @Nullable
+  private static GoReferenceExpression unwrapParensAndCast(@NotNull PsiElement e) {
+    while (e instanceof GoParenthesesExpr) {
+      e = ((GoParenthesesExpr)e).getExpression();
+    }
+    return ObjectUtils.tryCast(e, GoReferenceExpression.class);
   }
 
   @Contract("null -> false")
@@ -233,17 +241,19 @@ private static void moveFieldReferenceExpressions(@NotNull Data data) {
     if (literalValue == null) return;
 
     for (GoReferenceExpression expression : data.getReferenceExpressions()) {
-      GoExpression fieldValue = GoPsiImplUtil.getRightExpression(data.getAssignment(), expression);
+      GoExpression parentExpression = PsiTreeUtil.getTopmostParentOfType(expression, GoExpression.class);
+      GoExpression anchor = parentExpression != null ? parentExpression : expression;
+      GoExpression fieldValue = GoPsiImplUtil.getRightExpression(data.getAssignment(), anchor);
       if (fieldValue == null) continue;
 
-      GoPsiImplUtil.deleteExpressionFromAssignment(data.getAssignment(), expression);
+      GoPsiImplUtil.deleteExpressionFromAssignment(data.getAssignment(), anchor);
       addFieldDefinition(literalValue, expression.getIdentifier().getText(), fieldValue.getText());
     }
   }
 
   private static void addFieldDefinition(@NotNull GoLiteralValue literalValue, @NotNull String name, @NotNull String value) {
     Project project = literalValue.getProject();
-    PsiElement newField = GoElementFactory.createNamedStructField(project, name, value);
+    PsiElement newField = GoElementFactory.createLiteralValueElement(project, name, value);
     GoElement lastElement = getLastItem(literalValue.getElementList());
     if (lastElement == null) {
       literalValue.addAfter(newField, literalValue.getLbrace());

src/com/goide/psi/impl/GoElementFactory.java

@@ -256,8 +256,8 @@ public static GoType createType(@NotNull Project project, @NotNull String text)
     return PsiTreeUtil.findChildOfType(file, GoType.class);
   }
 
-  public static PsiElement createNamedStructField(@NotNull Project project, @NotNull String field, @NotNull String element) {
-    GoFile file = createFileFromText(project, "package a; var _ = struct { a string } { " + field + ": " + element + " }");
+  public static PsiElement createLiteralValueElement(@NotNull Project project, @NotNull String key, @NotNull String value) {
+    GoFile file = createFileFromText(project, "package a; var _ = struct { a string } { " + key + ": " + value + " }");
     return PsiTreeUtil.findChildOfType(file, GoElement.class);
   }
 

testData/intentions/move-to-struct-initialization/withParens-after.go

@@ -0,0 +1,11 @@
+package main
+
+type S struct {
+	string
+}
+
+func main() {
+	s := S{string: "bar"}
+	(_) = "foo"
+	print(s.string)
+}

testData/intentions/move-to-struct-initialization/withParens.go

@@ -0,0 +1,11 @@
+package main
+
+type S struct {
+	string
+}
+
+func main() {
+	s := S{}
+	(_), ((s.string)) = "foo", "bar"<caret>
+	print(s.string)
+}

tests/com/goide/quickfix/GoMoveToStructInitializationIntentionTest.java

@@ -42,19 +42,20 @@ protected String getBasePath() {
   public void testTwoSameStructuresAssignment()             { doTest(); }
   public void testJustAssignedVar()                         { doTest(); }
   public void testJustInitializedVar()                      { doTest(); }
-  public void testMultiReturnFunction()                     { doTestNoFix(); }
-  public void testWrongStruct()                             { doTestNoFix(); }
-  public void testExistingDeclaration()                     { doTestNoFix(); }
-  public void testNotExistingField()                        { doTestNoFix(); }
-  public void testJustAssignedVarWrongCaret()               { doTestNoFix(); }
-  public void testJustInitializedVarWrongCaret()            { doTestNoFix(); }
   public void testInvalidAssignment()                       { doTest(); }
   public void testExistingField()                           { doTest(); }
   public void testMultipleAssignmentsLeftmost()             { doTest(); }
   public void testMultipleAssignmentsRightmost()            { doTest(); }
   public void testMultipleAssignmentsMiddle()               { doTest(); }
   public void testMultipleFieldsPartlyAssigned()            { doTest(); }
-  public void testDuplicateFields()                         { doTest(); }
+  public void testWithParens()                              { doTest(); }
 
+  public void testDuplicateFields()                         { doTest(); }
+  public void testMultiReturnFunction()                     { doTestNoFix(); }
+  public void testWrongStruct()                             { doTestNoFix(); }
+  public void testExistingDeclaration()                     { doTestNoFix(); }
+  public void testNotExistingField()                        { doTestNoFix(); }
+  public void testJustAssignedVarWrongCaret()               { doTestNoFix(); }
+  public void testJustInitializedVarWrongCaret()            { doTestNoFix(); }
 }