encoding/jsonschema: remove isSchema field

This field is no longer used: in general we can't make assumptions about
whether a given node is inside a schema, so we always emit the ellipses,
leaving ellipsis removal for a later processing stage.

Signed-off-by: Roger Peppe <[email protected]>
Change-Id: If8e5c3b918989a31a5f388aac01cdb9ec3f2e258
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1205046
Unity-Result: CUE porcuepine <[email protected]>
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>

Author: rogpeppe

encoding/jsonschema/constraints_generic.go

@@ -28,10 +28,6 @@ func constraintAddDefinitions(key string, n cue.Value, s *state) {
 		s.errf(n, `"definitions" expected an object, found %s`, n.Kind())
 	}
 
-	old := s.isSchema
-	s.isSchema = true
-	defer func() { s.isSchema = old }()
-
 	s.processMap(n, func(key string, n cue.Value) {
 		name := key
 

encoding/jsonschema/decode.go

@@ -126,7 +126,6 @@ func (d *decoder) schema(ref []ast.Label, v cue.Value) (a []ast.Decl) {
 
 	if inner >= 0 {
 		name = ref[inner]
-		root.isSchema = true
 	}
 
 	expr, state := root.schemaState(v, allTypes, nil)
@@ -401,8 +400,6 @@ type state struct {
 	*decoder
 	schemaInfo
 
-	isSchema bool // for omitting ellipsis in an ast.File
-
 	up *state
 
 	path []string
@@ -739,11 +736,10 @@ func (s0 *state) schemaState(n cue.Value, types cue.Kind, idRef []label) (ast.Ex
 			allowedTypes:  types,
 			knownTypes:    allTypes,
 		},
-		isSchema: s0.isSchema,
-		decoder:  s0.decoder,
-		idRef:    idRef,
-		pos:      n,
-		isRoot:   s0.isRoot && n == s0.pos,
+		decoder: s0.decoder,
+		idRef:   idRef,
+		pos:     n,
+		isRoot:  s0.isRoot && n == s0.pos,
 	}
 	if n.Kind() == cue.BoolKind {
 		if vfrom(VersionDraft6).contains(s.schemaVersion) {