diff options
author | Jerome Gaillard <jgaillard@google.com> | 2015-04-23 14:57:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 14:57:00 +0000 |
commit | 33f5b250643b479ad3674958345750f8d895e684 (patch) | |
tree | a7d19be2f28518e0453c42b42b554ab138ed4ddb | |
parent | 89f03e3d1102af10b6c49d56d89ecb780b81243a (diff) | |
parent | 22cdff3eb6eb0bdffbe2ac7fe2be4f41a7ee9615 (diff) | |
download | idea-33f5b250643b479ad3674958345750f8d895e684.tar.gz |
am 22cdff3e: am 3e879bac: Merge "Fixes refactor bug when renaming style that has children" into studio-1.3-dev automerge: 872dee0 automerge: 68be293
* commit '22cdff3eb6eb0bdffbe2ac7fe2be4f41a7ee9615':
Fixes refactor bug when renaming style that has children
4 files changed, 27 insertions, 0 deletions
diff --git a/android/src/org/jetbrains/android/dom/converters/ParentStyleConverter.java b/android/src/org/jetbrains/android/dom/converters/ParentStyleConverter.java index 5c71d0eb9b4..d052b5ac4e0 100644 --- a/android/src/org/jetbrains/android/dom/converters/ParentStyleConverter.java +++ b/android/src/org/jetbrains/android/dom/converters/ParentStyleConverter.java @@ -27,6 +27,7 @@ import org.jetbrains.android.dom.resources.ResourceNameConverter; import org.jetbrains.android.dom.resources.ResourceValue; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; @@ -105,4 +106,12 @@ public class ParentStyleConverter extends ResourceReferenceConverter { } return result.toArray(new PsiReference[result.size()]); } + + @Override + public String toString(@Nullable ResourceValue element, ConvertContext context) { + if (element.getPrefix() == '@') { + return element.toString(); + } + return super.toString(element, context); + } } diff --git a/android/testData/rename/styles10.xml b/android/testData/rename/styles10.xml new file mode 100644 index 00000000000..1aa170a1489 --- /dev/null +++ b/android/testData/rename/styles10.xml @@ -0,0 +1,7 @@ +<resources> + <style name="mySt<caret>yle"> + </style> + + <style name="st" parent="@style/myStyle"> + </style> +</resources> diff --git a/android/testData/rename/styles10_after.xml b/android/testData/rename/styles10_after.xml new file mode 100644 index 00000000000..5ad6249c122 --- /dev/null +++ b/android/testData/rename/styles10_after.xml @@ -0,0 +1,7 @@ +<resources> + <style name="newStyle"> + </style> + + <style name="st" parent="@style/newStyle"> + </style> +</resources> diff --git a/android/testSrc/org/jetbrains/android/AndroidRenameTest.java b/android/testSrc/org/jetbrains/android/AndroidRenameTest.java index a3aa557d1ba..81b46637bef 100644 --- a/android/testSrc/org/jetbrains/android/AndroidRenameTest.java +++ b/android/testSrc/org/jetbrains/android/AndroidRenameTest.java @@ -219,6 +219,10 @@ public class AndroidRenameTest extends AndroidTestCase { doTestStyleInheritance("styles9.xml", "styles9_after.xml"); } + public void testStyleInheritance9() throws Throwable { + doTestStyleInheritance("styles10.xml", "styles10_after.xml"); + } + private void doTestStyleInheritance(String before, String after) throws IOException { doTestStyleInheritance(before, after, "newStyle"); } |