basic,diagnostic: move diagnostic related to diagnostics.go

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

Author: zchee

basic.go

@@ -4,8 +4,6 @@
 package protocol
 
 import (
-	"strconv"
-
 	"go.lsp.dev/uri"
 )
 
@@ -99,125 +97,6 @@ type LocationLink struct {
 	TargetSelectionRange Range `json:"targetSelectionRange"`
 }
 
-// Diagnostic represents a diagnostic, such as a compiler error or warning.
-//
-// Diagnostic objects are only valid in the scope of a resource.
-type Diagnostic struct {
-	// Range is the range at which the message applies.
-	Range Range `json:"range"`
-
-	// Severity is the diagnostic's severity. Can be omitted. If omitted it is up to the
-	// client to interpret diagnostics as error, warning, info or hint.
-	Severity DiagnosticSeverity `json:"severity,omitempty"`
-
-	// Code is the diagnostic's code, which might appear in the user interface.
-	Code interface{} `json:"code,omitempty"` // int32 | string;
-
-	// CodeDescription an optional property to describe the error code.
-	//
-	// @since 3.16.0.
-	CodeDescription *CodeDescription `json:"codeDescription,omitempty"`
-
-	// Source a human-readable string describing the source of this
-	// diagnostic, e.g. 'typescript' or 'super lint'.
-	Source string `json:"source,omitempty"`
-
-	// Message is the diagnostic's message.
-	Message string `json:"message"`
-
-	// Tags is the additional metadata about the diagnostic.
-	//
-	// @since 3.15.0.
-	Tags []DiagnosticTag `json:"tags,omitempty"`
-
-	// RelatedInformation an array of related diagnostic information, e.g. when symbol-names within
-	// a scope collide all definitions can be marked via this property.
-	RelatedInformation []DiagnosticRelatedInformation `json:"relatedInformation,omitempty"`
-
-	// Data is a data entry field that is preserved between a
-	// "textDocument/publishDiagnostics" notification and
-	// "textDocument/codeAction" request.
-	//
-	// @since 3.16.0.
-	Data interface{} `json:"data,omitempty"`
-}
-
-// DiagnosticSeverity indicates the severity of a Diagnostic message.
-type DiagnosticSeverity float64
-
-const (
-	// DiagnosticSeverityError reports an error.
-	DiagnosticSeverityError DiagnosticSeverity = 1
-
-	// DiagnosticSeverityWarning reports a warning.
-	DiagnosticSeverityWarning DiagnosticSeverity = 2
-
-	// DiagnosticSeverityInformation reports an information.
-	DiagnosticSeverityInformation DiagnosticSeverity = 3
-
-	// DiagnosticSeverityHint reports a hint.
-	DiagnosticSeverityHint DiagnosticSeverity = 4
-)
-
-// String implements fmt.Stringer.
-func (d DiagnosticSeverity) String() string {
-	switch d {
-	case DiagnosticSeverityError:
-		return "Error"
-	case DiagnosticSeverityWarning:
-		return "Warning"
-	case DiagnosticSeverityInformation:
-		return "Information"
-	case DiagnosticSeverityHint:
-		return "Hint"
-	default:
-		return strconv.FormatFloat(float64(d), 'f', -10, 64)
-	}
-}
-
-// DiagnosticTag is the diagnostic tags.
-//
-// @since 3.15.0.
-type DiagnosticTag float64
-
-// list of DiagnosticTag.
-const (
-	// DiagnosticTagUnnecessary unused or unnecessary code.
-	//
-	// Clients are allowed to render diagnostics with this tag faded out instead of having
-	// an error squiggle.
-	DiagnosticTagUnnecessary DiagnosticTag = 1
-
-	// DiagnosticTagDeprecated deprecated or obsolete code.
-	//
-	// Clients are allowed to rendered diagnostics with this tag strike through.
-	DiagnosticTagDeprecated DiagnosticTag = 2
-)
-
-// String implements fmt.Stringer.
-func (d DiagnosticTag) String() string {
-	switch d {
-	case DiagnosticTagUnnecessary:
-		return "Unnecessary"
-	case DiagnosticTagDeprecated:
-		return "Deprecated"
-	default:
-		return strconv.FormatFloat(float64(d), 'f', -10, 64)
-	}
-}
-
-// DiagnosticRelatedInformation represents a related message and source code location for a diagnostic.
-//
-// This should be used to point to code locations that cause or related to a diagnostics, e.g when duplicating
-// a symbol in a scope.
-type DiagnosticRelatedInformation struct {
-	// Location is the location of this related diagnostic information.
-	Location Location `json:"location"`
-
-	// Message is the message of this related diagnostic information.
-	Message string `json:"message"`
-}
-
 // CodeDescription is the structure to capture a description for an error code.
 //
 // @since 3.16.0.

basic_gojay.go

@@ -193,122 +193,6 @@ var (
 	_ gojay.UnmarshalerJSONObject = (*LocationLink)(nil)
 )
 
-// MarshalJSONObject implements gojay.MarshalerJSONObject.
-func (v *Diagnostic) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.ObjectKey(keyRange, &v.Range)
-	enc.Float64KeyOmitEmpty(keySeverity, float64(v.Severity))
-	enc.AddInterfaceKeyOmitEmpty(keyCode, v.Code)
-	enc.ObjectKeyOmitEmpty(keyCodeDescription, v.CodeDescription)
-	enc.StringKeyOmitEmpty(keySource, v.Source)
-	enc.StringKey(keyMessage, v.Message)
-	enc.ArrayKeyOmitEmpty(keyTags, DiagnosticTags(v.Tags))
-	enc.ArrayKeyOmitEmpty(keyRelatedInformation, DiagnosticRelatedInformations(v.RelatedInformation))
-	enc.AddInterfaceKeyOmitEmpty(keyData, v.Data)
-}
-
-// IsNil returns wether the structure is nil value or not.
-func (v *Diagnostic) IsNil() bool { return v == nil }
-
-// UnmarshalJSONObject implements gojay's UnmarshalerJSONObject.
-func (v *Diagnostic) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
-	switch k {
-	case keyRange:
-		return dec.Object(&v.Range)
-	case keySeverity:
-		return dec.Float64((*float64)(&v.Severity))
-	case keyCode:
-		return dec.Interface(&v.Code)
-	case keyCodeDescription:
-		if v.CodeDescription == nil {
-			v.CodeDescription = &CodeDescription{}
-		}
-		return dec.Object(v.CodeDescription)
-	case keySource:
-		return dec.String(&v.Source)
-	case keyMessage:
-		return dec.String(&v.Message)
-	case keyTags:
-		return dec.Array((*DiagnosticTags)(&v.Tags))
-	case keyRelatedInformation:
-		values := DiagnosticRelatedInformations{}
-		err := dec.Array(&values)
-		if err == nil && len(values) > 0 {
-			v.RelatedInformation = []DiagnosticRelatedInformation(values)
-		}
-		return err
-	case keyData:
-		return dec.Interface(&v.Data)
-	}
-	return nil
-}
-
-// NKeys returns the number of keys to unmarshal.
-func (v *Diagnostic) NKeys() int { return 9 }
-
-// compile time check whether the Diagnostic implements a gojay.MarshalerJSONObject and gojay.UnmarshalerJSONObject interfaces.
-var (
-	_ gojay.MarshalerJSONObject   = (*Diagnostic)(nil)
-	_ gojay.UnmarshalerJSONObject = (*Diagnostic)(nil)
-)
-
-// DiagnosticTags represents a slice of DiagnosticTag.
-type DiagnosticTags []DiagnosticTag
-
-// MarshalJSONArray implements gojay.MarshalerJSONArray.
-func (v DiagnosticTags) MarshalJSONArray(enc *gojay.Encoder) {
-	for i := range v {
-		enc.Float64(float64(v[i]))
-	}
-}
-
-// IsNil implements gojay.MarshalerJSONArray.
-func (v DiagnosticTags) IsNil() bool { return len(v) == 0 }
-
-// UnmarshalJSONArray implements gojay.UnmarshalerJSONArray.
-func (v *DiagnosticTags) UnmarshalJSONArray(dec *gojay.Decoder) error {
-	var value DiagnosticTag
-	if err := dec.Float64((*float64)(&value)); err != nil {
-		return err
-	}
-	*v = append(*v, value)
-	return nil
-}
-
-// compile time check whether the CodeActionKinds implements a gojay.MarshalerJSONArray and gojay.UnmarshalerJSONArray interfaces.
-var (
-	_ gojay.MarshalerJSONArray   = (*DiagnosticTags)(nil)
-	_ gojay.UnmarshalerJSONArray = (*DiagnosticTags)(nil)
-)
-
-// MarshalJSONObject implements gojay.MarshalerJSONObject.
-func (v *DiagnosticRelatedInformation) MarshalJSONObject(enc *gojay.Encoder) {
-	enc.ObjectKey(keyLocation, &v.Location)
-	enc.StringKey(keyMessage, v.Message)
-}
-
-// IsNil returns wether the structure is nil value or not.
-func (v *DiagnosticRelatedInformation) IsNil() bool { return v == nil }
-
-// UnmarshalJSONObject implements gojay's UnmarshalerJSONObject.
-func (v *DiagnosticRelatedInformation) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
-	switch k {
-	case keyLocation:
-		return dec.Object(&v.Location)
-	case keyMessage:
-		return dec.String(&v.Message)
-	}
-	return nil
-}
-
-// NKeys returns the number of keys to unmarshal.
-func (v *DiagnosticRelatedInformation) NKeys() int { return 2 }
-
-// compile time check whether the DiagnosticRelatedInformation implements a gojay.MarshalerJSONObject and gojay.UnmarshalerJSONObject interfaces.
-var (
-	_ gojay.MarshalerJSONObject   = (*DiagnosticRelatedInformation)(nil)
-	_ gojay.UnmarshalerJSONObject = (*DiagnosticRelatedInformation)(nil)
-)
-
 // MarshalJSONObject implements gojay.MarshalerJSONObject.
 func (v *CodeDescription) MarshalJSONObject(enc *gojay.Encoder) {
 	enc.StringKey(keyHref, string(v.Href))

basic_gojay_test.go

@@ -22,12 +22,6 @@ func TestLocationLink(t *testing.T) { testLocationLink(t, gojay.Marshal, gojay.U
 
 func TestCodeDescription(t *testing.T) { testCodeDescription(t, gojay.Marshal, gojay.Unsafe.Unmarshal) }
 
-func TestDiagnostic(t *testing.T) { testDiagnostic(t, gojay.Marshal, gojay.Unsafe.Unmarshal) }
-
-func TestDiagnosticRelatedInformation(t *testing.T) {
-	testDiagnosticRelatedInformation(t, gojay.Marshal, gojay.Unsafe.Unmarshal)
-}
-
 func TestCommand(t *testing.T) { testCommand(t, gojay.Marshal, gojay.Unsafe.Unmarshal) }
 
 func TestChangeAnnotation(t *testing.T) {

basic_json_test.go

@@ -21,12 +21,6 @@ func TestLocationLink(t *testing.T) { testLocationLink(t, json.Marshal, json.Unm
 
 func TestCodeDescription(t *testing.T) { testCodeDescription(t, json.Marshal, json.Unmarshal) }
 
-func TestDiagnostic(t *testing.T) { testDiagnostic(t, json.Marshal, json.Unmarshal) }
-
-func TestDiagnosticRelatedInformation(t *testing.T) {
-	testDiagnosticRelatedInformation(t, json.Marshal, json.Unmarshal)
-}
-
 func TestCommand(t *testing.T) { testCommand(t, json.Marshal, json.Unmarshal) }
 
 func TestChangeAnnotation(t *testing.T) { testChangeAnnotation(t, json.Marshal, json.Unmarshal) }