text: remove unnecessary TextDocumentWillSaveEvent type

Author: zchee

text.go

@@ -90,28 +90,6 @@ func (t TextDocumentSaveReason) String() string {
 	}
 }
 
-// TextDocumentWillSaveEvent is.
-type TextDocumentWillSaveEvent struct {
-	// Document is the document that will be saved.
-	Document TextDocument `json:"document"`
-
-	// Reason is the reason why save was triggered.
-	Reason TextDocumentSaveReason `json:"reason"`
-}
-
-// TextDocumentContentChangeEvent an event describing a change to a text document. If range and rangeLength are omitted
-// the new text is considered to be the full content of the document.
-type TextDocumentContentChangeEvent struct {
-	// Range is the range of the document that changed.
-	Range *Range `json:"range,omitempty"`
-
-	// RangeLength is the length of the range that got replaced.
-	RangeLength float64 `json:"rangeLength,omitempty"`
-
-	// Text is the new text of the document.
-	Text string `json:"text"`
-}
-
 // TextDocumentChangeRegistrationOptions describe options to be used when registering for text document change events.
 type TextDocumentChangeRegistrationOptions struct {
 	TextDocumentRegistrationOptions
@@ -140,6 +118,19 @@ type DidSaveTextDocumentParams struct {
 	TextDocument TextDocumentIdentifier `json:"textDocument"`
 }
 
+// TextDocumentContentChangeEvent an event describing a change to a text document. If range and rangeLength are omitted
+// the new text is considered to be the full content of the document.
+type TextDocumentContentChangeEvent struct {
+	// Range is the range of the document that changed.
+	Range *Range `json:"range,omitempty"`
+
+	// RangeLength is the length of the range that got replaced.
+	RangeLength float64 `json:"rangeLength,omitempty"`
+
+	// Text is the new text of the document.
+	Text string `json:"text"`
+}
+
 // TextDocumentSaveRegistrationOptions TextDocumentSave Registration options.
 type TextDocumentSaveRegistrationOptions struct {
 	TextDocumentRegistrationOptions

text_gojay.go

@@ -151,35 +151,6 @@ var (
 	_ gojay.UnmarshalerJSONObject = (*TextDocumentChangeEvent)(nil)
 )
 
-// MarshalJSONObject implements gojay.MarshalerJSONObject.
-func (v *TextDocumentWillSaveEvent) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.ObjectKey(keyDocument, &v.Document)
-	enc.Float64Key(keyReason, float64(v.Reason))
-}
-
-// IsNil returns wether the structure is nil value or not.
-func (v *TextDocumentWillSaveEvent) IsNil() bool { return v == nil }
-
-// UnmarshalJSONObject implements gojay's UnmarshalerJSONObject.
-func (v *TextDocumentWillSaveEvent) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
-	switch k {
-	case keyDocument:
-		return dec.Object(&v.Document)
-	case keyReason:
-		return dec.Float64((*float64)(&v.Reason))
-	}
-	return nil
-}
-
-// NKeys returns the number of keys to unmarshal.
-func (v *TextDocumentWillSaveEvent) NKeys() int { return 2 }
-
-// compile time check whether the TextDocumentWillSaveEvent implements a gojay.MarshalerJSONObject and gojay.UnmarshalerJSONObject interfaces.
-var (
-	_ gojay.MarshalerJSONObject   = (*TextDocumentWillSaveEvent)(nil)
-	_ gojay.UnmarshalerJSONObject = (*TextDocumentWillSaveEvent)(nil)
-)
-
 // MarshalJSONObject implements gojay.MarshalerJSONObject.
 func (v *TextDocumentContentChangeEvent) MarshalJSONObject(enc *gojay.Encoder) {
 	enc.ObjectKeyOmitEmpty(keyRange, v.Range)

text_gojay_test.go

@@ -28,10 +28,6 @@ func TestTextDocumentChangeEvent(t *testing.T) {
 	testTextDocumentChangeEvent(t, gojay.Marshal, gojay.Unsafe.Unmarshal)
 }
 
-func TestTextDocumentWillSaveEvent(t *testing.T) {
-	testTextDocumentWillSaveEvent(t, gojay.Marshal, gojay.Unsafe.Unmarshal)
-}
-
 func TestTextDocumentContentChangeEvent(t *testing.T) {
 	testTextDocumentContentChangeEvent(t, gojay.Marshal, gojay.Unsafe.Unmarshal)
 }

text_json_test.go

@@ -27,10 +27,6 @@ func TestTextDocumentChangeEvent(t *testing.T) {
 	testTextDocumentChangeEvent(t, json.Marshal, json.Unmarshal)
 }
 
-func TestTextDocumentWillSaveEvent(t *testing.T) {
-	testTextDocumentWillSaveEvent(t, json.Marshal, json.Unmarshal)
-}
-
 func TestTextDocumentContentChangeEvent(t *testing.T) {
 	testTextDocumentContentChangeEvent(t, json.Marshal, json.Unmarshal)
 }

text_test.go

@@ -445,102 +445,6 @@ func TestTextDocumentSaveReason_String(t *testing.T) {
 	}
 }
 
-func testTextDocumentWillSaveEvent(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc) {
-	const (
-		want        = `{"document":{"uri":"file:///path/to/test.go","languageId":"go","version":1,"lineCount":50},"reason":2}`
-		wantInvalid = `{"document":{"uri":"file:///path/to/invalid.go","languageId":"typescript","version":2,"lineCount":100},"reason":1}`
-	)
-	wantType := TextDocumentWillSaveEvent{
-		Document: TextDocument{
-			URI:        uri.File("/path/to/test.go"),
-			LanguageID: "go",
-			Version:    1,
-			LineCount:  50,
-		},
-		Reason: AfterDelay,
-	}
-
-	t.Run("Marshal", func(t *testing.T) {
-		tests := []struct {
-			name           string
-			field          TextDocumentWillSaveEvent
-			want           string
-			wantMarshalErr bool
-			wantErr        bool
-		}{
-			{
-				name:           "Valid",
-				field:          wantType,
-				want:           want,
-				wantMarshalErr: false,
-				wantErr:        false,
-			},
-			{
-				name:           "Invalid",
-				field:          wantType,
-				want:           wantInvalid,
-				wantMarshalErr: false,
-				wantErr:        true,
-			},
-		}
-		for _, tt := range tests {
-			tt := tt
-			t.Run(tt.name, func(t *testing.T) {
-				t.Parallel()
-
-				got, err := marshal(&tt.field)
-				if (err != nil) != tt.wantMarshalErr {
-					t.Fatal(err)
-				}
-
-				if diff := cmp.Diff(string(got), tt.want); (diff != "") != tt.wantErr {
-					t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
-				}
-			})
-		}
-	})
-
-	t.Run("Unmarshal", func(t *testing.T) {
-		tests := []struct {
-			name             string
-			field            string
-			want             TextDocumentWillSaveEvent
-			wantUnmarshalErr bool
-			wantErr          bool
-		}{
-			{
-				name:             "Valid",
-				field:            want,
-				want:             wantType,
-				wantUnmarshalErr: false,
-				wantErr:          false,
-			},
-			{
-				name:             "Invalid",
-				field:            wantInvalid,
-				want:             wantType,
-				wantUnmarshalErr: false,
-				wantErr:          true,
-			},
-		}
-		for _, tt := range tests {
-			tt := tt
-			t.Run(tt.name, func(t *testing.T) {
-				t.Parallel()
-
-				var got TextDocumentWillSaveEvent
-				if err := unmarshal([]byte(tt.field), &got); (err != nil) != tt.wantUnmarshalErr {
-					t.Fatal(err)
-				}
-
-				if diff := cmp.Diff(got, tt.want); (diff != "") != tt.wantErr {
-					t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
-				}
-			})
-		}
-	})
-}
-
 func testTextDocumentContentChangeEvent(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc) {
 	const (
 		want        = `{"range":{"start":{"line":25,"character":1},"end":{"line":25,"character":3}},"rangeLength":2,"text":"testText"}`