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/exprConcatNumeric2String | |
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/exprConcatNumeric2String')
3 files changed, 27 insertions, 0 deletions
diff --git a/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.items b/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.items new file mode 100644 index 000000000000..46d6b1f5a15f --- /dev/null +++ b/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.items @@ -0,0 +1,9 @@ +Types: +PsiParameter:pns : java.lang.String +PsiReferenceExpression:pns : java.lang.String +PsiReferenceExpression:pns : java.lang.String + +Conversions: + +New expression type changes: +Fails: diff --git a/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.java b/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.java new file mode 100644 index 000000000000..5ce2b795d268 --- /dev/null +++ b/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/after/Expr.java @@ -0,0 +1,9 @@ +class Expr { + private String myString; + public void meth(String pns, String ps) { + myString = ps + ps; + myString = ps + pns; + myString = pns + ps; + myString += ps; + } +} diff --git a/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/before/Expr.java b/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/before/Expr.java new file mode 100644 index 000000000000..71b89f955e59 --- /dev/null +++ b/java/typeMigration/testData/refactoring/migrateTypeSignature/exprConcatNumeric2String/before/Expr.java @@ -0,0 +1,9 @@ +class Expr { + private String myString; + public void meth(int pns, String ps) { + myString = ps + ps; + myString = ps + pns; + myString = pns + ps; + myString += ps; + } +} |