From 04cb05decc4af8fbc3dfb46cf0c8cd1770e546f9 Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Tue, 14 Oct 2025 09:16:48 -0700 Subject: [PATCH 1/5] Switch unison to side-by-side diffs --- unison | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unison b/unison index 3257bad5..ddba7a20 160000 --- a/unison +++ b/unison @@ -1 +1 @@ -Subproject commit 3257bad5503f30d9c97d961e9bc6633162b2cf96 +Subproject commit ddba7a2059e2042d3e00556c36c326e53fe98ece From 14cfa952f80c153f8eba3f92c28ff8d39e6884c3 Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Tue, 14 Oct 2025 09:45:56 -0700 Subject: [PATCH 2/5] Update transcripts for side-by-side diffs --- .../contribution-diffs/contribution-diff.json | 764 +++++--- .../contribution-diffs/namespace-diff.json | 764 +++++--- .../standard-term-diff.json | 228 ++- .../standard-type-diff.json | 176 +- .../merged-contribution-diff.json | 228 ++- .../transitive-contribution-diff.json | 228 ++- .../standard-ability-diff.json | 464 +++-- .../definition-diffs/standard-term-diff.json | 1591 ++++++++++++----- .../definition-diffs/standard-type-diff.json | 366 ++-- 9 files changed, 3309 insertions(+), 1500 deletions(-) diff --git a/transcripts/share-apis/contribution-diffs/contribution-diff.json b/transcripts/share-apis/contribution-diffs/contribution-diff.json index 4c3927b0..ae631b21 100644 --- a/transcripts/share-apis/contribution-diffs/contribution-diff.json +++ b/transcripts/share-apis/contribution-diffs/contribution-diff.json @@ -482,128 +482,266 @@ "diff": { "diff": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DataTypeKeyword" + "contents": { + "left": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" + } }, - "segment": "ability" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "AbilityUpdateMe", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "AbilityUpdateMe" - }, - { - "annotation": { - "tag": "ControlKeyword" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "AbilityUpdateMe", + "tag": "HashQualifier" + }, + "segment": "AbilityUpdateMe" + } }, - "segment": " where" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "annotationChange", - "fromAnnotation": { - "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0#a0", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + } + ] }, - "segment": "abilityUpdateMe", - "toAnnotation": { - "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng#a0", - "tag": "TermReference" + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0#a0", + "tag": "TermReference" + }, + "segment": "abilityUpdateMe", + "toAnnotation": { + "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng#a0", + "tag": "TermReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + }, + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0", + "tag": "TypeReference" + }, + "segment": "AbilityUpdateMe", + "toAnnotation": { + "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng", + "tag": "TypeReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + } + ] } - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "TypeAscriptionColon" + ], + "right": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "AbilityBraces" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "{" - } - ] - }, - { - "diffTag": "annotationChange", - "fromAnnotation": { - "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "AbilityUpdateMe", + "tag": "HashQualifier" + }, + "segment": "AbilityUpdateMe" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + } + ] }, - "segment": "AbilityUpdateMe", - "toAnnotation": { - "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng", - "tag": "TypeReference" - } - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "AbilityBraces" + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "}" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng#a0", + "tag": "TermReference" + }, + "segment": "abilityUpdateMe", + "toAnnotation": { + "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0#a0", + "tag": "TermReference" + } }, - "segment": "Nat" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": "Text" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + }, + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng", + "tag": "TypeReference" + }, + "segment": "AbilityUpdateMe", + "toAnnotation": { + "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0", + "tag": "TypeReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff" @@ -862,71 +1000,129 @@ "diff": { "diff": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DataTypeKeyword" + "contents": { + "left": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" + } }, - "segment": "type" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "DataUpdateMe" - }, - { - "annotation": { - "tag": "DelimiterChar" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" + } }, - "segment": " = " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } }, - "segment": "D" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", - "tag": "TermReference" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", + "tag": "TermReference" + }, + "segment": "D" + } + } + ] + } + ], + "right": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" + } }, - "segment": "D2" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Nat" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", + "tag": "TermReference" + }, + "segment": "D2" + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff" @@ -1743,80 +1939,174 @@ "diff": { "diff": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "contents": { + "left": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "termUpdateMe" - }, - { - "annotation": { - "tag": "TypeAscriptionColon" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Text" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "termUpdateMe" - }, - { - "annotation": { - "tag": "BindingEquals" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } }, - "segment": " =" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "\"original\"" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"original\"" + } + } + ] + } + ], + "right": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "\"updated\"" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"updated\"" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff" diff --git a/transcripts/share-apis/contribution-diffs/namespace-diff.json b/transcripts/share-apis/contribution-diffs/namespace-diff.json index 4c3927b0..ae631b21 100644 --- a/transcripts/share-apis/contribution-diffs/namespace-diff.json +++ b/transcripts/share-apis/contribution-diffs/namespace-diff.json @@ -482,128 +482,266 @@ "diff": { "diff": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DataTypeKeyword" + "contents": { + "left": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" + } }, - "segment": "ability" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "AbilityUpdateMe", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "AbilityUpdateMe" - }, - { - "annotation": { - "tag": "ControlKeyword" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "AbilityUpdateMe", + "tag": "HashQualifier" + }, + "segment": "AbilityUpdateMe" + } }, - "segment": " where" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "annotationChange", - "fromAnnotation": { - "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0#a0", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + } + ] }, - "segment": "abilityUpdateMe", - "toAnnotation": { - "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng#a0", - "tag": "TermReference" + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0#a0", + "tag": "TermReference" + }, + "segment": "abilityUpdateMe", + "toAnnotation": { + "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng#a0", + "tag": "TermReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + }, + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0", + "tag": "TypeReference" + }, + "segment": "AbilityUpdateMe", + "toAnnotation": { + "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng", + "tag": "TypeReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + } + ] } - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "TypeAscriptionColon" + ], + "right": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "AbilityBraces" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "{" - } - ] - }, - { - "diffTag": "annotationChange", - "fromAnnotation": { - "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "AbilityUpdateMe", + "tag": "HashQualifier" + }, + "segment": "AbilityUpdateMe" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + } + ] }, - "segment": "AbilityUpdateMe", - "toAnnotation": { - "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng", - "tag": "TypeReference" - } - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "AbilityBraces" + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "}" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng#a0", + "tag": "TermReference" + }, + "segment": "abilityUpdateMe", + "toAnnotation": { + "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0#a0", + "tag": "TermReference" + } }, - "segment": "Nat" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": "Text" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + }, + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#nnulmopbjndcs4si1mop30dm01nlum2k7m6j4mmd1df2e63m09lchh2j1gkqd4gua3bl0g3j6hgn76rmc495au8cpr0t83oqoho0sng", + "tag": "TypeReference" + }, + "segment": "AbilityUpdateMe", + "toAnnotation": { + "contents": "#8u70g0vaddp9jm3egoq434qialp8hdnjfh8ah8mqjau0i5lmdikt9qbe491ss53i71976fftb2o90ii6gckvs0i2lhovs1n6h0huhb0", + "tag": "TypeReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff" @@ -862,71 +1000,129 @@ "diff": { "diff": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DataTypeKeyword" + "contents": { + "left": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" + } }, - "segment": "type" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "DataUpdateMe" - }, - { - "annotation": { - "tag": "DelimiterChar" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" + } }, - "segment": " = " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } }, - "segment": "D" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", - "tag": "TermReference" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", + "tag": "TermReference" + }, + "segment": "D" + } + } + ] + } + ], + "right": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" + } }, - "segment": "D2" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Nat" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", + "tag": "TermReference" + }, + "segment": "D2" + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff" @@ -1743,80 +1939,174 @@ "diff": { "diff": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "contents": { + "left": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "termUpdateMe" - }, - { - "annotation": { - "tag": "TypeAscriptionColon" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Text" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "termUpdateMe" - }, - { - "annotation": { - "tag": "BindingEquals" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } }, - "segment": " =" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "\"original\"" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"original\"" + } + } + ] + } + ], + "right": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "\"updated\"" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"updated\"" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff" diff --git a/transcripts/share-apis/contribution-diffs/standard-term-diff.json b/transcripts/share-apis/contribution-diffs/standard-term-diff.json index eba5b68d..553110e3 100644 --- a/transcripts/share-apis/contribution-diffs/standard-term-diff.json +++ b/transcripts/share-apis/contribution-diffs/standard-term-diff.json @@ -1,80 +1,174 @@ { "body": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "contents": { + "left": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "termUpdateMe" - }, - { - "annotation": { - "tag": "TypeAscriptionColon" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Text" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "termUpdateMe" - }, - { - "annotation": { - "tag": "BindingEquals" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } }, - "segment": " =" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "\"original\"" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"original\"" + } + } + ] + } + ], + "right": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } }, - "segment": "\"updated\"" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"updated\"" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff", diff --git a/transcripts/share-apis/contribution-diffs/standard-type-diff.json b/transcripts/share-apis/contribution-diffs/standard-type-diff.json index e21c40b4..4372f39c 100644 --- a/transcripts/share-apis/contribution-diffs/standard-type-diff.json +++ b/transcripts/share-apis/contribution-diffs/standard-type-diff.json @@ -1,71 +1,129 @@ { "body": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DataTypeKeyword" + "contents": { + "left": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" + } }, - "segment": "type" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "DataUpdateMe" - }, - { - "annotation": { - "tag": "DelimiterChar" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" + } }, - "segment": " = " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } }, - "segment": "D" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", - "tag": "TermReference" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", + "tag": "TermReference" + }, + "segment": "D" + } + } + ] + } + ], + "right": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" + } }, - "segment": "D2" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", + "tag": "TermReference" + }, + "segment": "D2" + } }, - "segment": "Nat" - } - ] - } - ], + { + "diffTag": "one-sided", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff", diff --git a/transcripts/share-apis/contributions/merged-contribution-diff.json b/transcripts/share-apis/contributions/merged-contribution-diff.json index 9b9f0eed..7d5beca9 100644 --- a/transcripts/share-apis/contributions/merged-contribution-diff.json +++ b/transcripts/share-apis/contributions/merged-contribution-diff.json @@ -9,80 +9,174 @@ "diff": { "diff": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "contents": { + "left": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" + } }, - "segment": "term" - }, - { - "annotation": { - "tag": "TypeAscriptionColon" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Text", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "##Text" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "HashQualifier" + }, + "segment": "##Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" + } }, - "segment": "term" - }, - { - "annotation": { - "tag": "BindingEquals" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } }, - "segment": " =" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "\"start\"" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"start\"" + } + } + ] + } + ], + "right": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" + } }, - "segment": "\"feature-one\"" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "HashQualifier" + }, + "segment": "##Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"feature-one\"" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff" diff --git a/transcripts/share-apis/contributions/transitive-contribution-diff.json b/transcripts/share-apis/contributions/transitive-contribution-diff.json index 34bedd9e..92af0887 100644 --- a/transcripts/share-apis/contributions/transitive-contribution-diff.json +++ b/transcripts/share-apis/contributions/transitive-contribution-diff.json @@ -9,80 +9,174 @@ "diff": { "diff": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "contents": { + "left": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" + } }, - "segment": "term" - }, - { - "annotation": { - "tag": "TypeAscriptionColon" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Text", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "##Text" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "HashQualifier" + }, + "segment": "##Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" + } }, - "segment": "term" - }, - { - "annotation": { - "tag": "BindingEquals" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } }, - "segment": " =" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "\"feature-one\"" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "tag": "TextLiteral" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"feature-one\"" + } + } + ] + } + ], + "right": [ + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" + } }, - "segment": "\"feature-two\"" - } - ] - } - ], + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "HashQualifier" + }, + "segment": "##Text" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"feature-two\"" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff" diff --git a/transcripts/share-apis/definition-diffs/standard-ability-diff.json b/transcripts/share-apis/definition-diffs/standard-ability-diff.json index 4d0fc5d5..7f17a75f 100644 --- a/transcripts/share-apis/definition-diffs/standard-ability-diff.json +++ b/transcripts/share-apis/definition-diffs/standard-ability-diff.json @@ -1,196 +1,310 @@ { "body": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DataTypeKeyword" + "contents": { + "left": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" + } }, - "segment": "ability" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "BeforeAbility", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "BeforeAbility" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "AfterAbility", - "tag": "HashQualifier" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "BeforeAbility", + "tag": "HashQualifier" + }, + "segment": "BeforeAbility" + } }, - "segment": "AfterAbility" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "ControlKeyword" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": " where" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "#ebotvibo97n9s8ggp2n32jf6splp86102tjh70q395gmmdsfi45pvrvtkpot5e97ugg6t4j602ol001i3p28t62c8iga2rlma0ckfs0#a0", - "tag": "TermReference" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#ebotvibo97n9s8ggp2n32jf6splp86102tjh70q395gmmdsfi45pvrvtkpot5e97ugg6t4j602ol001i3p28t62c8iga2rlma0ckfs0#a0", + "tag": "TermReference" + }, + "segment": "beforeAbility" + } }, - "segment": "beforeAbility" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "#i1i6tae2gi8jp12lukns1e027i98ekbqhh6p5b944i44l6otiltjphbnmt2r844e2ukr2kppob3c5gvdpegc6ej54h9eg2j9gkc6ifg#a0", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": "afterAbility" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "TypeAscriptionColon" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } }, - "segment": "Nat" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "##Int", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Int" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "TypeOperator" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + } }, - "segment": "->" - }, - { - "annotation": { - "tag": "AbilityBraces" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } }, - "segment": "{" - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "#ebotvibo97n9s8ggp2n32jf6splp86102tjh70q395gmmdsfi45pvrvtkpot5e97ugg6t4j602ol001i3p28t62c8iga2rlma0ckfs0", - "tag": "TypeReference" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#ebotvibo97n9s8ggp2n32jf6splp86102tjh70q395gmmdsfi45pvrvtkpot5e97ugg6t4j602ol001i3p28t62c8iga2rlma0ckfs0", + "tag": "TypeReference" + }, + "segment": "BeforeAbility" + } }, - "segment": "BeforeAbility" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "#i1i6tae2gi8jp12lukns1e027i98ekbqhh6p5b944i44l6otiltjphbnmt2r844e2ukr2kppob3c5gvdpegc6ej54h9eg2j9gkc6ifg", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" + } }, - "segment": "AfterAbility" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "AbilityBraces" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "}" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + } + ], + "right": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "AfterAbility", + "tag": "HashQualifier" + }, + "segment": "AfterAbility" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Text" - } - ] - } - ], + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#i1i6tae2gi8jp12lukns1e027i98ekbqhh6p5b944i44l6otiltjphbnmt2r844e2ukr2kppob3c5gvdpegc6ej54h9eg2j9gkc6ifg#a0", + "tag": "TermReference" + }, + "segment": "afterAbility" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Int", + "tag": "TypeReference" + }, + "segment": "Int" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#i1i6tae2gi8jp12lukns1e027i98ekbqhh6p5b944i44l6otiltjphbnmt2r844e2ukr2kppob3c5gvdpegc6ej54h9eg2j9gkc6ifg", + "tag": "TypeReference" + }, + "segment": "AfterAbility" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff", diff --git a/transcripts/share-apis/definition-diffs/standard-term-diff.json b/transcripts/share-apis/definition-diffs/standard-term-diff.json index 21b62495..557b2f8d 100644 --- a/transcripts/share-apis/definition-diffs/standard-term-diff.json +++ b/transcripts/share-apis/definition-diffs/standard-term-diff.json @@ -1,500 +1,1167 @@ { "body": { "diff": { - "contents": [ - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "beforeTerm", - "tag": "HashQualifier" - }, - "segment": "beforeTerm" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "afterTerm", - "tag": "HashQualifier" - }, - "segment": "afterTerm" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "TypeAscriptionColon" + "contents": { + "left": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "beforeTerm", + "tag": "HashQualifier" + }, + "segment": "beforeTerm" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": "Nat" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "TypeOperator" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "->" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } }, - "segment": "Nat" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "TypeOperator" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "->" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "TypeOperator" - }, - "segment": "->" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DelayForceChar" - }, - "segment": "'" - }, - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - }, - { - "annotation": null, - "segment": "\n" - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "beforeTerm", - "tag": "HashQualifier" - }, - "segment": "beforeTerm" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "afterTerm", - "tag": "HashQualifier" - }, - "segment": "afterTerm" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "Var" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + } }, - "segment": "x" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "Var" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "y" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "Var" - }, - "segment": "z" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "BindingEquals" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } }, - "segment": " =" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "ControlKeyword" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "do" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "UseKeyword" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + } }, - "segment": "use " - }, - { - "annotation": { - "tag": "UsePrefix" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Nat" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "UseSuffix" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelayForceChar" + }, + "segment": "'" + } }, - "segment": "+" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "myList", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "beforeTerm", + "tag": "HashQualifier" + }, + "segment": "beforeTerm" + } }, - "segment": "myList" - }, - { - "annotation": { - "tag": "BindingEquals" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": " =" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "x" + } }, - "segment": "[" - }, - { - "annotation": { - "tag": "Var" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "x" - }, - { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "y" + } }, - "segment": ", " - }, - { - "annotation": { - "tag": "Var" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } }, - "segment": "y" - }, - { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": ", " - } - ] - }, - { - "diffTag": "annotationChange", - "fromAnnotation": { - "contents": "#gmjjuqjosr81oqnm9ck6atmve2tnnuu4c5nk89apmg79nsu5djpl6av0os0ekqil0gekdjoianh1rrem7lddsq2i26itq40tbkfgon0", - "tag": "TermReference" - }, - "segment": "valueChangesButNameStaysSame", - "toAnnotation": { - "contents": "#gjmq673r1vrurfotlnirv7vutdhm6sa3s02em5g22kk606mv6duvv8be402dv79312i4a0onepq5bo7citsodvq2g720nttj0ee9p0g", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": "do" + } + } + ] + }, + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "UseKeyword" + }, + "segment": "use " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "UsePrefix" + }, + "segment": "Nat" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "UseSuffix" + }, + "segment": "+" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "myList", + "tag": "HashQualifier" + }, + "segment": "myList" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": "[" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "x" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "y" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + }, + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#gmjjuqjosr81oqnm9ck6atmve2tnnuu4c5nk89apmg79nsu5djpl6av0os0ekqil0gekdjoianh1rrem7lddsq2i26itq40tbkfgon0", + "tag": "TermReference" + }, + "segment": "valueChangesButNameStaysSame", + "toAnnotation": { + "contents": "#gjmq673r1vrurfotlnirv7vutdhm6sa3s02em5g22kk606mv6duvv8be402dv79312i4a0onepq5bo7citsodvq2g720nttj0ee9p0g", + "tag": "TermReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + }, + { + "annotation": { + "contents": "#pi25gcdv0oq0no6k2ahe6t849u7ht4lopeg5fve58ga5t17a49f1dkbmdm6dn063bn3tsd4adijr4ltf7ad6do8u71oa72i27oack2o", + "tag": "TermReference" + }, + "diffTag": "segmentChange", + "fromSegment": "nameChangesButValueStaysSame", + "toSegment": "changedNameWithSameValue" + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": "]" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "myList2", + "tag": "HashQualifier" + }, + "segment": "myList2" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "#6frvp5jfjtt7odi9769i0p5phuuuij1fi1d9l5ncpelh416ab3vceaphhaijh0ct0v9n793j7e4h78687oij6ai97085u63m264gj5o", + "tag": "TermReference" + }, + "segment": "List.map" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Parenthesis" + }, + "segment": "(" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": "x" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " ->" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "x" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat.+", + "tag": "TermReference" + }, + "segment": "+" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "NumericLiteral" + }, + "segment": "1" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Parenthesis" + }, + "segment": ")" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "myList" + } + } + ] + }, + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##List.size", + "tag": "TermReference" + }, + "segment": "List.size" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "myList2" + } + } + ] } - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": ", " - } - ] - }, - { - "annotation": { - "contents": "#pi25gcdv0oq0no6k2ahe6t849u7ht4lopeg5fve58ga5t17a49f1dkbmdm6dn063bn3tsd4adijr4ltf7ad6do8u71oa72i27oack2o", - "tag": "TermReference" - }, - "diffTag": "segmentChange", - "fromSegment": "nameChangesButValueStaysSame", - "toSegment": "changedNameWithSameValue" - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" + ], + "right": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "afterTerm", + "tag": "HashQualifier" + }, + "segment": "afterTerm" + } }, - "segment": "]" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "myList2", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } }, - "segment": "myList2" - }, - { - "annotation": { - "tag": "BindingEquals" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": " =" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "#6frvp5jfjtt7odi9769i0p5phuuuij1fi1d9l5ncpelh416ab3vceaphhaijh0ct0v9n793j7e4h78687oij6ai97085u63m264gj5o", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } }, - "segment": "List.map" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "Parenthesis" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "(" - }, - { - "annotation": null, - "segment": "x" - }, - { - "annotation": { - "tag": "ControlKeyword" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + } }, - "segment": " ->" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "Var" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "x" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Nat.+", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } }, - "segment": "+" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "tag": "NumericLiteral" - }, - "segment": "1" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "tag": "Var" - }, - "segment": "z" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "Parenthesis" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": ")" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "Var" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + } }, - "segment": "myList" - }, - { - "annotation": null, - "segment": "\n" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##List.size", - "tag": "TermReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "List.size" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "tag": "Var" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } }, - "segment": "myList2" - } - ] - } - ], + { + "diffTag": "one-sided", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelayForceChar" + }, + "segment": "'" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "afterTerm", + "tag": "HashQualifier" + }, + "segment": "afterTerm" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "x" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "y" + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "z" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": "do" + } + } + ] + }, + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "UseKeyword" + }, + "segment": "use " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "UsePrefix" + }, + "segment": "Nat" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "UseSuffix" + }, + "segment": "+" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "myList", + "tag": "HashQualifier" + }, + "segment": "myList" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": "[" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "x" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "y" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + }, + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#gjmq673r1vrurfotlnirv7vutdhm6sa3s02em5g22kk606mv6duvv8be402dv79312i4a0onepq5bo7citsodvq2g720nttj0ee9p0g", + "tag": "TermReference" + }, + "segment": "valueChangesButNameStaysSame", + "toAnnotation": { + "contents": "#gmjjuqjosr81oqnm9ck6atmve2tnnuu4c5nk89apmg79nsu5djpl6av0os0ekqil0gekdjoianh1rrem7lddsq2i26itq40tbkfgon0", + "tag": "TermReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + }, + { + "annotation": { + "contents": "#pi25gcdv0oq0no6k2ahe6t849u7ht4lopeg5fve58ga5t17a49f1dkbmdm6dn063bn3tsd4adijr4ltf7ad6do8u71oa72i27oack2o", + "tag": "TermReference" + }, + "diffTag": "segmentChange", + "fromSegment": "changedNameWithSameValue", + "toSegment": "nameChangesButValueStaysSame" + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": "]" + } + } + ] + }, + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "myList2", + "tag": "HashQualifier" + }, + "segment": "myList2" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "#6frvp5jfjtt7odi9769i0p5phuuuij1fi1d9l5ncpelh416ab3vceaphhaijh0ct0v9n793j7e4h78687oij6ai97085u63m264gj5o", + "tag": "TermReference" + }, + "segment": "List.map" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Parenthesis" + }, + "segment": "(" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": "x" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " ->" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "x" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat.+", + "tag": "TermReference" + }, + "segment": "+" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "z" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Parenthesis" + }, + "segment": ")" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "myList" + } + } + ] + }, + { + "kind": "unchanged", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##List.size", + "tag": "TermReference" + }, + "segment": "List.size" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "Var" + }, + "segment": "myList2" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff", diff --git a/transcripts/share-apis/definition-diffs/standard-type-diff.json b/transcripts/share-apis/definition-diffs/standard-type-diff.json index b37f1b71..a86ef22d 100644 --- a/transcripts/share-apis/definition-diffs/standard-type-diff.json +++ b/transcripts/share-apis/definition-diffs/standard-type-diff.json @@ -1,148 +1,256 @@ { "body": { "diff": { - "contents": [ - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DataTypeKeyword" + "contents": { + "left": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" + } }, - "segment": "type" - }, - { - "annotation": null, - "segment": " " - } - ] - }, - { - "diffTag": "old", - "elements": [ - { - "annotation": { - "contents": "BeforeType", - "tag": "HashQualifier" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "BeforeType" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "contents": "AfterType", - "tag": "HashQualifier" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "BeforeType", + "tag": "HashQualifier" + }, + "segment": "BeforeType" + } }, - "segment": "AfterType" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DelimiterChar" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } }, - "segment": " = " - }, - { - "annotation": { - "tag": "DelimiterChar" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": "{ " + } }, - "segment": "{ " - } - ] - }, - { - "diffTag": "annotationChange", - "fromAnnotation": { - "contents": "#jjpne828dfnvlhiij4i567rd9v2guhbu0qt1eanjrf5oon2djjhod5ej85lp14e3iu24db9kgp1rjqh94vtrei7p3k69b7scfoqlup8", - "tag": "TypeReference" - }, - "segment": "fieldOne", - "toAnnotation": { - "contents": "#kumofu6ae22blpbip9rl33nvbkqfho86mohivuum8uabph37i4po78fi0120hmka4blrabancldnp93o75s35cc18vi8o9hdu3qrku8", - "tag": "TypeReference" + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#jjpne828dfnvlhiij4i567rd9v2guhbu0qt1eanjrf5oon2djjhod5ej85lp14e3iu24db9kgp1rjqh94vtrei7p3k69b7scfoqlup8", + "tag": "TypeReference" + }, + "segment": "fieldOne", + "toAnnotation": { + "contents": "#kumofu6ae22blpbip9rl33nvbkqfho86mohivuum8uabph37i4po78fi0120hmka4blrabancldnp93o75s35cc18vi8o9hdu3qrku8", + "tag": "TypeReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " }" + } + } + ] } - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "TypeAscriptionColon" + ], + "right": [ + { + "kind": "changed", + "value": [ + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": "Nat" - } - ] - }, - { - "diffTag": "new", - "elements": [ - { - "annotation": { - "tag": "DelimiterChar" + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "AfterType", + "tag": "HashQualifier" + }, + "segment": "AfterType" + } }, - "segment": "," - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "#kumofu6ae22blpbip9rl33nvbkqfho86mohivuum8uabph37i4po78fi0120hmka4blrabancldnp93o75s35cc18vi8o9hdu3qrku8", - "tag": "TypeReference" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } }, - "segment": "fieldTwo" - }, - { - "annotation": { - "tag": "TypeAscriptionColon" + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": "{ " + } }, - "segment": " :" - }, - { - "annotation": null, - "segment": " " - }, - { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#kumofu6ae22blpbip9rl33nvbkqfho86mohivuum8uabph37i4po78fi0120hmka4blrabancldnp93o75s35cc18vi8o9hdu3qrku8", + "tag": "TypeReference" + }, + "segment": "fieldOne", + "toAnnotation": { + "contents": "#jjpne828dfnvlhiij4i567rd9v2guhbu0qt1eanjrf5oon2djjhod5ej85lp14e3iu24db9kgp1rjqh94vtrei7p3k69b7scfoqlup8", + "tag": "TypeReference" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": "," + } }, - "segment": "Text" - } - ] - }, - { - "diffTag": "both", - "elements": [ - { - "annotation": { - "tag": "DelimiterChar" + { + "diffTag": "one-sided", + "elements": { + "annotation": null, + "segment": " " + } }, - "segment": " }" - } - ] - } - ], + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "#kumofu6ae22blpbip9rl33nvbkqfho86mohivuum8uabph37i4po78fi0120hmka4blrabancldnp93o75s35cc18vi8o9hdu3qrku8", + "tag": "TypeReference" + }, + "segment": "fieldTwo" + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": null, + "segment": " " + } + }, + { + "diffTag": "one-sided", + "elements": { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + }, + { + "diffTag": "both", + "elements": { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " }" + } + } + ] + } + ] + }, "tag": "UserObject" }, "diffKind": "diff", From 6a239ed7d09d2e1d34e9f8ef1f79395bfc8bd1a5 Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Wed, 15 Oct 2025 10:55:54 -0700 Subject: [PATCH 3/5] Bump unison dep --- unison | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unison b/unison index ddba7a20..28bd62ab 160000 --- a/unison +++ b/unison @@ -1 +1 @@ -Subproject commit ddba7a2059e2042d3e00556c36c326e53fe98ece +Subproject commit 28bd62ab403d66a843b09102e2c7564e99776b57 From 061a7a166f321c9f75033c7f26e39f803369c5c8 Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Wed, 15 Oct 2025 11:00:14 -0700 Subject: [PATCH 4/5] Bump transcripts --- .../contribution-diffs/contribution-diff.json | 652 +++--- .../contribution-diffs/namespace-diff.json | 652 +++--- .../standard-term-diff.json | 214 +- .../standard-type-diff.json | 162 +- .../merged-contribution-diff.json | 214 +- .../transitive-contribution-diff.json | 214 +- .../standard-ability-diff.json | 432 ++-- .../definition-diffs/standard-term-diff.json | 1894 ++++++++--------- .../definition-diffs/standard-type-diff.json | 318 ++- 9 files changed, 2166 insertions(+), 2586 deletions(-) diff --git a/transcripts/share-apis/contribution-diffs/contribution-diff.json b/transcripts/share-apis/contribution-diffs/contribution-diff.json index ae631b21..8133dd82 100644 --- a/transcripts/share-apis/contribution-diffs/contribution-diff.json +++ b/transcripts/share-apis/contribution-diffs/contribution-diff.json @@ -489,38 +489,31 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" }, - "segment": "ability" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "AbilityUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "AbilityUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" + { + "annotation": { + "contents": "AbilityUpdateMe", + "tag": "HashQualifier" + }, + "segment": "AbilityUpdateMe" }, - "segment": " where" - } + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + ] } ] }, @@ -529,10 +522,12 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + "elements": [ + { + "annotation": null, + "segment": " " + } + ] }, { "diffTag": "annotationChange", @@ -548,28 +543,24 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + { + "annotation": null, + "segment": " " }, - "segment": "{" - } + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + ] }, { "diffTag": "annotationChange", @@ -585,29 +576,30 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + "elements": [ + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" }, - "segment": "}" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] } ] } @@ -618,38 +610,31 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" }, - "segment": "ability" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "AbilityUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "AbilityUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" + { + "annotation": { + "contents": "AbilityUpdateMe", + "tag": "HashQualifier" + }, + "segment": "AbilityUpdateMe" }, - "segment": " where" - } + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + ] } ] }, @@ -658,10 +643,12 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + "elements": [ + { + "annotation": null, + "segment": " " + } + ] }, { "diffTag": "annotationChange", @@ -677,28 +664,24 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + { + "annotation": null, + "segment": " " }, - "segment": "{" - } + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + ] }, { "diffTag": "annotationChange", @@ -714,29 +697,30 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + "elements": [ + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" }, - "segment": "}" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" - }, - "segment": "Text" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] } @@ -1007,48 +991,43 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" }, - "segment": "type" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "DataUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" }, - "segment": " = " - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", - "tag": "TermReference" - }, - "segment": "D" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", + "tag": "TermReference" + }, + "segment": "D" + } + ] } ] } @@ -1059,65 +1038,54 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" }, - "segment": "type" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "DataUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" }, - "segment": " = " - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", - "tag": "TermReference" + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", + "tag": "TermReference" + }, + "segment": "D2" }, - "segment": "D2" - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Nat" - } + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] } ] } @@ -1946,39 +1914,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] }, @@ -1987,38 +1948,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"original\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"original\"" + } + ] } ] } @@ -2029,39 +1988,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] }, @@ -2070,38 +2022,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"updated\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"updated\"" + } + ] } ] } diff --git a/transcripts/share-apis/contribution-diffs/namespace-diff.json b/transcripts/share-apis/contribution-diffs/namespace-diff.json index ae631b21..8133dd82 100644 --- a/transcripts/share-apis/contribution-diffs/namespace-diff.json +++ b/transcripts/share-apis/contribution-diffs/namespace-diff.json @@ -489,38 +489,31 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" }, - "segment": "ability" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "AbilityUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "AbilityUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" + { + "annotation": { + "contents": "AbilityUpdateMe", + "tag": "HashQualifier" + }, + "segment": "AbilityUpdateMe" }, - "segment": " where" - } + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + ] } ] }, @@ -529,10 +522,12 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + "elements": [ + { + "annotation": null, + "segment": " " + } + ] }, { "diffTag": "annotationChange", @@ -548,28 +543,24 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + { + "annotation": null, + "segment": " " }, - "segment": "{" - } + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + ] }, { "diffTag": "annotationChange", @@ -585,29 +576,30 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + "elements": [ + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" }, - "segment": "}" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] } ] } @@ -618,38 +610,31 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" }, - "segment": "ability" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "AbilityUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "AbilityUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" + { + "annotation": { + "contents": "AbilityUpdateMe", + "tag": "HashQualifier" + }, + "segment": "AbilityUpdateMe" }, - "segment": " where" - } + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + ] } ] }, @@ -658,10 +643,12 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + "elements": [ + { + "annotation": null, + "segment": " " + } + ] }, { "diffTag": "annotationChange", @@ -677,28 +664,24 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + { + "annotation": null, + "segment": " " }, - "segment": "{" - } + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + ] }, { "diffTag": "annotationChange", @@ -714,29 +697,30 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + "elements": [ + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" }, - "segment": "}" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" - }, - "segment": "Text" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] } @@ -1007,48 +991,43 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" }, - "segment": "type" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "DataUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" }, - "segment": " = " - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", - "tag": "TermReference" - }, - "segment": "D" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", + "tag": "TermReference" + }, + "segment": "D" + } + ] } ] } @@ -1059,65 +1038,54 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" }, - "segment": "type" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "DataUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" }, - "segment": " = " - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", - "tag": "TermReference" + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", + "tag": "TermReference" + }, + "segment": "D2" }, - "segment": "D2" - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Nat" - } + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] } ] } @@ -1946,39 +1914,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] }, @@ -1987,38 +1948,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"original\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"original\"" + } + ] } ] } @@ -2029,39 +1988,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] }, @@ -2070,38 +2022,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"updated\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"updated\"" + } + ] } ] } diff --git a/transcripts/share-apis/contribution-diffs/standard-term-diff.json b/transcripts/share-apis/contribution-diffs/standard-term-diff.json index 553110e3..c105ce7a 100644 --- a/transcripts/share-apis/contribution-diffs/standard-term-diff.json +++ b/transcripts/share-apis/contribution-diffs/standard-term-diff.json @@ -8,39 +8,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] }, @@ -49,38 +42,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"original\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"original\"" + } + ] } ] } @@ -91,39 +82,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] }, @@ -132,38 +116,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "termUpdateMe", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "termUpdateMe", + "tag": "HashQualifier" + }, + "segment": "termUpdateMe" }, - "segment": "termUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"updated\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"updated\"" + } + ] } ] } diff --git a/transcripts/share-apis/contribution-diffs/standard-type-diff.json b/transcripts/share-apis/contribution-diffs/standard-type-diff.json index 4372f39c..0a3b0139 100644 --- a/transcripts/share-apis/contribution-diffs/standard-type-diff.json +++ b/transcripts/share-apis/contribution-diffs/standard-type-diff.json @@ -8,48 +8,43 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" }, - "segment": "type" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "DataUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" }, - "segment": " = " - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", - "tag": "TermReference" - }, - "segment": "D" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#a2bvb3g2l1mkijg24ogg0t23h51pnfepnngk6e3bqfijf4l9ms292t006e8faquo66ctn1ho35vtps13m6evbl6bos2guer5j6jcs1o#d0", + "tag": "TermReference" + }, + "segment": "D" + } + ] } ] } @@ -60,65 +55,54 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" }, - "segment": "type" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "DataUpdateMe", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "DataUpdateMe" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + { + "annotation": { + "contents": "DataUpdateMe", + "tag": "HashQualifier" + }, + "segment": "DataUpdateMe" }, - "segment": " = " - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", - "tag": "TermReference" + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#6t7t8lem3bmu3j7bsid4omn8gej2gl57ffmkp0ef6qndhndh2q3q6dd1j9akl653r3vtifsunovvbmbjh0iqc7n6rhp4imnsghhe6go#d0", + "tag": "TermReference" + }, + "segment": "D2" }, - "segment": "D2" - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Nat" - } + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] } ] } diff --git a/transcripts/share-apis/contributions/merged-contribution-diff.json b/transcripts/share-apis/contributions/merged-contribution-diff.json index 7d5beca9..407b6ad7 100644 --- a/transcripts/share-apis/contributions/merged-contribution-diff.json +++ b/transcripts/share-apis/contributions/merged-contribution-diff.json @@ -16,39 +16,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" }, - "segment": "term" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "##Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "HashQualifier" + }, + "segment": "##Text" + } + ] } ] }, @@ -57,38 +50,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" }, - "segment": "term" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"start\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"start\"" + } + ] } ] } @@ -99,39 +90,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" }, - "segment": "term" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "##Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "HashQualifier" + }, + "segment": "##Text" + } + ] } ] }, @@ -140,38 +124,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" }, - "segment": "term" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"feature-one\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"feature-one\"" + } + ] } ] } diff --git a/transcripts/share-apis/contributions/transitive-contribution-diff.json b/transcripts/share-apis/contributions/transitive-contribution-diff.json index 92af0887..59e4e004 100644 --- a/transcripts/share-apis/contributions/transitive-contribution-diff.json +++ b/transcripts/share-apis/contributions/transitive-contribution-diff.json @@ -16,39 +16,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" }, - "segment": "term" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "##Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "HashQualifier" + }, + "segment": "##Text" + } + ] } ] }, @@ -57,38 +50,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" }, - "segment": "term" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"feature-one\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"feature-one\"" + } + ] } ] } @@ -99,39 +90,32 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" }, - "segment": "term" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "HashQualifier" + { + "annotation": null, + "segment": " " }, - "segment": "##Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "HashQualifier" + }, + "segment": "##Text" + } + ] } ] }, @@ -140,38 +124,36 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "term", - "tag": "HashQualifier" + "elements": [ + { + "annotation": { + "contents": "term", + "tag": "HashQualifier" + }, + "segment": "term" }, - "segment": "term" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" }, - "segment": " =" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TextLiteral" - }, - "segment": "\"feature-two\"" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "TextLiteral" + }, + "segment": "\"feature-two\"" + } + ] } ] } diff --git a/transcripts/share-apis/definition-diffs/standard-ability-diff.json b/transcripts/share-apis/definition-diffs/standard-ability-diff.json index 7f17a75f..dacf1f3c 100644 --- a/transcripts/share-apis/definition-diffs/standard-ability-diff.json +++ b/transcripts/share-apis/definition-diffs/standard-ability-diff.json @@ -8,38 +8,41 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" }, - "segment": "ability" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "BeforeAbility", - "tag": "HashQualifier" - }, - "segment": "BeforeAbility" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "BeforeAbility", + "tag": "HashQualifier" + }, + "segment": "BeforeAbility" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" - }, - "segment": " where" - } + "elements": [ + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + ] } ] }, @@ -48,107 +51,106 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + "elements": [ + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#ebotvibo97n9s8ggp2n32jf6splp86102tjh70q395gmmdsfi45pvrvtkpot5e97ugg6t4j602ol001i3p28t62c8iga2rlma0ckfs0#a0", - "tag": "TermReference" - }, - "segment": "beforeAbility" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#ebotvibo97n9s8ggp2n32jf6splp86102tjh70q395gmmdsfi45pvrvtkpot5e97ugg6t4j602ol001i3p28t62c8iga2rlma0ckfs0#a0", + "tag": "TermReference" + }, + "segment": "beforeAbility" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeOperator" + "elements": [ + { + "annotation": null, + "segment": " " }, - "segment": "->" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" }, - "segment": "{" - } + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#ebotvibo97n9s8ggp2n32jf6splp86102tjh70q395gmmdsfi45pvrvtkpot5e97ugg6t4j602ol001i3p28t62c8iga2rlma0ckfs0", - "tag": "TypeReference" - }, - "segment": "BeforeAbility" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#ebotvibo97n9s8ggp2n32jf6splp86102tjh70q395gmmdsfi45pvrvtkpot5e97ugg6t4j602ol001i3p28t62c8iga2rlma0ckfs0", + "tag": "TypeReference" + }, + "segment": "BeforeAbility" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + "elements": [ + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" }, - "segment": "}" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] } @@ -159,38 +161,41 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "ability" }, - "segment": "ability" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "AfterAbility", - "tag": "HashQualifier" - }, - "segment": "AfterAbility" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "AfterAbility", + "tag": "HashQualifier" + }, + "segment": "AfterAbility" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" - }, - "segment": " where" - } + "elements": [ + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " where" + } + ] } ] }, @@ -199,107 +204,106 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + "elements": [ + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#i1i6tae2gi8jp12lukns1e027i98ekbqhh6p5b944i44l6otiltjphbnmt2r844e2ukr2kppob3c5gvdpegc6ej54h9eg2j9gkc6ifg#a0", - "tag": "TermReference" - }, - "segment": "afterAbility" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#i1i6tae2gi8jp12lukns1e027i98ekbqhh6p5b944i44l6otiltjphbnmt2r844e2ukr2kppob3c5gvdpegc6ej54h9eg2j9gkc6ifg#a0", + "tag": "TermReference" + }, + "segment": "afterAbility" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Int", - "tag": "TypeReference" - }, - "segment": "Int" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "##Int", + "tag": "TypeReference" + }, + "segment": "Int" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeOperator" + "elements": [ + { + "annotation": null, + "segment": " " }, - "segment": "->" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" }, - "segment": "{" - } + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "{" + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#i1i6tae2gi8jp12lukns1e027i98ekbqhh6p5b944i44l6otiltjphbnmt2r844e2ukr2kppob3c5gvdpegc6ej54h9eg2j9gkc6ifg", - "tag": "TypeReference" - }, - "segment": "AfterAbility" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "#i1i6tae2gi8jp12lukns1e027i98ekbqhh6p5b944i44l6otiltjphbnmt2r844e2ukr2kppob3c5gvdpegc6ej54h9eg2j9gkc6ifg", + "tag": "TypeReference" + }, + "segment": "AfterAbility" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "AbilityBraces" + "elements": [ + { + "annotation": { + "tag": "AbilityBraces" + }, + "segment": "}" }, - "segment": "}" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Text" - } + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] } ] } diff --git a/transcripts/share-apis/definition-diffs/standard-term-diff.json b/transcripts/share-apis/definition-diffs/standard-term-diff.json index 557b2f8d..e4a9ad8c 100644 --- a/transcripts/share-apis/definition-diffs/standard-term-diff.json +++ b/transcripts/share-apis/definition-diffs/standard-term-diff.json @@ -7,703 +7,86 @@ "kind": "changed", "value": [ { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "beforeTerm", - "tag": "HashQualifier" - }, - "segment": "beforeTerm" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" - }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeOperator" - }, - "segment": "->" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeOperator" - }, - "segment": "->" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelayForceChar" - }, - "segment": "'" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } - } - ] - }, - { - "kind": "changed", - "value": [ - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "beforeTerm", - "tag": "HashQualifier" - }, - "segment": "beforeTerm" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "x" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "y" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" - }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" - }, - "segment": "do" - } - } - ] - }, - { - "kind": "unchanged", - "value": [ - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "UseKeyword" - }, - "segment": "use " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "UsePrefix" - }, - "segment": "Nat" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "UseSuffix" - }, - "segment": "+" - } - } - ] - }, - { - "kind": "changed", - "value": [ - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "myList", - "tag": "HashQualifier" - }, - "segment": "myList" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" - }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": "[" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "x" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": ", " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "y" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": ", " - } - }, - { - "diffTag": "annotationChange", - "fromAnnotation": { - "contents": "#gmjjuqjosr81oqnm9ck6atmve2tnnuu4c5nk89apmg79nsu5djpl6av0os0ekqil0gekdjoianh1rrem7lddsq2i26itq40tbkfgon0", - "tag": "TermReference" - }, - "segment": "valueChangesButNameStaysSame", - "toAnnotation": { - "contents": "#gjmq673r1vrurfotlnirv7vutdhm6sa3s02em5g22kk606mv6duvv8be402dv79312i4a0onepq5bo7citsodvq2g720nttj0ee9p0g", - "tag": "TermReference" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": ", " - } - }, - { - "annotation": { - "contents": "#pi25gcdv0oq0no6k2ahe6t849u7ht4lopeg5fve58ga5t17a49f1dkbmdm6dn063bn3tsd4adijr4ltf7ad6do8u71oa72i27oack2o", - "tag": "TermReference" - }, - "diffTag": "segmentChange", - "fromSegment": "nameChangesButValueStaysSame", - "toSegment": "changedNameWithSameValue" - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": "]" - } - } - ] - }, - { - "kind": "changed", - "value": [ - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "myList2", - "tag": "HashQualifier" - }, - "segment": "myList2" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" - }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "#6frvp5jfjtt7odi9769i0p5phuuuij1fi1d9l5ncpelh416ab3vceaphhaijh0ct0v9n793j7e4h78687oij6ai97085u63m264gj5o", - "tag": "TermReference" - }, - "segment": "List.map" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Parenthesis" - }, - "segment": "(" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": "x" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" - }, - "segment": " ->" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "x" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat.+", - "tag": "TermReference" - }, - "segment": "+" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "NumericLiteral" - }, - "segment": "1" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Parenthesis" - }, - "segment": ")" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "myList" - } - } - ] - }, - { - "kind": "unchanged", - "value": [ - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##List.size", - "tag": "TermReference" - }, - "segment": "List.size" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "myList2" - } - } - ] - } - ], - "right": [ - { - "kind": "changed", - "value": [ - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "afterTerm", - "tag": "HashQualifier" - }, - "segment": "afterTerm" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" - }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeOperator" - }, - "segment": "->" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeOperator" - }, - "segment": "->" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TypeOperator" - }, - "segment": "->" - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelayForceChar" - }, - "segment": "'" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" - }, - "segment": "Nat" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "beforeTerm", + "tag": "HashQualifier" + }, + "segment": "beforeTerm" + } + ] + }, + { + "diffTag": "both", + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "DelayForceChar" + }, + "segment": "'" + }, + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] } ] }, @@ -711,87 +94,317 @@ "kind": "changed", "value": [ { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "afterTerm", - "tag": "HashQualifier" - }, - "segment": "afterTerm" - } - }, + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "beforeTerm", + "tag": "HashQualifier" + }, + "segment": "beforeTerm" + } + ] + }, + { + "diffTag": "both", + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "x" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "y" + }, + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": "do" + } + ] + } + ] + }, + { + "kind": "unchanged", + "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "UseKeyword" + }, + "segment": "use " + }, + { + "annotation": { + "tag": "UsePrefix" + }, + "segment": "Nat" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "UseSuffix" + }, + "segment": "+" + } + ] + } + ] + }, + { + "kind": "changed", + "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "x" - } + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "myList", + "tag": "HashQualifier" + }, + "segment": "myList" + }, + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": "[" + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "x" + }, + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "y" + }, + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " + "diffTag": "annotationChange", + "fromAnnotation": { + "contents": "#gmjjuqjosr81oqnm9ck6atmve2tnnuu4c5nk89apmg79nsu5djpl6av0os0ekqil0gekdjoianh1rrem7lddsq2i26itq40tbkfgon0", + "tag": "TermReference" + }, + "segment": "valueChangesButNameStaysSame", + "toAnnotation": { + "contents": "#gjmq673r1vrurfotlnirv7vutdhm6sa3s02em5g22kk606mv6duvv8be402dv79312i4a0onepq5bo7citsodvq2g720nttj0ee9p0g", + "tag": "TermReference" } }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "y" - } + "elements": [ + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "z" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" - }, - "segment": " =" - } + "annotation": { + "contents": "#pi25gcdv0oq0no6k2ahe6t849u7ht4lopeg5fve58ga5t17a49f1dkbmdm6dn063bn3tsd4adijr4ltf7ad6do8u71oa72i27oack2o", + "tag": "TermReference" + }, + "diffTag": "segmentChange", + "fromSegment": "nameChangesButValueStaysSame", + "toSegment": "changedNameWithSameValue" }, { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, + "elements": [ + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": "]" + } + ] + } + ] + }, + { + "kind": "changed", + "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" - }, - "segment": "do" - } + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "myList2", + "tag": "HashQualifier" + }, + "segment": "myList2" + }, + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "#6frvp5jfjtt7odi9769i0p5phuuuij1fi1d9l5ncpelh416ab3vceaphhaijh0ct0v9n793j7e4h78687oij6ai97085u63m264gj5o", + "tag": "TermReference" + }, + "segment": "List.map" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Parenthesis" + }, + "segment": "(" + }, + { + "annotation": null, + "segment": "x" + }, + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " ->" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "x" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Nat.+", + "tag": "TermReference" + }, + "segment": "+" + }, + { + "annotation": null, + "segment": " " + } + ] + }, + { + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "NumericLiteral" + }, + "segment": "1" + } + ] + }, + { + "diffTag": "both", + "elements": [ + { + "annotation": { + "tag": "Parenthesis" + }, + "segment": ")" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "myList" + } + ] } ] }, @@ -800,44 +413,149 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "UseKeyword" - }, - "segment": "use " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "UsePrefix" - }, - "segment": "Nat" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##List.size", + "tag": "TermReference" + }, + "segment": "List.size" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "myList2" + } + ] + } + ] + } + ], + "right": [ + { + "kind": "changed", + "value": [ { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "UseSuffix" - }, - "segment": "+" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "afterTerm", + "tag": "HashQualifier" + }, + "segment": "afterTerm" + } + ] + }, + { + "diffTag": "both", + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + }, + { + "annotation": null, + "segment": " " + } + ] + }, + { + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "TypeOperator" + }, + "segment": "->" + }, + { + "annotation": null, + "segment": " " + } + ] + }, + { + "diffTag": "both", + "elements": [ + { + "annotation": { + "tag": "DelayForceChar" + }, + "segment": "'" + }, + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] } ] }, @@ -845,85 +563,177 @@ "kind": "changed", "value": [ { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "myList", - "tag": "HashQualifier" - }, - "segment": "myList" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" - }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": "[" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "x" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": ", " - } - }, + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "afterTerm", + "tag": "HashQualifier" + }, + "segment": "afterTerm" + } + ] + }, + { + "diffTag": "both", + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "x" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "y" + } + ] + }, + { + "diffTag": "oneSided", + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "z" + } + ] + }, + { + "diffTag": "both", + "elements": [ + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": "do" + } + ] + } + ] + }, + { + "kind": "unchanged", + "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "y" - } - }, + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "UseKeyword" + }, + "segment": "use " + }, + { + "annotation": { + "tag": "UsePrefix" + }, + "segment": "Nat" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "UseSuffix" + }, + "segment": "+" + } + ] + } + ] + }, + { + "kind": "changed", + "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": ", " - } + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "myList", + "tag": "HashQualifier" + }, + "segment": "myList" + }, + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": "[" + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "x" + }, + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "y" + }, + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + ] }, { "diffTag": "annotationChange", @@ -939,13 +749,15 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": ", " - } + "elements": [ + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": ", " + } + ] }, { "annotation": { @@ -958,13 +770,15 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Sequence", - "tag": "TypeReference" - }, - "segment": "]" - } + "elements": [ + { + "annotation": { + "contents": "##Sequence", + "tag": "TypeReference" + }, + "segment": "]" + } + ] } ] }, @@ -973,152 +787,113 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "myList2", - "tag": "HashQualifier" - }, - "segment": "myList2" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "BindingEquals" - }, - "segment": " =" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "#6frvp5jfjtt7odi9769i0p5phuuuij1fi1d9l5ncpelh416ab3vceaphhaijh0ct0v9n793j7e4h78687oij6ai97085u63m264gj5o", - "tag": "TermReference" - }, - "segment": "List.map" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Parenthesis" - }, - "segment": "(" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": "x" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "ControlKeyword" - }, - "segment": " ->" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "x" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat.+", - "tag": "TermReference" - }, - "segment": "+" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "z" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Parenthesis" - }, - "segment": ")" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "myList" - } + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "myList2", + "tag": "HashQualifier" + }, + "segment": "myList2" + }, + { + "annotation": { + "tag": "BindingEquals" + }, + "segment": " =" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "#6frvp5jfjtt7odi9769i0p5phuuuij1fi1d9l5ncpelh416ab3vceaphhaijh0ct0v9n793j7e4h78687oij6ai97085u63m264gj5o", + "tag": "TermReference" + }, + "segment": "List.map" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Parenthesis" + }, + "segment": "(" + }, + { + "annotation": null, + "segment": "x" + }, + { + "annotation": { + "tag": "ControlKeyword" + }, + "segment": " ->" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "x" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Nat.+", + "tag": "TermReference" + }, + "segment": "+" + }, + { + "annotation": null, + "segment": " " + } + ] + }, + { + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "Var" + }, + "segment": "z" + } + ] + }, + { + "diffTag": "both", + "elements": [ + { + "annotation": { + "tag": "Parenthesis" + }, + "segment": ")" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "myList" + } + ] } ] }, @@ -1127,36 +902,29 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##List.size", - "tag": "TermReference" - }, - "segment": "List.size" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "Var" - }, - "segment": "myList2" - } + "elements": [ + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##List.size", + "tag": "TermReference" + }, + "segment": "List.size" + }, + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "tag": "Var" + }, + "segment": "myList2" + } + ] } ] } diff --git a/transcripts/share-apis/definition-diffs/standard-type-diff.json b/transcripts/share-apis/definition-diffs/standard-type-diff.json index a86ef22d..2308b430 100644 --- a/transcripts/share-apis/definition-diffs/standard-type-diff.json +++ b/transcripts/share-apis/definition-diffs/standard-type-diff.json @@ -8,47 +8,47 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" }, - "segment": "type" - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "BeforeType", - "tag": "HashQualifier" - }, - "segment": "BeforeType" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "BeforeType", + "tag": "HashQualifier" + }, + "segment": "BeforeType" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + "elements": [ + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " }, - "segment": " = " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" - }, - "segment": "{ " - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": "{ " + } + ] }, { "diffTag": "annotationChange", @@ -64,38 +64,31 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Nat" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" }, - "segment": " }" - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " }" + } + ] } ] } @@ -106,47 +99,47 @@ "value": [ { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DataTypeKeyword" + "elements": [ + { + "annotation": { + "tag": "DataTypeKeyword" + }, + "segment": "type" }, - "segment": "type" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } + { + "annotation": null, + "segment": " " + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "AfterType", - "tag": "HashQualifier" - }, - "segment": "AfterType" - } + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "contents": "AfterType", + "tag": "HashQualifier" + }, + "segment": "AfterType" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" + "elements": [ + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " = " }, - "segment": " = " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" - }, - "segment": "{ " - } + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": "{ " + } + ] }, { "diffTag": "annotationChange", @@ -162,90 +155,75 @@ }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + "elements": [ + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": " :" - } - }, - { - "diffTag": "both", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "both", - "elements": { - "annotation": { - "contents": "##Nat", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "Nat" - } + { + "annotation": { + "contents": "##Nat", + "tag": "TypeReference" + }, + "segment": "Nat" + } + ] }, { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "DelimiterChar" + "diffTag": "oneSided", + "elements": [ + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": "," }, - "segment": "," - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "#kumofu6ae22blpbip9rl33nvbkqfho86mohivuum8uabph37i4po78fi0120hmka4blrabancldnp93o75s35cc18vi8o9hdu3qrku8", - "tag": "TypeReference" + { + "annotation": null, + "segment": " " }, - "segment": "fieldTwo" - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "tag": "TypeAscriptionColon" + { + "annotation": { + "contents": "#kumofu6ae22blpbip9rl33nvbkqfho86mohivuum8uabph37i4po78fi0120hmka4blrabancldnp93o75s35cc18vi8o9hdu3qrku8", + "tag": "TypeReference" + }, + "segment": "fieldTwo" }, - "segment": " :" - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": null, - "segment": " " - } - }, - { - "diffTag": "one-sided", - "elements": { - "annotation": { - "contents": "##Text", - "tag": "TypeReference" + { + "annotation": { + "tag": "TypeAscriptionColon" + }, + "segment": " :" }, - "segment": "Text" - } + { + "annotation": null, + "segment": " " + }, + { + "annotation": { + "contents": "##Text", + "tag": "TypeReference" + }, + "segment": "Text" + } + ] }, { "diffTag": "both", - "elements": { - "annotation": { - "tag": "DelimiterChar" - }, - "segment": " }" - } + "elements": [ + { + "annotation": { + "tag": "DelimiterChar" + }, + "segment": " }" + } + ] } ] } From 6f4107df83ee0f556e4380876d40109ec4138180 Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Wed, 15 Oct 2025 11:37:58 -0700 Subject: [PATCH 5/5] Bump unison again --- unison | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unison b/unison index 28bd62ab..b3418a8f 160000 --- a/unison +++ b/unison @@ -1 +1 @@ -Subproject commit 28bd62ab403d66a843b09102e2c7564e99776b57 +Subproject commit b3418a8fd17532d5aa87b83a6632d7190a8fb0b1