Skip to content

Commit abd9f8f

Browse files
zcheezchee
authored
all: change ProgressToken type to interface{} on gojay (#19)
1 parent aa2261d commit abd9f8f

File tree

7 files changed

+149
-185
lines changed

7 files changed

+149
-185
lines changed

‎general_test.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package protocol
66

77
import (
8+
"fmt"
89
"path/filepath"
910
"testing"
1011

@@ -321,7 +322,7 @@ func testInitializeParams(t *testing.T, marshal marshalFunc, unmarshal unmarshal
321322
}
322323

323324
if token := got.WorkDoneToken; token != nil {
324-
if diff := cmp.Diff(token.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
325+
if diff := cmp.Diff(fmt.Sprint(token), wantWorkDoneToken); (diff != "") != tt.wantErr {
325326
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
326327
}
327328
}
@@ -998,13 +999,13 @@ func testReferencesParams(t *testing.T, marshal marshalFunc, unmarshal unmarshal
998999
}
9991000

10001001
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
1001-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
1002+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
10021003
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
10031004
}
10041005
}
10051006

10061007
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
1007-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
1008+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
10081009
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
10091010
}
10101011
}
@@ -1359,13 +1360,13 @@ func testDocumentHighlightParams(t *testing.T, marshal marshalFunc, unmarshal un
13591360
}
13601361

13611362
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
1362-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
1363+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
13631364
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
13641365
}
13651366
}
13661367

13671368
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
1368-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
1369+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
13691370
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
13701371
}
13711372
}
@@ -2705,13 +2706,13 @@ func testDeclarationParams(t *testing.T, marshal marshalFunc, unmarshal unmarsha
27052706
}
27062707

27072708
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
2708-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
2709+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
27092710
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
27102711
}
27112712
}
27122713

27132714
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
2714-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
2715+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
27152716
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
27162717
}
27172718
}
@@ -3067,13 +3068,13 @@ func testDefinitionParams(t *testing.T, marshal marshalFunc, unmarshal unmarshal
30673068
}
30683069

30693070
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
3070-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
3071+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
30713072
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
30723073
}
30733074
}
30743075

30753076
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
3076-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
3077+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
30773078
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
30783079
}
30793080
}
@@ -3567,13 +3568,13 @@ func testTypeDefinitionParams(t *testing.T, marshal marshalFunc, unmarshal unmar
35673568
}
35683569

35693570
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
3570-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
3571+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
35713572
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
35723573
}
35733574
}
35743575

35753576
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
3576-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
3577+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
35773578
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
35783579
}
35793580
}
@@ -3816,13 +3817,13 @@ func testImplementationParams(t *testing.T, marshal marshalFunc, unmarshal unmar
38163817
}
38173818

38183819
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
3819-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
3820+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
38203821
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
38213822
}
38223823
}
38233824

38243825
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
3825-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
3826+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
38263827
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
38273828
}
38283829
}

‎language_test.go

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package protocol
66

77
import (
8+
"fmt"
89
"strings"
910
"testing"
1011

@@ -123,13 +124,13 @@ func testCompletionParams(t *testing.T, marshal marshalFunc, unmarshal unmarshal
123124
}
124125

125126
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
126-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
127+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
127128
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
128129
}
129130
}
130131

131132
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
132-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
133+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
133134
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
134135
}
135136
}
@@ -992,7 +993,7 @@ func testHoverParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc)
992993
}
993994

994995
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
995-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
996+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
996997
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
997998
}
998999
}
@@ -1258,7 +1259,7 @@ func testSignatureHelpParams(t *testing.T, marshal marshalFunc, unmarshal unmars
12581259
}
12591260

12601261
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
1261-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
1262+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
12621263
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
12631264
}
12641265
}
@@ -2141,13 +2142,13 @@ func testDocumentSymbolParams(t *testing.T, marshal marshalFunc, unmarshal unmar
21412142
}
21422143

21432144
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
2144-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
2145+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
21452146
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
21462147
}
21472148
}
21482149

21492150
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
2150-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
2151+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
21512152
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
21522153
}
21532154
}
@@ -2740,13 +2741,13 @@ func testCodeActionParams(t *testing.T, marshal marshalFunc, unmarshal unmarshal
27402741
}
27412742

27422743
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
2743-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
2744+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
27442745
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
27452746
}
27462747
}
27472748

27482749
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
2749-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
2750+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
27502751
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
27512752
}
27522753
}
@@ -3327,13 +3328,13 @@ func testCodeLensParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFu
33273328
}
33283329

33293330
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
3330-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
3331+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
33313332
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
33323333
}
33333334
}
33343335

33353336
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
3336-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
3337+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
33373338
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
33383339
}
33393340
}
@@ -3709,13 +3710,13 @@ func testDocumentLinkParams(t *testing.T, marshal marshalFunc, unmarshal unmarsh
37093710
}
37103711

37113712
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
3712-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
3713+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
37133714
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
37143715
}
37153716
}
37163717

37173718
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
3718-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
3719+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
37193720
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
37203721
}
37213722
}
@@ -3952,13 +3953,13 @@ func testDocumentColorParams(t *testing.T, marshal marshalFunc, unmarshal unmars
39523953
}
39533954

39543955
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
3955-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
3956+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
39563957
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
39573958
}
39583959
}
39593960

39603961
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
3961-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
3962+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
39623963
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
39633964
}
39643965
}
@@ -4280,13 +4281,13 @@ func testColorPresentationParams(t *testing.T, marshal marshalFunc, unmarshal un
42804281
}
42814282

42824283
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
4283-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
4284+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
42844285
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
42854286
}
42864287
}
42874288

42884289
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
4289-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
4290+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
42904291
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
42914292
}
42924293
}
@@ -4531,7 +4532,7 @@ func testDocumentFormattingParams(t *testing.T, marshal marshalFunc, unmarshal u
45314532
}
45324533

45334534
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
4534-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
4535+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
45354536
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
45364537
}
45374538
}
@@ -4744,7 +4745,7 @@ func testDocumentRangeFormattingParams(t *testing.T, marshal marshalFunc, unmars
47444745
}
47454746

47464747
if workDoneToken := got.WorkDoneToken; workDoneToken != nil {
4747-
if diff := cmp.Diff(workDoneToken.String(), wantWorkDoneToken); (diff != "") != tt.wantErr {
4748+
if diff := cmp.Diff(fmt.Sprint(workDoneToken), wantWorkDoneToken); (diff != "") != tt.wantErr {
47484749
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
47494750
}
47504751
}
@@ -5062,7 +5063,7 @@ func testRenameParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc
50625063
}
50635064

50645065
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
5065-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
5066+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
50665067
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
50675068
}
50685069
}
@@ -5406,7 +5407,7 @@ func testFoldingRangeParams(t *testing.T, marshal marshalFunc, unmarshal unmarsh
54065407
}
54075408

54085409
if partialResultToken := got.PartialResultToken; partialResultToken != nil {
5409-
if diff := cmp.Diff(partialResultToken.String(), wantPartialResultToken); (diff != "") != tt.wantErr {
5410+
if diff := cmp.Diff(fmt.Sprint(partialResultToken), wantPartialResultToken); (diff != "") != tt.wantErr {
54105411
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
54115412
}
54125413
}

‎progress.go

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -4,78 +4,6 @@
44

55
package protocol
66

7-
import (
8-
"encoding/json"
9-
"fmt"
10-
)
11-
12-
// ProgressToken is the progress token provided by the client or server.
13-
//
14-
// @since 3.15.0.
15-
type ProgressToken struct {
16-
name string
17-
number int64
18-
}
19-
20-
// compile time check whether the ProgressToken implements a fmt.Formatter, fmt.Stringer, json.Marshaler and json.Unmarshaler interfaces.
21-
var (
22-
_ fmt.Formatter = (*ProgressToken)(nil)
23-
_ fmt.Stringer = (*ProgressToken)(nil)
24-
_ json.Marshaler = (*ProgressToken)(nil)
25-
_ json.Unmarshaler = (*ProgressToken)(nil)
26-
)
27-
28-
// NewProgressToken returns a new ProgressToken.
29-
func NewProgressToken(s string) *ProgressToken {
30-
return &ProgressToken{name: s}
31-
}
32-
33-
// NewNumberProgressToken returns a new number ProgressToken.
34-
func NewNumberProgressToken(n int64) *ProgressToken {
35-
return &ProgressToken{number: n}
36-
}
37-
38-
// Format writes the ProgressToken to the formatter.
39-
//
40-
// If the rune is q the representation is non ambiguous,
41-
// string forms are quoted.
42-
func (v ProgressToken) Format(f fmt.State, r rune) {
43-
const numF = `%d`
44-
strF := `%s`
45-
if r == 'q' {
46-
strF = `%q`
47-
}
48-
49-
switch {
50-
case v.name != "":
51-
fmt.Fprintf(f, strF, v.name)
52-
default:
53-
fmt.Fprintf(f, numF, v.number)
54-
}
55-
}
56-
57-
// String returns a string representation of the type.
58-
func (v ProgressToken) String() string {
59-
return fmt.Sprint(v)
60-
}
61-
62-
// MarshalJSON implements json.Marshaler.
63-
func (v *ProgressToken) MarshalJSON() ([]byte, error) {
64-
if v.name != "" {
65-
return json.Marshal(v.name)
66-
}
67-
return json.Marshal(v.number)
68-
}
69-
70-
// UnmarshalJSON implements json.Unmarshaler.
71-
func (v *ProgressToken) UnmarshalJSON(data []byte) error {
72-
*v = ProgressToken{}
73-
if err := json.Unmarshal(data, &v.number); err == nil {
74-
return nil
75-
}
76-
return json.Unmarshal(data, &v.name)
77-
}
78-
797
// ProgressParams params of Progress netification.
808
//
819
// @since 3.15.0.

0 commit comments

Comments
 (0)