WIP6

Signed-off-by: Koichi Shiraishi <[email protected]>

Author: zchee

protocol/client.go

@@ -20,40 +20,28 @@ func (gen *Generator) ClientToServer(clientNotifications, bidiNotifications []*p
 	g.PP(`const (`)
 	if len(bidiNotifications) > 0 {
 		slices.SortFunc(bidiNotifications, func(a, b *protocol.Notification) int {
-			if !strings.Contains(a.Method, "/") && !strings.Contains(b.Method, "/") {
-				return cmp.Compare(a.Method, b.Method)
-			}
-			return cmp.Compare(strings.ToLower(a.Method), strings.ToLower(b.Method))
+			return cmp.Compare(strings.ToLower(a.TypeName), strings.ToLower(b.TypeName))
 		})
 		for _, meth := range bidiNotifications {
 			g.PP(`	`, `MethodClient`+normalizeMethodName(meth.Method), ` ClientMethod `, ` = `, strconv.Quote(meth.Method), ` // bidirect client notification`)
 		}
 	}
 	slices.SortFunc(clientNotifications, func(a, b *protocol.Notification) int {
-		if !strings.Contains(a.Method, "/") && !strings.Contains(b.Method, "/") {
-			return cmp.Compare(a.Method, b.Method)
-		}
-		return cmp.Compare(strings.ToLower(a.Method), strings.ToLower(b.Method))
+		return cmp.Compare(strings.ToLower(a.TypeName), strings.ToLower(b.TypeName))
 	})
 	for _, meth := range clientNotifications {
 		g.PP(`	`, `Method`+normalizeMethodName(meth.Method), ` ClientMethod `, ` = `, strconv.Quote(meth.Method), ` // client notification`)
 	}
 	if len(bidiRequests) > 0 {
 		slices.SortFunc(bidiRequests, func(a, b *protocol.Request) int {
-			if !strings.Contains(a.Method, "/") && !strings.Contains(b.Method, "/") {
-				return cmp.Compare(a.Method, b.Method)
-			}
-			return cmp.Compare(strings.ToLower(a.Method), strings.ToLower(b.Method))
+			return cmp.Compare(strings.ToLower(a.TypeName), strings.ToLower(b.TypeName))
 		})
 		for _, meth := range bidiRequests {
 			g.PP(`	`, `MethodClient`+normalizeMethodName(meth.Method), ` ClientMethod `, ` = `, strconv.Quote(meth.Method), ` // bidirect client request`)
 		}
 	}
 	slices.SortFunc(clientRequests, func(a, b *protocol.Request) int {
-		if !strings.Contains(a.Method, "/") && !strings.Contains(b.Method, "/") {
-			return cmp.Compare(a.Method, b.Method)
-		}
-		return cmp.Compare(strings.ToLower(a.Method), strings.ToLower(b.Method))
+		return cmp.Compare(strings.ToLower(a.TypeName), strings.ToLower(b.TypeName))
 	})
 	for _, meth := range clientRequests {
 		g.PP(`	`, `Method`+normalizeMethodName(meth.Method), ` ClientMethod `, ` = `, strconv.Quote(meth.Method), ` // client request`)
@@ -66,7 +54,8 @@ func (gen *Generator) ClientToServer(clientNotifications, bidiNotifications []*p
 	reqests := append(bidiRequests, clientRequests...)
 
 	for i, notify := range notifications {
-		meth := normalizeMethodName(notify.Method)
+		meth := normalizeMethodName(notify.TypeName)
+		meth = strings.TrimSuffix(meth, "Notification")
 		// write Documentation
 		if notify.Documentation != "" {
 			g.PP(`// `, meth, normalizeDocumentation(notify.Documentation))
@@ -91,7 +80,10 @@ func (gen *Generator) ClientToServer(clientNotifications, bidiNotifications []*p
 		}
 	}
 	for i, req := range reqests {
-		meth := normalizeMethodName(req.Method)
+		meth := normalizeMethodName(req.TypeName)
+		if meth != "ShowMessageRequest" {
+			meth = strings.TrimSuffix(meth, "Request")
+		}
 		// write Documentation
 		if req.Documentation != "" {
 			g.PP(`// `, meth, normalizeDocumentation(req.Documentation))
@@ -122,7 +114,8 @@ func (gen *Generator) ClientToServer(clientNotifications, bidiNotifications []*p
 	g.PP(`type UnimplementedClient struct {}`)
 	g.P("\n")
 	for i, notify := range notifications {
-		meth := normalizeMethodName(notify.Method)
+		meth := normalizeMethodName(notify.TypeName)
+		meth = strings.TrimSuffix(meth, "Notification")
 		g.P(`func (UnimplementedClient) `)
 		if err := gen.notification(g, meth, notify); err != nil {
 			return err
@@ -136,7 +129,10 @@ func (gen *Generator) ClientToServer(clientNotifications, bidiNotifications []*p
 		}
 	}
 	for i, req := range reqests {
-		meth := normalizeMethodName(req.Method)
+		meth := normalizeMethodName(req.TypeName)
+		if meth != "ShowMessageRequest" {
+			meth = strings.TrimSuffix(meth, "Request")
+		}
 		if meth == "" {
 			continue
 		}
@@ -172,40 +168,28 @@ func (gen *Generator) ServerToClient(serverNotifications, bidiNotifications []*p
 	g.PP(`const (`)
 	if len(bidiNotifications) > 0 {
 		slices.SortFunc(bidiNotifications, func(a, b *protocol.Notification) int {
-			if !strings.Contains(a.Method, "/") && !strings.Contains(b.Method, "/") {
-				return cmp.Compare(a.Method, b.Method)
-			}
-			return cmp.Compare(a.Method, b.Method)
+			return cmp.Compare(a.TypeName, b.TypeName)
 		})
 		for _, meth := range bidiNotifications {
 			g.PP(`	`, `MethodServer`+normalizeMethodName(meth.Method), ` ServerMethod `, ` = `, strconv.Quote(meth.Method), ` // bidirect server notification`)
 		}
 	}
 	slices.SortFunc(serverNotifications, func(a, b *protocol.Notification) int {
-		if !strings.Contains(a.Method, "/") && !strings.Contains(b.Method, "/") {
-			return cmp.Compare(a.Method, b.Method)
-		}
-		return cmp.Compare(a.Method, b.Method)
+		return cmp.Compare(a.TypeName, b.TypeName)
 	})
 	for _, meth := range serverNotifications {
 		g.PP(`	`, `Method`+normalizeMethodName(meth.Method), ` ServerMethod `, ` = `, strconv.Quote(meth.Method), ` // server notification`)
 	}
 	if len(bidiRequests) > 0 {
 		slices.SortFunc(bidiRequests, func(a, b *protocol.Request) int {
-			if !strings.Contains(a.Method, "/") && !strings.Contains(b.Method, "/") {
-				return cmp.Compare(a.Method, b.Method)
-			}
-			return cmp.Compare(a.Method, b.Method)
+			return cmp.Compare(a.TypeName, b.TypeName)
 		})
 		for _, meth := range bidiRequests {
 			g.PP(`	`, `MethodServer`+normalizeMethodName(meth.Method), ` ServerMethod `, ` = `, strconv.Quote(meth.Method), ` // bidirect server request`)
 		}
 	}
 	slices.SortFunc(serverNequests, func(a, b *protocol.Request) int {
-		if !strings.Contains(a.Method, "/") && !strings.Contains(b.Method, "/") {
-			return cmp.Compare(a.Method, b.Method)
-		}
-		return cmp.Compare(a.Method, b.Method)
+		return cmp.Compare(a.TypeName, b.TypeName)
 	})
 	for _, meth := range serverNequests {
 		g.PP(`	`, `Method`+normalizeMethodName(meth.Method), ` ServerMethod `, ` = `, strconv.Quote(meth.Method), ` // server request`)
@@ -218,7 +202,8 @@ func (gen *Generator) ServerToClient(serverNotifications, bidiNotifications []*p
 	reqests := slices.Clip(serverNequests)
 
 	for i, notify := range notifications {
-		meth := normalizeMethodName(notify.Method)
+		meth := normalizeMethodName(notify.TypeName)
+		meth = strings.TrimSuffix(meth, "Notification")
 		// write Documentation
 		if notify.Documentation != "" {
 			g.PP(`// `, meth, normalizeDocumentation(notify.Documentation))
@@ -243,7 +228,10 @@ func (gen *Generator) ServerToClient(serverNotifications, bidiNotifications []*p
 		}
 	}
 	for i, req := range reqests {
-		meth := normalizeMethodName(req.Method)
+		meth := normalizeMethodName(req.TypeName)
+		if meth != "ShowMessageRequest" {
+			meth = strings.TrimSuffix(meth, "Request")
+		}
 		// write Documentation
 		if req.Documentation != "" {
 			g.PP(`// `, meth, normalizeDocumentation(req.Documentation))
@@ -276,7 +264,8 @@ func (gen *Generator) ServerToClient(serverNotifications, bidiNotifications []*p
 	g.PP(`type UnimplementedServer struct {}`)
 	g.P("\n")
 	for i, notify := range notifications {
-		meth := normalizeMethodName(notify.Method)
+		meth := normalizeMethodName(notify.TypeName)
+		meth = strings.TrimSuffix(meth, "Notification")
 		g.P(`func (UnimplementedServer) `)
 		if err := gen.notification(g, meth, notify); err != nil {
 			return err
@@ -290,7 +279,10 @@ func (gen *Generator) ServerToClient(serverNotifications, bidiNotifications []*p
 		}
 	}
 	for i, req := range reqests {
-		meth := normalizeMethodName(req.Method)
+		meth := normalizeMethodName(req.TypeName)
+		if meth != "ShowMessageRequest" {
+			meth = strings.TrimSuffix(meth, "Request")
+		}
 		g.P(`func (UnimplementedServer) `)
 		n, err := gen.request(g, meth, req)
 		if err != nil {
@@ -419,7 +411,7 @@ func (gen *Generator) renderRequestsArrayType(g Printer, req *protocol.Request,
 			gen.renderRequestssOrTypeNull(g, req, elem)
 		default:
 			genericsType := genericsType{
-				Name:          normalizeMethodName(req.Method) + "Result",
+				Name:          normalizeMethodName(req.TypeName) + "Result",
 				Documentation: req.Documentation,
 				Since:         req.Since,
 				Proposed:      req.Proposed,

protocol/client_interface.go

@@ -5,29 +5,32 @@ package protocol
 
 // Enumeration defines an enumeration.
 type Enumeration struct {
-	// Whether the enumeration is deprecated or not. If deprecated the property contains the deprecation message.
-	Deprecated string
-
-	// An optional documentation.
-	Documentation string
-
 	// The name of the enumeration.
 	Name string
 
-	// Whether this is a proposed enumeration. If omitted, the enumeration is final.
-	Proposed bool
+	// The type of the elements.
+	Type EnumerationType
 
-	// Since when (release number) this enumeration is available. Is empty if not known.
-	Since string
+	// The enum values.
+	Values []*EnumerationEntry
 
 	// Whether the enumeration supports custom values (e.g. values which are not part of the set defined in values). If omitted no custom values are supported.
 	SupportsCustomValues bool
 
-	// The type of the elements.
-	Type EnumerationType
+	// An optional documentation.
+	Documentation string
 
-	// The enum values.
-	Values []*EnumerationEntry
+	// Since when (release number) this enumeration is available. Is empty if not known.
+	Since string
+
+	// All since tags in case there was more than one tag. Is undefined if not known.
+	SinceTags []string
+
+	// Whether this is a proposed enumeration. If omitted, the enumeration is final.
+	Proposed bool
+
+	// Whether the enumeration is deprecated or not. If deprecated the property contains the deprecation message.
+	Deprecated string
 }
 
 func (Enumeration) isTypeDecl() {}
@@ -50,21 +53,27 @@ const (
 
 // EnumerationEntry defines an enumeration entry.
 type EnumerationEntry struct {
-	// Whether the enum entry is deprecated or not. If deprecated the property contains the deprecation message.
-	Deprecated string
+	// The name of the enum item.
+	Name string
+
+	// The value (string or number).
+	Value any
 
 	// An optional documentation.
 	Documentation string
 
-	// The name of the enum item.
-	Name string
+	// Since when (release number) this enumeration entry is available. Is undefined if not known.
+	Since string
+
+	// All since tags in case there was more than one tag. Is undefined if not known.
+	SinceTags []string
 
 	// Whether this is a proposed enumeration entry. If omitted, the enumeration entry is final.
 	Proposed bool
 
-	// Since when (release number) this enumeration entry is available. Is undefined if not known.
-	Since string
+	// Whether the enum entry is deprecated or not. If deprecated the property contains the deprecation message.
+	Deprecated string
 
-	// The value (string or number).
-	Value any
+	// The type name of the request if any.
+	TypeName string
 }

protocol/server.go

@@ -5,31 +5,37 @@ package protocol
 
 // Notification represents a LSP notification.
 type Notification struct {
-	// Whether the notification is deprecated or not.
-	// If deprecated the property contains the deprecation message.
-	Deprecated string
-
-	// An optional documentation.
-	Documentation string
-
-	// The direction in which this notification is sent in the protocol.
-	MessageDirection MessageDirection
-
 	// The request's method name.
 	Method string
 
 	// The parameter type(s) if any.
 	Params []Type
 
-	// Whether this is a proposed notification. If omitted the notification is final.
-	Proposed bool
-
 	// Optional a dynamic registration method if it different from the request's method.
 	RegistrationMethod string
 
 	// Optional registration options if the notification supports dynamic registration.
 	RegistrationOptions Type
 
+	// The direction in which this notification is sent in the protocol.
+	MessageDirection MessageDirection
+
+	// An optional documentation.
+	Documentation string
+
 	// Since when (release number) this notification is available. Is undefined if not knownz.
 	Since string
+
+	// All since tags in case there was more than one tag. Is undefined if not known.
+	SinceTags []string
+
+	// Whether this is a proposed notification. If omitted the notification is final.
+	Proposed bool
+
+	// Whether the notification is deprecated or not.
+	// If deprecated the property contains the deprecation message.
+	Deprecated string
+
+	// The type name of the request if any.
+	TypeName string
 }

protocol/server_interface.go

@@ -5,27 +5,30 @@ package protocol
 
 // Property represents an object property.
 type Property struct {
-	// Whether the property is deprecated or not. If deprecated the property contains the deprecation message.
-	Deprecated string
-
-	// An optional documentation.
-	Documentation string
-
-	// The property JSON name.
-	JSONName string
-
 	// The property name.
 	Name string
 
+	// The type of the property.
+	Type Type
+
 	// Whether the property is optional. If omitted, the property is mandatory.
 	Optional bool
 
-	// Whether this is a proposed property. If omitted, the structure is final.
-	Proposed bool
+	// An optional documentation.
+	Documentation string
 
 	// Since when (release number) this property is available. Is undefined if not known.
 	Since string
 
-	// The type of the property.
-	Type Type
+	// All since tags in case there was more than one tag. Is undefined if not known.
+	SinceTags []string
+
+	// Whether this is a proposed property. If omitted, the structure is final.
+	Proposed bool
+
+	// Whether the property is deprecated or not. If deprecated the property contains the deprecation message.
+	Deprecated string
+
+	// The property JSON name.
+	JSONName string
 }