Skip to content

Commit

Permalink
fix: solve conflicts from typing union types
Browse files Browse the repository at this point in the history
  • Loading branch information
saschanaz committed Jan 30, 2018
1 parent f422f2a commit ac7ef08
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions test/syntax/json/record.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@
"idlType": "DOMString"
},
{
"type": null,
"type": "return-type",
"sequence": false,
"generic": null,
"nullable": true,
"union": true,
"idlType": [
{
"type": "return-type",
"type": null,
"sequence": false,
"generic": null,
"nullable": false,
"union": false,
"idlType": "float"
},
{
"type": "return-type",
"type": null,
"sequence": false,
"generic": null,
"nullable": false,
Expand Down
10 changes: 5 additions & 5 deletions test/syntax/json/typedef-union.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@
{
"type": "typedef",
"idlType": {
"type": null,
"type": "typedef-type",
"sequence": false,
"generic": null,
"nullable": false,
"union": true,
"idlType": [
{
"type": "typedef-type",
"type": null,
"sequence": false,
"generic": null,
"nullable": false,
"union": false,
"idlType": "ImageData"
},
{
"type": "typedef-type",
"type": null,
"sequence": false,
"generic": null,
"nullable": false,
"union": false,
"idlType": "HTMLImageElement"
},
{
"type": "typedef-type",
"type": null,
"sequence": false,
"generic": null,
"nullable": false,
"union": false,
"idlType": "HTMLCanvasElement"
},
{
"type": "typedef-type",
"type": null,
"sequence": false,
"generic": null,
"nullable": false,
Expand Down

0 comments on commit ac7ef08

Please sign in to comment.