WIP12

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

Author: zchee

base.go

@@ -45,7 +45,7 @@ const (
 
 type CancelParams struct {
 	// ID the request id to cancel.
-	ID CancelParamsID `json:"id"`
+	ID OneOf[int32, string] `json:"id"`
 }
 
 type ProgressParams struct {

basic.go

@@ -370,7 +370,7 @@ type TextDocumentEdit struct {
 	TextDocument OptionalVersionedTextDocumentIdentifier `json:"textDocument"`
 
 	// Edits the edits to be applied. 3.16.0 - support for AnnotatedTextEdit. This is guarded using a client capability. 3.18.0 - support for SnippetTextEdit. This is guarded using a client capability.
-	Edits TextDocumentEditEdits `json:"edits"`
+	Edits OneOf3[TextEdit, AnnotatedTextEdit, SnippetTextEdit] `json:"edits"`
 }
 
 // ChangeAnnotation additional information that describes document changes.
@@ -401,7 +401,7 @@ type WorkspaceEdit struct {
 
 	// DocumentChanges depending on the client capability `workspace.workspaceEdit.resourceOperations` document changes are
 	// either an array of `TextDocumentEdit`s to express changes to n different text documents where each text document edit addresses a specific version of a text document. Or it can contain above `TextDocumentEdit`s mixed with create, rename and delete file / folder operations. Whether a client supports versioned document edits is expressed via `workspace.workspaceEdit.documentChanges` client capability. If a client neither supports `documentChanges` nor `workspace.workspaceEdit.resourceOperations` then only plain `TextEdit`s using the `changes` property are supported.
-	DocumentChanges *WorkspaceEditDocumentChanges `json:"documentChanges,omitempty"`
+	DocumentChanges *OneOf4[TextDocumentEdit, CreateFile, RenameFile, DeleteFile] `json:"documentChanges,omitempty"`
 
 	// ChangeAnnotations a map of change annotations that can be referenced in `AnnotatedTextEdit`s or create, rename and delete file / folder operations. Whether clients honor this property depends on the client capability `workspace.changeAnnotationSupport`.
 	ChangeAnnotations map[ChangeAnnotationIdentifier]ChangeAnnotation `json:"changeAnnotations,omitempty"`
@@ -463,7 +463,7 @@ type Diagnostic struct {
 	Severity DiagnosticSeverity `json:"severity,omitempty"`
 
 	// Code the diagnostic's code, which usually appear in the user interface.
-	Code *DiagnosticCode `json:"code,omitempty"`
+	Code *OneOf[int32, string] `json:"code,omitempty"`
 
 	// CodeDescription an optional property to describe the error code. Requires the code field (above) to be present/not null.
 	CodeDescription *CodeDescription `json:"codeDescription,omitempty"`

client_interface.go

@@ -147,7 +147,6 @@ func (UnimplementedClient) LogMessage(ctx context.Context, params *LogMessagePar
 func (UnimplementedClient) ShowMessage(ctx context.Context, params *ShowMessageParams) error {
 	return jsonrpc2.ErrInternal
 }
-
 func (UnimplementedClient) Registration(ctx context.Context, params *RegistrationParams) error {
 	return jsonrpc2.ErrInternal
 }

document.go

@@ -128,7 +128,7 @@ type NotebookDocumentFilterWithCells struct {
 	// Notebook the notebook to be synced If a string value is provided it matches against the notebook type. '*' matches every notebook.
 	//
 	// @since 3.18.0
-	Notebook *NotebookDocumentFilterWithCellsNotebook `json:"notebook,omitempty"`
+	Notebook *OneOf[string, NotebookDocumentFilter] `json:"notebook,omitempty"`
 
 	// Cells the cells of the matching notebook to be synced.
 	//
@@ -143,7 +143,7 @@ type NotebookDocumentFilterWithNotebook struct {
 	// Notebook the notebook to be synced If a string value is provided it matches against the notebook type. '*' matches every notebook.
 	//
 	// @since 3.18.0
-	Notebook NotebookDocumentFilterWithNotebookNotebook `json:"notebook"`
+	Notebook OneOf[string, NotebookDocumentFilter] `json:"notebook"`
 
 	// Cells the cells of the matching notebook to be synced.
 	//
@@ -159,7 +159,7 @@ type NotebookDocumentSyncOptions struct {
 	// NotebookSelector the notebooks to be synced.
 	//
 	// @since 3.17.0
-	NotebookSelector NotebookDocumentSyncOptionsNotebookSelector `json:"notebookSelector"`
+	NotebookSelector OneOf[NotebookDocumentFilterWithNotebook, NotebookDocumentFilterWithCells] `json:"notebookSelector"`
 
 	// Save whether save notification should be forwarded to the server. Will only be honored if mode === `notebook`.
 	//
@@ -349,7 +349,7 @@ type TextDocumentSyncOptions struct {
 	WillSaveWaitUntil bool `json:"willSaveWaitUntil,omitempty"`
 
 	// Save if present save notifications are sent to the server. If omitted the notification should not be sent.
-	Save *TextDocumentSyncOptionsSave `json:"save,omitempty"`
+	Save *OneOf[bool, SaveOptions] `json:"save,omitempty"`
 }
 
 // DidOpenTextDocumentParams the parameters sent in an open text document notification.

go.mod

@@ -1,9 +1,9 @@
 module go.lsp.dev/protocol
 
-go 1.22.2
+go 1.23
 
 require (
-	github.com/google/go-cmp v0.6.0
+	github.com/google/go-cmp v0.7.0
 	go.lsp.dev/jsonrpc2 v0.10.0
 	go.lsp.dev/uri v0.3.0
 	go.uber.org/zap v1.27.0

go.sum

@@ -1,8 +1,8 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=

handler.go

@@ -77,7 +77,7 @@ func notifyCancel(ctx context.Context, conn jsonrpc2.Conn, id jsonrpc2.ID) {
 	ctx = context.WithoutCancel(ctx)
 	// Note that only *jsonrpc2.ID implements json.Marshaler.
 	cid := NewCancelParamsID(fmt.Sprint(id))
-	conn.Notify(ctx, "$/cancelRequest", &CancelParams{ID: cid})
+	conn.Notify(ctx, "$/cancelRequest", &CancelParams{ID: OneOf[int32, string](cid)})
 }
 
 func replyParseError(ctx context.Context, reply jsonrpc2.Replier, err error) error {

language.go

@@ -909,12 +909,12 @@ type SemanticTokensOptions struct {
 	// Range server supports providing semantic tokens for a specific range of a document.
 	//
 	// @since 3.16.0
-	Range *SemanticTokensOptionsRange `json:"range,omitempty"`
+	Range *OneOf[bool, Range] `json:"range,omitempty"`
 
 	// Full server supports providing semantic tokens for a full document.
 	//
 	// @since 3.16.0
-	Full *SemanticTokensOptionsFull `json:"full,omitempty"`
+	Full *OneOf[bool, SemanticTokensFullDelta] `json:"full,omitempty"`
 }
 
 // SemanticTokensRegistrationOptions.
@@ -1272,7 +1272,7 @@ type InlayHintLabelPart struct {
 	// Tooltip the tooltip text when you hover over this label part. Depending on the client capability `inlayHint.resolveSupport` clients might resolve this property late using the resolve request.
 	//
 	// @since 3.17.0
-	Tooltip *InlayHintLabelPartTooltip `json:"tooltip,omitempty"`
+	Tooltip *OneOf[string, MarkupContent] `json:"tooltip,omitempty"`
 
 	// Location an optional source code location that represents this label part. The editor will use this location for the hover and for code navigation features: This part will become a clickable link that resolves
 	// to the definition of the symbol at the given location (not necessarily the location itself), it shows the hover that shows at the given location, and it shows a context menu with further code navigation commands. Depending on the client capability `inlayHint.resolveSupport` clients might resolve this property late using the resolve request.
@@ -1299,7 +1299,7 @@ type InlayHint struct {
 	// Label the label of this hint. A human readable string or an array of InlayHintLabelPart label parts. *Note* that neither the string nor the label part can be empty.
 	//
 	// @since 3.17.0
-	Label InlayHintLabel `json:"label"`
+	Label OneOf[string, []InlayHintLabelPart] `json:"label"`
 
 	// Kind the kind of this hint. Can be omitted in which case the client should fall back to a reasonable default.
 	//
@@ -1315,7 +1315,7 @@ type InlayHint struct {
 	// Tooltip the tooltip text when you hover over this item.
 	//
 	// @since 3.17.0
-	Tooltip *InlayHintTooltip `json:"tooltip,omitempty"`
+	Tooltip *OneOf[string, MarkupContent] `json:"tooltip,omitempty"`
 
 	// PaddingLeft render padding before the hint. Note: Padding should use the editor's background color, not the background color of the hint itself. That means padding can be used to visually align/separate an inlay hint.
 	//
@@ -1411,7 +1411,7 @@ type FullDocumentDiagnosticReport struct {
 // @since 3.17.0
 type DocumentDiagnosticReportPartialResult struct {
 	// @since 3.17.0
-	RelatedDocuments map[DocumentURI]DocumentDiagnosticReportPartialResultRelatedDocuments `json:"relatedDocuments"`
+	RelatedDocuments map[DocumentURI]OneOf[FullDocumentDiagnosticReport, UnchangedDocumentDiagnosticReport] `json:"relatedDocuments"`
 }
 
 // DiagnosticServerCancellationData cancellation data returned from a diagnostic request.
@@ -1560,7 +1560,7 @@ type InlineCompletionItem struct {
 	// InsertText the text to replace the range with. Must be set.
 	//
 	// @since 3.18.0 proposed
-	InsertText InlineCompletionItemInsertText `json:"insertText"`
+	InsertText OneOf[string, StringValue] `json:"insertText"`
 
 	// FilterText a text that is used to decide if this inline completion should be shown. When `falsy` the InlineCompletionItem.insertText is used.
 	//
@@ -1882,7 +1882,7 @@ type CompletionItem struct {
 	Detail string `json:"detail,omitempty"`
 
 	// Documentation a human-readable string that represents a doc-comment.
-	Documentation *CompletionItemDocumentation `json:"documentation,omitempty"`
+	Documentation *OneOf[string, MarkupContent] `json:"documentation,omitempty"`
 
 	// Deprecated indicates if this item is deprecated.
 	//
@@ -1909,7 +1909,7 @@ type CompletionItem struct {
 	InsertTextMode InsertTextMode `json:"insertTextMode,omitempty"`
 
 	// TextEdit an TextEdit edit which is applied to a document when selecting this completion. When an edit is provided the value of CompletionItem.insertText insertText is ignored. Most editors support two different operations when accepting a completion item. One is to insert a completion text and the other is to replace an existing text with a completion text. Since this can usually not be predetermined by a server it can report both ranges. Clients need to signal support for `InsertReplaceEdits` via the `textDocument.completion.insertReplaceSupport` client capability property. *Note 1:* The text edit's range as well as both ranges from an insert replace edit must be a [single line] and they must contain the position at which completion has been requested. *Note 2:* If an `InsertReplaceEdit` is returned the edit's insert range must be a prefix of the edit's replace range, that means it must be contained and starting at the same position. 3.16.0 additional type `InsertReplaceEdit`.
-	TextEdit *CompletionItemTextEdit `json:"textEdit,omitempty"`
+	TextEdit *OneOf[TextEdit, InsertReplaceEdit] `json:"textEdit,omitempty"`
 
 	// TextEditText the edit text used if the completion item is part of a CompletionList and CompletionList defines an item default for the text edit range. Clients will only honor this property if they opt into completion list item defaults using the capability `completionList.itemDefaults`. If not provided and a list's default range is provided the label property is used as a text.
 	TextEditText string `json:"textEditText,omitempty"`
@@ -1950,7 +1950,7 @@ type CompletionItemDefaults struct {
 
 	// EditRange a default edit range.
 	// @since 3.17.0
-	EditRange *CompletionItemDefaultsEditRange `json:"editRange,omitempty"`
+	EditRange *OneOf[Range, EditRangeWithInsertReplace] `json:"editRange,omitempty"`
 
 	// InsertTextFormat a default insert text format.
 	// @since 3.17.0
@@ -2012,7 +2012,7 @@ type HoverParams struct {
 // Hover the result of a hover request.
 type Hover struct {
 	// Contents the hover's content.
-	Contents HoverContents `json:"contents"`
+	Contents OneOf3[MarkupContent, MarkedString, []MarkedString] `json:"contents"`
 
 	// Range an optional range inside the text document that is used to visualize the hover, e.g. by changing the
 	// background color.
@@ -2030,10 +2030,13 @@ type HoverRegistrationOptions struct {
 type ParameterInformation struct {
 	// Label the label of this parameter information. Either a string or an inclusive start and exclusive end offsets within its containing signature label. (see SignatureInformation.label). The offsets are based on a UTF-16 string representation as `Position` and `Range` does. To avoid ambiguities a server should use the [start, end] offset value instead of using a substring. Whether a client support this is controlled via `labelOffsetSupport` client capability. *Note*: a label of type string should be a substring of its containing signature label. Its intended use case is to highlight the parameter label
 	// part in the `SignatureInformation.label`.
-	Label ParameterInformationLabel `json:"label"`
+	Label OneOf[string, struct {
+		x uint32
+		y uint32
+	}] `json:"label"`
 
 	// Documentation the human-readable doc-comment of this parameter. Will be shown in the UI but can be omitted.
-	Documentation *ParameterInformationDocumentation `json:"documentation,omitempty"`
+	Documentation *OneOf[string, MarkupContent] `json:"documentation,omitempty"`
 }
 
 // SignatureInformation represents the signature of something callable. A signature can have a label, like a function-name, a doc-comment, and a set of parameters.
@@ -2042,7 +2045,7 @@ type SignatureInformation struct {
 	Label string `json:"label"`
 
 	// Documentation the human-readable doc-comment of this signature. Will be shown in the UI but can be omitted.
-	Documentation *SignatureInformationDocumentation `json:"documentation,omitempty"`
+	Documentation *OneOf[string, MarkupContent] `json:"documentation,omitempty"`
 
 	// Parameters the parameters of this signature.
 	Parameters []ParameterInformation `json:"parameters,omitempty"`
@@ -2608,7 +2611,7 @@ type RelatedFullDocumentDiagnosticReport struct {
 
 	// RelatedDocuments diagnostics of related documents. This information is useful in programming languages where code in a file A can generate diagnostics in a file B which A depends on. An example of such a language is C/C++ where marco definitions in a file a.cpp and result in errors in a header file b.hpp.
 	// @since 3.17.0
-	RelatedDocuments map[DocumentURI]*RelatedFullDocumentDiagnosticReportRelatedDocuments `json:"relatedDocuments,omitempty"`
+	RelatedDocuments map[DocumentURI]*OneOf[FullDocumentDiagnosticReport, UnchangedDocumentDiagnosticReport] `json:"relatedDocuments,omitempty"`
 }
 
 // RelatedUnchangedDocumentDiagnosticReport an unchanged diagnostic report with a set of related documents.
@@ -2620,7 +2623,7 @@ type RelatedUnchangedDocumentDiagnosticReport struct {
 
 	// RelatedDocuments diagnostics of related documents. This information is useful in programming languages where code in a file A can generate diagnostics in a file B which A depends on. An example of such a language is C/C++ where marco definitions in a file a.cpp and result in errors in a header file b.hpp.
 	// @since 3.17.0
-	RelatedDocuments map[DocumentURI]*RelatedUnchangedDocumentDiagnosticReportRelatedDocuments `json:"relatedDocuments,omitempty"`
+	RelatedDocuments map[DocumentURI]*OneOf[FullDocumentDiagnosticReport, UnchangedDocumentDiagnosticReport] `json:"relatedDocuments,omitempty"`
 }
 
 // PrepareRenamePlaceholder.
@@ -2728,7 +2731,7 @@ type NotebookCellTextDocumentFilter struct {
 	// Notebook a filter that matches against the notebook containing the notebook cell. If a string value is provided it matches against the notebook type. '*' matches every notebook.
 	//
 	// @since 3.17.0
-	Notebook NotebookCellTextDocumentFilterNotebook `json:"notebook"`
+	Notebook OneOf[string, NotebookDocumentFilter] `json:"notebook"`
 
 	// Language a language id like `python`. Will be matched against the language id of the notebook cell document. '*' matches every language.
 	//