Skip to content

Commit

Permalink
[#46] Code assist for format keyword inserts empty quotes
Browse files Browse the repository at this point in the history 
Use anyOf instead of oneOf
  • Loading branch information
@ghillairet
ghillairet committed Jan 21, 2016
1 parent 3044dfb commit 6c1a1d9
Showing 1 changed file with 29 additions and 152 deletions.
181 changes: 29 additions & 152 deletions com.reprezen.swagedit/src/com/reprezen/swagedit/json/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,25 +415,7 @@
]
},
"format": {
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
"$ref": "#/definitions/format"
},
"items": {
"$ref": "#/definitions/primitivesItems"
Expand Down Expand Up @@ -573,25 +555,7 @@
]
},
"format": {
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
"$ref": "#/definitions/format"
},
"items": {
"$ref": "#/definitions/primitivesItems"
Expand Down Expand Up @@ -684,25 +648,7 @@
]
},
"format": {
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
"$ref": "#/definitions/format"
},
"items": {
"$ref": "#/definitions/primitivesItems"
Expand Down Expand Up @@ -796,25 +742,7 @@
]
},
"format": {
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
"$ref": "#/definitions/format"
},
"items": {
"$ref": "#/definitions/primitivesItems"
Expand Down Expand Up @@ -907,25 +835,7 @@
]
},
"format": {
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
"$ref": "#/definitions/format"
},
"items": {
"$ref": "#/definitions/primitivesItems"
Expand Down Expand Up @@ -1019,25 +929,7 @@
"type": "string"
},
"format": {
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
"$ref": "#/definitions/format"
},
"title": {
"$ref": "http://json-schema.org/draft-04/schema#/properties/title"
Expand Down Expand Up @@ -1163,25 +1055,7 @@
},
"properties": {
"format": {
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
"$ref": "#/definitions/format"
},
"title": {
"$ref": "http://json-schema.org/draft-04/schema#/properties/title"
Expand Down Expand Up @@ -1227,25 +1101,7 @@
]
},
"format": {
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
"$ref": "#/definitions/format"
},
"items": {
"$ref": "#/definitions/primitivesItems"
Expand Down Expand Up @@ -1727,6 +1583,27 @@
"type": "string"
}
}
},
"format": {
"anyOf": [
{
"type": "string"
},
{
"type": "string",
"enum": [
"int32",
"int64",
"float",
"double",
"byte",
"binary",
"date",
"date-time",
"password"
]
}
]
}
}
}

1 comment on commit 6c1a1d9

@tfesenko
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

Please sign in to comment.