averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
weird-codegen
swift-mirror/test/Migrator/Inputs/API.json
Nathan Hawes 43c2f27783 [Refactoring][Migrator] Fix rename of callsites with a trailing closure argument 
A label range of 0 length was being reported as the label of trailing closure
arguments, just before the opening '{'.

For the rename refactoring, this meant that if the corresponding parameter had
an external label (e.g. 'a') the occurrence would be treated as not matching the
expected symbol name, and so not be updated at all.

For the migrator, when renaming a function with an unlabelled closure for its
last parameter to have a label, it would incorrectly insert the new label in
front of the opening '{' on all of that function's callsites with trailing
closures.

Resolves rdar://problem/42162571
2018-12-19 16:24:14 -08:00

566 lines
15 KiB
JSON
Raw Permalink Blame History

[
{
"DiffItemKind": "TypeMemberDiffItem",
"Usr": "c:@barGlobalVariable",
"OldPrintedName": "barGlobalVariable",
"NewPrintedName": "memberVariable",
"NewTypeName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Var",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "c:@SA@SomeItemSet@FI@theSimpleOldName",
"LeftComment": "theSimpleOldName",
"RightUsr": "",
"RightComment": "theSimpleNewName",
"ModuleName": "SomeModule"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Var",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "c:@SA@SomeItemSet@FI@theSimpleOldNameNotToRename",
"LeftComment": "theSimpleOldNameNotToRename",
"RightUsr": "",
"RightComment": "__theSimpleNewName",
"ModuleName": "SomeModule"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "c:@F@barGlobalFuncOldName",
"LeftComment": "",
"RightUsr": "",
"RightComment": "barGlobalFuncNewName(newlabel:)",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)PropertyUserInterface(cm)methodPlus",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)PropertyUserInterface(cm)methodPlus",
"LeftComment": "",
"RightUsr": "",
"RightComment": "newMethodPlus()",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)BarForwardDeclaredClass(im)barInstanceFunc1:anotherValue:anotherValue1:anotherValue2:",
"LeftComment": "",
"RightUsr": "",
"RightComment": "barNewInstanceFunc1(newlabel1:newlabel2:newlabel3:newlabel4:)",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)BarForwardDeclaredClass(im)barInstanceFunc2:toRemove:toRemove1:toRemove2:",
"LeftComment": "",
"RightUsr": "",
"RightComment": "barNewInstanceFunc2(_:_:NotToRemove1:_:)",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Constructor",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)BarForwardDeclaredClass(im)initWithOldLabel0:",
"LeftComment": "",
"RightUsr": "",
"RightComment": "init(newlabel1:)",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Var",
"NodeAnnotation": "ModernizeEnum",
"ChildIndex": "0",
"LeftUsr": "c:@barGlobalVariableOldEnumElement",
"LeftComment": "",
"RightUsr": "",
"RightComment": "NewEnum.enumElement",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "GetterToProperty",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)PropertyUserInterface(im)field",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "GetterToProperty",
"ChildIndex": "0",
"LeftUsr": "c:@M@null@objc(cs)C(im)field2",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "SetterToProperty",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)PropertyUserInterface(im)setField:",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "SetterToProperty",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)PropertyUserInterface(im)setURL:",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "bar"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "UnwrapOptional",
"ChildIndex": "2",
"LeftUsr": "s:6CitiesAAC10mooloolaba1x1yyAB_ABSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "1",
"LeftUsr": "s:6CitiesAAC10mooloolaba1x1yyAB_ABSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "1:0",
"LeftUsr": "s:6CitiesAAC9toowoomba1x1yySayABG_AFSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "UnwrapOptional",
"ChildIndex": "2",
"LeftUsr": "s:6CitiesAAC9toowoomba1x1yySayABG_AFSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "2:0:0",
"LeftUsr": "s:6CitiesAAC9toowoomba1x1yySayABG_AFSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "UnwrapOptional",
"ChildIndex": "1:1",
"LeftUsr": "s:6CitiesAAC7mareeba1x1yySDySSABSgG_SDySSABGSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "1:0",
"LeftUsr": "s:6CitiesAAC7mareeba1x1yySDySSABSgG_SDySSABGSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "UnwrapOptional",
"ChildIndex": "2",
"LeftUsr": "s:6CitiesAAC7mareeba1x1yySDySSABSgG_SDySSABGSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "TypeRewritten",
"ChildIndex": "2:0:0",
"LeftUsr": "s:6CitiesAAC7mareeba1x1yySDySSABSgG_SDySSABGSgtF",
"LeftComment": "String",
"RightUsr": "",
"RightComment": "Int",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "ImplicitOptionalToOptional",
"ChildIndex": "1",
"LeftUsr": "s:6CitiesAAC7yandina1xySaySDySSABGGSg_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "TypeRewritten",
"ChildIndex": "1:0:0:0",
"LeftUsr": "s:6CitiesAAC7yandina1xySaySDySSABGGSg_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "Int",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "TypeRewritten",
"ChildIndex": "0:0",
"LeftUsr": "s:6CitiesAAC7buderimABSgyF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "Cities & ExtraCities",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "UnwrapOptional",
"ChildIndex": "0:0",
"LeftUsr": "s:6CitiesAAC5noosaSaySDySSABGSgGyF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "TypeRewritten",
"ChildIndex": "0:0:0:0",
"LeftUsr": "s:6CitiesAAC5noosaSaySDySSABGSgGyF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "Int",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "TypeRewritten",
"ChildIndex": "1:1:1:0:0",
"LeftUsr": "s:6Cities05ExtraA0P6coolum1xySDySSSDySiSaySSSgGGG_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "[String]",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "UnwrapOptional",
"ChildIndex": "1:1:1:0",
"LeftUsr": "s:6Cities05ExtraA0P6coolum1xySDySSSDySiSaySSSgGGG_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "1",
"LeftUsr": "s:6Cities05ExtraA0P6tc_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "1",
"LeftUsr": "s:6Cities05ExtraA0P6blibli1xySSSgAF_SStXE_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "1",
"LeftUsr": "s:6Cities05ExtraA0P6blibli1xySSSgAF_SStXE_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "ImplicitOptionalToOptional",
"ChildIndex": "1:0",
"LeftUsr": "s:6Cities05ExtraA0P6blibli1xySSSgAF_SStXE_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "UnwrapOptional",
"ChildIndex": "1:1:0",
"LeftUsr": "s:6Cities05ExtraA0P6blibli1xySSSgAF_SStXE_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "ImplicitOptionalToOptional",
"ChildIndex": "1",
"LeftUsr": "s:6Cities05ExtraA0P10currimundi1xySi_Si_SittSg_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "1:0:1:0",
"LeftUsr": "s:6Cities05ExtraA0P10currimundi1xySi_Si_SittSg_tF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "1",
"LeftUsr": "s:6CitiesAAC1xABSi_tcfc",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "WrapOptional",
"ChildIndex": "0",
"LeftUsr": "s:6CitiesAAC1xABSi_tcfc",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "ImplicitOptionalToOptional",
"ChildIndex": "0",
"LeftUsr": "s:6CitiesAAC1yABSgSi_tcfc",
"LeftComment": "",
"RightUsr": "",
"RightComment": "",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "s:6CitiesAAC10mooloolaba1x1yyAB_ABSgtF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "newMooloolaba(newX:newY:)",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "s:6Cities04MoreA0P14setZooLocation1x1y1zySi_S2itF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "setZooLocationNew(newX:newY:newZ:)",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "s:6Cities04MoreA0P8addZooAt_1y1zySi_S2itF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "addNewZooAt(_:newY:newZ:)",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "TypeRewritten",
"ChildIndex": "1:0",
"LeftUsr": "s:6CitiesAAC8maroochy1x1yySiSg_AFtF",
"LeftComment": "Int",
"RightUsr": "",
"RightComment": "(Int) -> Int",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "TypeRewritten",
"ChildIndex": "2:0",
"LeftUsr": "s:6CitiesAAC8maroochy1x1yySiSg_AFtF",
"LeftComment": "Int",
"RightUsr": "",
"RightComment": "(Int) -> Int",
"ModuleName": "Cities"
},
{
"DiffItemKind": "TypeMemberDiffItem",
"Usr": "c:@shouldnontexist",
"OldPrintedName": "exampleGlobalFunc(a:b:c:)",
"NewPrintedName": "MemberFunc(a:)",
"NewTypeName": "example",
"SelfIndex": 0,
"RemovedIndex": 1
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "TypeDecl",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "c:objc(cs)BarBaseNested",
"LeftComment": "BarBaseNested",
"RightUsr": "",
"RightComment": "BarBase.Nested",
"ModuleName": "bar"
},
{
"DiffItemKind": "TypeMemberDiffItem",
"Usr": "c:@F@barGlobalHoistedFuncOldName",
"OldPrintedName": "barGlobalHoistedFuncOldName(_:_:_:)",
"OldTypeName": "",
"NewPrintedName": "newName(is:at:for:)",
"NewTypeName": "AwesomeWrapper"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "TypeRewritten",
"ChildIndex": "1:1:0:0:0",
"LeftUsr": "s:6Cities12ToplevelTypeC6memberyyySayypGSgcF",
"LeftComment": "Any",
"RightUsr": "",
"RightComment": "Int",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Function",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "s:6Cities12ToplevelTypeC8trailingyyySayypGSgcF",
"LeftComment": "",
"RightUsr": "",
"RightComment": "trailing2(a:)",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "TypeDecl",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "s:6Cities10FontWeightO",
"LeftComment": "FontWeight",
"RightUsr": "",
"RightComment": "FontWeighting",
"ModuleName": "Cities"
},
{
"DiffItemKind": "CommonDiffItem",
"NodeKind": "Var",
"NodeAnnotation": "Rename",
"ChildIndex": "0",
"LeftUsr": "s:6CitiesAAC6yogurtSivp",
"LeftComment": "yogurt",
"RightUsr": "",
"RightComment": "cheese",
"ModuleName": "Cities"
},
]
Reference in New Issue View Git Blame Copy Permalink