diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /java/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'java/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items')
-rw-r--r-- | java/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/java/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items b/java/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items new file mode 100644 index 000000000000..a1472a46da67 --- /dev/null +++ b/java/typeMigration/testData/refactoring/migrateTypeSignature/exprNewArrayReftype2Lvalue/after/Expr.items @@ -0,0 +1,34 @@ +Types: +PsiArrayInitializerExpression:{pcc} : FaceParent[] +PsiArrayInitializerExpression:{pcp} : FaceParent[] +PsiArrayInitializerExpression:{pfc, pcp, pcc} : FaceParent[] +PsiArrayInitializerExpression:{pfc} : FaceParent[] +PsiArrayInitializerExpression:{{pfc}, {pcp}, {pcc}} : FaceParent[][] +PsiField:myArrayOne : FaceParent[] +PsiField:myArrayTwo : FaceParent[][] +PsiNewExpression:new FaceChild[][]{{pfc}, {pcp}, {pcc}} : FaceParent[][] +PsiNewExpression:new FaceChild[]{pfc, pcp, pcc} : FaceParent[] +PsiParameter:pcc : ClassChild +PsiParameter:pcp : ClassParent +PsiParameter:pfc : FaceParent +PsiReferenceExpression:myArrayOne : FaceParent[] +PsiReferenceExpression:myArrayTwo : FaceParent[][] +PsiReferenceExpression:pcc : ClassChild +PsiReferenceExpression:pcc : ClassChild +PsiReferenceExpression:pcp : ClassParent +PsiReferenceExpression:pcp : ClassParent +PsiReferenceExpression:pfc : FaceParent +PsiReferenceExpression:pfc : FaceParent + +Conversions: +pcc -> $ +pcc -> $ +pcp -> $ +pcp -> $ +pfc -> $ +pfc -> $ + +New expression type changes: +new FaceChild[][]{{pfc}, {pcp}, {pcc}} -> FaceParent[][] +new FaceChild[]{pfc, pcp, pcc} -> FaceParent[] +Fails: |