Merge pull request #40 from matsuri-tech/feat/gofumpt

feat: gofumpt -l -w .

Author: iori-ikeda

dateSpan.go

@@ -1,8 +1,9 @@
 package mdate
 
 import (
-	"github.com/matsuri-tech/common-error-go"
 	"sort"
+
+	"github.com/matsuri-tech/common-error-go"
 )
 
 type DateSpan struct {
@@ -49,9 +50,9 @@ func NoOverlapToClamp() merrors.CommonError {
 }
 
 func (s DateSpan) GetDateList() Dates {
-	var dateList = Dates{}
+	dateList := Dates{}
 	ey, em, ed := s.EndDate.Date()
-	var currentDate = s.StartDate
+	currentDate := s.StartDate
 	for {
 		y, m, d := currentDate.Date()
 		dateList = append(dateList, currentDate)
@@ -95,7 +96,7 @@ func (s DateSpans) Less(i, j int) bool {
 // 重複除去してマージ
 func (s DateSpans) Merge() DateSpans {
 	result := DateSpans{}
-	//StartDate順にソート
+	// StartDate順にソート
 	sort.Sort(s)
 	for i, span := range s {
 		if i == 0 {
@@ -130,7 +131,7 @@ func (s DateSpansSlice) Merge() DateSpans {
 
 func (s DateSpan) OverlappingYearMonth() YearMonths {
 	var result YearMonths
-	var currentYearMonth = NewYearMonth(s.StartDate.Year(), s.StartDate.Month())
+	currentYearMonth := NewYearMonth(s.StartDate.Year(), s.StartDate.Month())
 	for {
 		if currentYearMonth.IsAfter(s.EndDate.YearMonth()) {
 			break

dateSpan_test.go

@@ -2,9 +2,10 @@ package mdate
 
 import (
 	"fmt"
-	merrors "github.com/matsuri-tech/common-error-go"
 	"reflect"
 	"testing"
+
+	merrors "github.com/matsuri-tech/common-error-go"
 )
 
 func TestDateSpan_IsContinuous(t *testing.T) {
@@ -47,7 +48,6 @@ func TestDateSpan_IsContinuous(t *testing.T) {
 			t.Error(i, tt)
 		}
 	}
-
 }
 
 func TestDateSpan_IsOverlapping(t *testing.T) {
@@ -99,7 +99,6 @@ func TestDateSpan_IsOverlapping(t *testing.T) {
 }
 
 func TestDateSpan_IncludesDate(t *testing.T) {
-
 	span := MustDateSpan(NewDate(2018, 11, 12), NewDate(2018, 11, 15))
 
 	tests := []struct {
@@ -125,7 +124,6 @@ func TestDateSpan_IncludesDate(t *testing.T) {
 			t.Error(i, tt)
 		}
 	}
-
 }
 
 func TestMerge(t *testing.T) {
@@ -163,7 +161,6 @@ func TestDateSpan_GetDateList(t *testing.T) {
 }
 
 func TestDateSpan_OverlappingYearMonth(t *testing.T) {
-
 	type in struct {
 		okimochi string
 		span     DateSpan

date_test.go

@@ -194,7 +194,6 @@ func TestDate_JapanFiscalYear(t *testing.T) {
 }
 
 func TestDate_MarshalJSON(t *testing.T) {
-
 	type Sample struct {
 		D Date `json:"d"`
 	}

year.go

@@ -1,6 +1,6 @@
 package mdate
 
-//日本の年度を表すデータ型
+// 日本の年度を表すデータ型
 type JapanFiscalYear int
 
 type Year int

yearMonth.go

@@ -2,9 +2,10 @@ package mdate
 
 import (
 	"fmt"
-	merrors "github.com/matsuri-tech/common-error-go"
 	"strconv"
 	"time"
+
+	merrors "github.com/matsuri-tech/common-error-go"
 )
 
 type Month int

yearMonth_test.go

@@ -1,13 +1,13 @@
 package mdate
 
 import (
+	"testing"
+
 	"github.com/matsuri-tech/common-error-go"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestYearMonth_NextMonth(t *testing.T) {
-
 	tests := []struct {
 		in   YearMonth
 		want YearMonth
@@ -111,7 +111,8 @@ func TestYearMonth_IsAfter(t *testing.T) {
 				ym2: YearMonth{
 					Year:  2020,
 					Month: 2,
-				}},
+				},
+			},
 			want: false,
 		},
 		{
@@ -123,7 +124,8 @@ func TestYearMonth_IsAfter(t *testing.T) {
 				ym2: YearMonth{
 					Year:  2020,
 					Month: 2,
-				}},
+				},
+			},
 			want: false,
 		},
 		{
@@ -135,7 +137,8 @@ func TestYearMonth_IsAfter(t *testing.T) {
 				ym2: YearMonth{
 					Year:  2019,
 					Month: 2,
-				}},
+				},
+			},
 			want: true,
 		},
 		{
@@ -147,7 +150,8 @@ func TestYearMonth_IsAfter(t *testing.T) {
 				ym2: YearMonth{
 					Year:  2019,
 					Month: 12,
-				}},
+				},
+			},
 			want: false,
 		},
 	}
@@ -247,7 +251,6 @@ func TestYearMonth_EndDate(t *testing.T) {
 }
 
 func TestMonth_String(t *testing.T) {
-
 	tests := []struct {
 		in   YearMonth
 		want string