Skip to content

Commit 45c9c76

Browse files
committed
all: add MessageType prefix to MessageType enum
1 parent 6c9171e commit 45c9c76

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

window.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@ type ShowMessageParams struct {
1919
type MessageType float64
2020

2121
const (
22-
// Error an error message.
23-
Error MessageType = 1
24-
// Warning a warning message.
25-
Warning MessageType = 2
26-
// Info an information message.
27-
Info MessageType = 3
28-
// Log a log message.
29-
Log MessageType = 4
22+
// MessageTypeError an error message.
23+
MessageTypeError MessageType = 1
24+
// MessageTypeWarning a warning message.
25+
MessageTypeWarning MessageType = 2
26+
// MessageTypeInfo an information message.
27+
MessageTypeInfo MessageType = 3
28+
// MessageTypeLog a log message.
29+
MessageTypeLog MessageType = 4
3030
)
3131

3232
// String implements fmt.Stringer.
3333
func (m MessageType) String() string {
3434
switch m {
35-
case Error:
35+
case MessageTypeError:
3636
return "error"
37-
case Warning:
37+
case MessageTypeWarning:
3838
return "warning"
39-
case Info:
39+
case MessageTypeInfo:
4040
return "info"
41-
case Log:
41+
case MessageTypeLog:
4242
return "log"
4343
default:
4444
return strconv.FormatFloat(float64(m), 'f', -10, 64)
@@ -52,10 +52,10 @@ func (m MessageType) Enabled(level MessageType) bool {
5252

5353
// messageTypeMap map of MessageTypes.
5454
var messageTypeMap = map[string]MessageType{
55-
"error": Error,
56-
"warning": Warning,
57-
"info": Info,
58-
"log": Log,
55+
"error": MessageTypeError,
56+
"warning": MessageTypeWarning,
57+
"info": MessageTypeInfo,
58+
"log": MessageTypeLog,
5959
}
6060

6161
// ToMessageType converts level to the MessageType.

window_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func testShowMessageParams(t *testing.T, marshal marshalFunc, unmarshal unmarsha
1919
)
2020
wantType := ShowMessageParams{
2121
Message: "error message",
22-
Type: Error,
22+
Type: MessageTypeError,
2323
}
2424
wantTypeUnkonwn := ShowMessageParams{
2525
Message: "unknown message",
@@ -125,7 +125,7 @@ func testShowMessageRequestParams(t *testing.T, marshal marshalFunc, unmarshal u
125125
},
126126
},
127127
Message: "error message",
128-
Type: Error,
128+
Type: MessageTypeError,
129129
}
130130
wantTypeUnkonwn := ShowMessageRequestParams{
131131
Actions: []MessageActionItem{
@@ -330,7 +330,7 @@ func testLogMessageParams(t *testing.T, marshal marshalFunc, unmarshal unmarshal
330330
)
331331
wantType := LogMessageParams{
332332
Message: "error message",
333-
Type: Error,
333+
Type: MessageTypeError,
334334
}
335335
wantTypeUnknown := LogMessageParams{
336336
Message: "unknown message",
@@ -656,22 +656,22 @@ func TestMessageType_String(t *testing.T) {
656656
}{
657657
{
658658
name: "Error",
659-
m: Error,
659+
m: MessageTypeError,
660660
want: "error",
661661
},
662662
{
663663
name: "Warning",
664-
m: Warning,
664+
m: MessageTypeWarning,
665665
want: "warning",
666666
},
667667
{
668668
name: "Info",
669-
m: Info,
669+
m: MessageTypeInfo,
670670
want: "info",
671671
},
672672
{
673673
name: "Log",
674-
m: Log,
674+
m: MessageTypeLog,
675675
want: "log",
676676
},
677677
{
@@ -701,19 +701,19 @@ func TestMessageType_Enabled(t *testing.T) {
701701
}{
702702
{
703703
name: "ErrorError",
704-
m: Error,
705-
level: Error,
704+
m: MessageTypeError,
705+
level: MessageTypeError,
706706
want: true,
707707
},
708708
{
709709
name: "ErrorInfo",
710-
m: Error,
711-
level: Info,
710+
m: MessageTypeError,
711+
level: MessageTypeInfo,
712712
want: false,
713713
},
714714
{
715715
name: "ErrorUnknown",
716-
m: Error,
716+
m: MessageTypeError,
717717
level: MessageType(0),
718718
want: false,
719719
},
@@ -739,22 +739,22 @@ func TestToMessageType(t *testing.T) {
739739
{
740740
name: "Error",
741741
level: "error",
742-
want: Error,
742+
want: MessageTypeError,
743743
},
744744
{
745745
name: "Warning",
746746
level: "warning",
747-
want: Warning,
747+
want: MessageTypeWarning,
748748
},
749749
{
750750
name: "Info",
751751
level: "info",
752-
want: Info,
752+
want: MessageTypeInfo,
753753
},
754754
{
755755
name: "Log",
756756
level: "log",
757-
want: Log,
757+
want: MessageTypeLog,
758758
},
759759
{
760760
name: "Unknown",

0 commit comments

Comments
 (0)