Skip to content

Commit b0adf03

Browse files
zcheezchee
committed
all: add SymbolKind prefix to SymbolKind enum
1 parent 3a82b37 commit b0adf03

File tree

4 files changed

+144
-144
lines changed

4 files changed

+144
-144
lines changed

‎callhierarchy_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ func testCallHierarchyItem(t *testing.T, marshal marshalFunc, unmarshal unmarsha
523523
)
524524
wantType := CallHierarchyItem{
525525
Name: "testName",
526-
Kind: FileSymbol,
526+
Kind: SymbolKindFile,
527527
Tags: []SymbolTag{
528528
SymbolTagDeprecated,
529529
},
@@ -553,7 +553,7 @@ func testCallHierarchyItem(t *testing.T, marshal marshalFunc, unmarshal unmarsha
553553
}
554554
wantTypeNil := CallHierarchyItem{
555555
Name: "testName",
556-
Kind: FileSymbol,
556+
Kind: SymbolKindFile,
557557
URI: uri.File("/path/to/basic.go"),
558558
Range: Range{
559559
Start: Position{
@@ -697,7 +697,7 @@ func testCallHierarchyIncomingCallsParams(t *testing.T, marshal marshalFunc, unm
697697
},
698698
Item: CallHierarchyItem{
699699
Name: "testName",
700-
Kind: FileSymbol,
700+
Kind: SymbolKindFile,
701701
Tags: []SymbolTag{
702702
SymbolTagDeprecated,
703703
},
@@ -729,7 +729,7 @@ func testCallHierarchyIncomingCallsParams(t *testing.T, marshal marshalFunc, unm
729729
wantTypeNil := CallHierarchyIncomingCallsParams{
730730
Item: CallHierarchyItem{
731731
Name: "testName",
732-
Kind: FileSymbol,
732+
Kind: SymbolKindFile,
733733
URI: uri.File("/path/to/basic.go"),
734734
Range: Range{
735735
Start: Position{
@@ -875,7 +875,7 @@ func testCallHierarchyIncomingCall(t *testing.T, marshal marshalFunc, unmarshal
875875
wantType := CallHierarchyIncomingCall{
876876
From: CallHierarchyItem{
877877
Name: "testName",
878-
Kind: FileSymbol,
878+
Kind: SymbolKindFile,
879879
Tags: []SymbolTag{
880880
SymbolTagDeprecated,
881881
},
@@ -1023,7 +1023,7 @@ func testCallHierarchyOutgoingCallsParams(t *testing.T, marshal marshalFunc, unm
10231023
},
10241024
Item: CallHierarchyItem{
10251025
Name: "testName",
1026-
Kind: FileSymbol,
1026+
Kind: SymbolKindFile,
10271027
Tags: []SymbolTag{
10281028
SymbolTagDeprecated,
10291029
},
@@ -1055,7 +1055,7 @@ func testCallHierarchyOutgoingCallsParams(t *testing.T, marshal marshalFunc, unm
10551055
wantTypeNil := CallHierarchyOutgoingCallsParams{
10561056
Item: CallHierarchyItem{
10571057
Name: "testName",
1058-
Kind: FileSymbol,
1058+
Kind: SymbolKindFile,
10591059
URI: uri.File("/path/to/basic.go"),
10601060
Range: Range{
10611061
Start: Position{
@@ -1201,7 +1201,7 @@ func testCallHierarchyOutgoingCall(t *testing.T, marshal marshalFunc, unmarshal
12011201
wantType := CallHierarchyOutgoingCall{
12021202
To: CallHierarchyItem{
12031203
Name: "testName",
1204-
Kind: FileSymbol,
1204+
Kind: SymbolKindFile,
12051205
Tags: []SymbolTag{
12061206
SymbolTagDeprecated,
12071207
},

‎general_test.go

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -931,12 +931,12 @@ func testWorkspaceClientCapabilities(t *testing.T, marshal marshalFunc, unmarsha
931931
DynamicRegistration: true,
932932
SymbolKind: &WorkspaceClientCapabilitiesSymbolKind{
933933
ValueSet: []SymbolKind{
934-
FileSymbol,
935-
ModuleSymbol,
936-
NamespaceSymbol,
937-
PackageSymbol,
938-
ClassSymbol,
939-
MethodSymbol,
934+
SymbolKindFile,
935+
SymbolKindModule,
936+
SymbolKindNamespace,
937+
SymbolKindPackage,
938+
SymbolKindClass,
939+
SymbolKindMethod,
940940
},
941941
},
942942
},
@@ -2204,12 +2204,12 @@ func testTextDocumentClientCapabilitiesDocumentSymbol(t *testing.T, marshal mars
22042204
DynamicRegistration: true,
22052205
SymbolKind: &WorkspaceClientCapabilitiesSymbolKind{
22062206
ValueSet: []SymbolKind{
2207-
FileSymbol,
2208-
ModuleSymbol,
2209-
NamespaceSymbol,
2210-
PackageSymbol,
2211-
ClassSymbol,
2212-
MethodSymbol,
2207+
SymbolKindFile,
2208+
SymbolKindModule,
2209+
SymbolKindNamespace,
2210+
SymbolKindPackage,
2211+
SymbolKindClass,
2212+
SymbolKindMethod,
22132213
},
22142214
},
22152215
HierarchicalDocumentSymbolSupport: true,
@@ -6076,12 +6076,12 @@ func testTextDocumentClientCapabilities(t *testing.T, marshal marshalFunc, unmar
60766076
DynamicRegistration: true,
60776077
SymbolKind: &WorkspaceClientCapabilitiesSymbolKind{
60786078
ValueSet: []SymbolKind{
6079-
FileSymbol,
6080-
ModuleSymbol,
6081-
NamespaceSymbol,
6082-
PackageSymbol,
6083-
ClassSymbol,
6084-
MethodSymbol,
6079+
SymbolKindFile,
6080+
SymbolKindModule,
6081+
SymbolKindNamespace,
6082+
SymbolKindPackage,
6083+
SymbolKindClass,
6084+
SymbolKindMethod,
60856085
},
60866086
},
60876087
HierarchicalDocumentSymbolSupport: true,
@@ -6285,12 +6285,12 @@ func testClientCapabilities(t *testing.T, marshal marshalFunc, unmarshal unmarsh
62856285
DynamicRegistration: true,
62866286
SymbolKind: &WorkspaceClientCapabilitiesSymbolKind{
62876287
ValueSet: []SymbolKind{
6288-
FileSymbol,
6289-
ModuleSymbol,
6290-
NamespaceSymbol,
6291-
PackageSymbol,
6292-
ClassSymbol,
6293-
MethodSymbol,
6288+
SymbolKindFile,
6289+
SymbolKindModule,
6290+
SymbolKindNamespace,
6291+
SymbolKindPackage,
6292+
SymbolKindClass,
6293+
SymbolKindMethod,
62946294
},
62956295
},
62966296
},
@@ -6350,12 +6350,12 @@ func testClientCapabilities(t *testing.T, marshal marshalFunc, unmarshal unmarsh
63506350
DynamicRegistration: true,
63516351
SymbolKind: &WorkspaceClientCapabilitiesSymbolKind{
63526352
ValueSet: []SymbolKind{
6353-
FileSymbol,
6354-
ModuleSymbol,
6355-
NamespaceSymbol,
6356-
PackageSymbol,
6357-
ClassSymbol,
6358-
MethodSymbol,
6353+
SymbolKindFile,
6354+
SymbolKindModule,
6355+
SymbolKindNamespace,
6356+
SymbolKindPackage,
6357+
SymbolKindClass,
6358+
SymbolKindMethod,
63596359
},
63606360
},
63616361
HierarchicalDocumentSymbolSupport: true,

‎language.go

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -670,114 +670,114 @@ type DocumentSymbolParams struct {
670670
type SymbolKind float64
671671

672672
const (
673-
// FileSymbol symbol of file.
674-
FileSymbol SymbolKind = 1
675-
// ModuleSymbol symbol of module.
676-
ModuleSymbol SymbolKind = 2
677-
// NamespaceSymbol symbol of namespace.
678-
NamespaceSymbol SymbolKind = 3
679-
// PackageSymbol symbol of package.
680-
PackageSymbol SymbolKind = 4
681-
// ClassSymbol symbol of class.
682-
ClassSymbol SymbolKind = 5
683-
// MethodSymbol symbol of method.
684-
MethodSymbol SymbolKind = 6
685-
// PropertySymbol symbol of property.
686-
PropertySymbol SymbolKind = 7
687-
// FieldSymbol symbol of field.
688-
FieldSymbol SymbolKind = 8
689-
// ConstructorSymbol symbol of constructor.
690-
ConstructorSymbol SymbolKind = 9
691-
// EnumSymbol symbol of enum.
692-
EnumSymbol SymbolKind = 10
693-
// InterfaceSymbol symbol of interface.
694-
InterfaceSymbol SymbolKind = 11
695-
// FunctionSymbol symbol of function.
696-
FunctionSymbol SymbolKind = 12
697-
// VariableSymbol symbol of variable.
698-
VariableSymbol SymbolKind = 13
699-
// ConstantSymbol symbol of constant.
700-
ConstantSymbol SymbolKind = 14
701-
// StringSymbol symbol of string.
702-
StringSymbol SymbolKind = 15
703-
// NumberSymbol symbol of number.
704-
NumberSymbol SymbolKind = 16
705-
// BooleanSymbol symbol of boolean.
706-
BooleanSymbol SymbolKind = 17
707-
// ArraySymbol symbol of array.
708-
ArraySymbol SymbolKind = 18
709-
// ObjectSymbol symbol of object.
710-
ObjectSymbol SymbolKind = 19
711-
// KeySymbol symbol of key.
712-
KeySymbol SymbolKind = 20
713-
// NullSymbol symbol of null.
714-
NullSymbol SymbolKind = 21
715-
// EnumMemberSymbol symbol of enum member.
716-
EnumMemberSymbol SymbolKind = 22
717-
// StructSymbol symbol of struct.
718-
StructSymbol SymbolKind = 23
719-
// EventSymbol symbol of event.
720-
EventSymbol SymbolKind = 24
721-
// OperatorSymbol symbol of operator.
722-
OperatorSymbol SymbolKind = 25
723-
// TypeParameterSymbol symbol of type parameter.
724-
TypeParameterSymbol SymbolKind = 26
673+
// SymbolKindFile symbol of file.
674+
SymbolKindFile SymbolKind = 1
675+
// SymbolKindModule symbol of module.
676+
SymbolKindModule SymbolKind = 2
677+
// SymbolKindNamespace symbol of namespace.
678+
SymbolKindNamespace SymbolKind = 3
679+
// SymbolKindPackage symbol of package.
680+
SymbolKindPackage SymbolKind = 4
681+
// SymbolKindClass symbol of class.
682+
SymbolKindClass SymbolKind = 5
683+
// SymbolKindMethod symbol of method.
684+
SymbolKindMethod SymbolKind = 6
685+
// SymbolKindProperty symbol of property.
686+
SymbolKindProperty SymbolKind = 7
687+
// SymbolKindField symbol of field.
688+
SymbolKindField SymbolKind = 8
689+
// SymbolKindConstructor symbol of constructor.
690+
SymbolKindConstructor SymbolKind = 9
691+
// SymbolKindEnum symbol of enum.
692+
SymbolKindEnum SymbolKind = 10
693+
// SymbolKindInterface symbol of interface.
694+
SymbolKindInterface SymbolKind = 11
695+
// SymbolKindFunction symbol of function.
696+
SymbolKindFunction SymbolKind = 12
697+
// SymbolKindVariable symbol of variable.
698+
SymbolKindVariable SymbolKind = 13
699+
// SymbolKindConstant symbol of constant.
700+
SymbolKindConstant SymbolKind = 14
701+
// SymbolKindString symbol of string.
702+
SymbolKindString SymbolKind = 15
703+
// SymbolKindNumber symbol of number.
704+
SymbolKindNumber SymbolKind = 16
705+
// SymbolKindBoolean symbol of boolean.
706+
SymbolKindBoolean SymbolKind = 17
707+
// SymbolKindArray symbol of array.
708+
SymbolKindArray SymbolKind = 18
709+
// SymbolKindObject symbol of object.
710+
SymbolKindObject SymbolKind = 19
711+
// SymbolKindKey symbol of key.
712+
SymbolKindKey SymbolKind = 20
713+
// SymbolKindNull symbol of null.
714+
SymbolKindNull SymbolKind = 21
715+
// SymbolKindEnumMember symbol of enum member.
716+
SymbolKindEnumMember SymbolKind = 22
717+
// SymbolKindStruct symbol of struct.
718+
SymbolKindStruct SymbolKind = 23
719+
// SymbolKindEvent symbol of event.
720+
SymbolKindEvent SymbolKind = 24
721+
// SymbolKindOperator symbol of operator.
722+
SymbolKindOperator SymbolKind = 25
723+
// SymbolKindTypeParameter symbol of type parameter.
724+
SymbolKindTypeParameter SymbolKind = 26
725725
)
726726

727727
// String implements fmt.Stringer.
728728
func (k SymbolKind) String() string {
729729
switch k {
730-
case FileSymbol:
730+
case SymbolKindFile:
731731
return "File"
732-
case ModuleSymbol:
732+
case SymbolKindModule:
733733
return "Module"
734-
case NamespaceSymbol:
734+
case SymbolKindNamespace:
735735
return "Namespace"
736-
case PackageSymbol:
736+
case SymbolKindPackage:
737737
return "Package"
738-
case ClassSymbol:
738+
case SymbolKindClass:
739739
return "Class"
740-
case MethodSymbol:
740+
case SymbolKindMethod:
741741
return "Method"
742-
case PropertySymbol:
742+
case SymbolKindProperty:
743743
return "Property"
744-
case FieldSymbol:
744+
case SymbolKindField:
745745
return "Field"
746-
case ConstructorSymbol:
746+
case SymbolKindConstructor:
747747
return "Constructor"
748-
case EnumSymbol:
748+
case SymbolKindEnum:
749749
return "Enum"
750-
case InterfaceSymbol:
750+
case SymbolKindInterface:
751751
return "Interface"
752-
case FunctionSymbol:
752+
case SymbolKindFunction:
753753
return "Function"
754-
case VariableSymbol:
754+
case SymbolKindVariable:
755755
return "Variable"
756-
case ConstantSymbol:
756+
case SymbolKindConstant:
757757
return "Constant"
758-
case StringSymbol:
758+
case SymbolKindString:
759759
return "String"
760-
case NumberSymbol:
760+
case SymbolKindNumber:
761761
return "Number"
762-
case BooleanSymbol:
762+
case SymbolKindBoolean:
763763
return "Boolean"
764-
case ArraySymbol:
764+
case SymbolKindArray:
765765
return "Array"
766-
case ObjectSymbol:
766+
case SymbolKindObject:
767767
return "Object"
768-
case KeySymbol:
768+
case SymbolKindKey:
769769
return "Key"
770-
case NullSymbol:
770+
case SymbolKindNull:
771771
return "Null"
772-
case EnumMemberSymbol:
772+
case SymbolKindEnumMember:
773773
return "EnumMember"
774-
case StructSymbol:
774+
case SymbolKindStruct:
775775
return "Struct"
776-
case EventSymbol:
776+
case SymbolKindEvent:
777777
return "Event"
778-
case OperatorSymbol:
778+
case SymbolKindOperator:
779779
return "Operator"
780-
case TypeParameterSymbol:
780+
case SymbolKindTypeParameter:
781781
return "TypeParameter"
782782
default:
783783
return strconv.FormatFloat(float64(k), 'f', -10, 64)

0 commit comments

Comments
 (0)