Merge pull request #7 from fuji8/fix/issue-3

fix edit range
fuji8 · Sep 11, 2022 · a9910bd · a9910bd
2 parents 0ba20fa + 8d36b10
commit a9910bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/gotypeconverter-langserver/gotypeconverter.go b/gotypeconverter-langserver/gotypeconverter.go
@@ -64,7 +64,7 @@ func SuggestedFix(path string, line, character int) (string, *protocol.Range) {
 	}
 
 	fn := ana.InitFuncMaker(pkg.Types)
-	fn.MakeFunc(ana.InitType(dstType, "src"), ana.InitType(srcType, ""))
+	fn.MakeFunc(ana.InitType(dstType, ""), ana.InitType(srcType, ""))
 
 	buf := &bytes.Buffer{}
 	buf.Write(fn.WriteBytes())

diff --git a/gotypeconverter-langserver/main.go b/gotypeconverter-langserver/main.go
@@ -31,11 +31,8 @@ func main() {
 		SetTrace:    setTrace,
 		TextDocumentCodeAction: func(context *glsp.Context, params *protocol.CodeActionParams) (interface{}, error) {
 			if len(params.Context.Only) >= 1 && params.Context.Only[0] == "refactor" {
-				log.Info("refactor")
 				path := params.TextDocument.URI[7:]
 				newText, rng := SuggestedFix(path, int(params.Range.Start.Line), int(params.Range.Start.Character))
-				// fmt.Println(path)
-				// newText := "hoge"
 				if newText == "" {
 					return nil, nil
 				}
@@ -52,7 +49,7 @@ func main() {
 											Line: rng.Start.Line - 1,
 										},
 										End: protocol.Position{
-											Line:      rng.End.Line,
+											Line:      rng.End.Line - 1,
 											Character: 10000000,
 										},
 									},
@@ -62,7 +59,6 @@ func main() {
 						},
 					},
 				}
-				log.Info("soushin")
 				return []interface{}{res}, nil
 			}
 			return nil, nil