Move to struct declaration: handle struct declaration via _var_ case

Replace single struct declaration with short var declaration, or add to existing struct literal in statement

Author: wbars

src/com/goide/intentions/GoMoveToStructInitializationIntention.java

@@ -266,4 +266,10 @@ public static GoTypeDeclaration createTypeDeclaration(@NotNull Project project,
     GoFile file = createFileFromText(project, "package a; type " + name + " " + type.getText());
     return PsiTreeUtil.findChildOfType(file, GoTypeDeclaration.class);
   }
+
+  @NotNull
+  public static GoCompositeLit createCompositeLit(@NotNull Project project, @NotNull GoType type) {
+    GoFile file = createFileFromText(project, "package a; var _ = " + type.getText() + "{}");
+    return PsiTreeUtil.findChildOfType(file, GoCompositeLit.class);
+  }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -50,16 +50,23 @@ protected String getBasePath() {
   public void testMultipleFieldsPartlyAssigned()            { doTest(); }
   public void testWithParens()                              { doTest(); }
   public void testFieldExtractedFromParens()                { doTest(); }
+  public void testStructDeclaration()                       { doTest(); }
+  public void testParensStructDeclaration()                 { doTest(); }
+  public void testStructDeclarationWithEmptyInit()          { doTest(); }
+  public void testStructDeclarationWithNonEmptyInit()       { doTest(); }
 
   public void testDuplicateFields()                         { doTest(); }
   public void testMultiReturnFunction()                     { doTestNoFix(); }
   public void testWrongStruct()                             { doTestNoFix(); }
+  public void testNotStructDeclaration()                    { doTestNoFix(); }
   public void testExistingDeclaration()                     { doTestNoFix(); }
   public void testNotExistingField()                        { doTestNoFix(); }
   public void testJustAssignedVarWrongCaret()               { doTestNoFix(); }
   public void testJustAssignedVarWrongCaretWithParens()     { doTestNoFix(); }
   public void testJustInitializedVarWrongCaret()            { doTestNoFix(); }
   public void testJustAssignedVarBothParens()               { doTestNoFix(); }
   public void testJustAssignedFieldParens()                 { doTestNoFix(); }
+  public void testStructDeclarationMultipleExpressions()    { doTestNoFix(); }
+  public void testStructDeclarationWrongQualifier()         { doTestNoFix(); }
 }