Misc refactoring and test fixes

This changeset turns on automatic formatting of the affected regions
in extract include, change layout, wrap in and style refactorings.

It also fixes a couple of minor bugs - one handling empty tags in the
change widget type refactoring, and one handling selection offsets.

It also turns on automatic formatting of GUI editor changes (there was
a previous changeset which prepared for this but forgot to actually
switch the default option.)

This changeset also makes various test infrastructure fixes: code
completion tests recently stopped working for a number of files
(something about the initialization order of editor types when running
as tests).  I also tweaked the goldenfile format of the diffs to avoid
trailing diffs on lines with just a ">" or "<" since gerrit makes thee
light up in red.

Change-Id: I78b858f0b21e5b2f25a9566ad495bad09c66a18f

1 files changed, 8 insertions, 2 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RelativeLayoutConversionHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RelativeLayoutConversionHelper.java
index c9cb32cc5..da2bb2bc1 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RelativeLayoutConversionHelper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RelativeLayoutConversionHelper.java
@@ -66,6 +66,7 @@ import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.layout.gle2.CanvasViewInfo;
 import com.android.ide.eclipse.adt.internal.editors.layout.gle2.DomUtilities;
+import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs;
 import com.android.util.Pair;
 
 import org.eclipse.core.runtime.IStatus;
@@ -119,6 +120,10 @@ class RelativeLayoutConversionHelper {
 
     /** Performs conversion from any layout to a RelativeLayout */
     public void convertToRelative() {
+        if (mRootView == null) {
+            return;
+        }
+
         // Locate the view for the layout
         CanvasViewInfo layoutView = findViewForElement(mRootView, mLayout);
         if (layoutView == null || layoutView.getChildren().size() == 0) {
@@ -208,7 +213,7 @@ class RelativeLayoutConversionHelper {
         if (mFlatten && delete.size() > 0) {
             for (Element element : delete) {
                 mRefactoring.removeElementTags(mRootEdit, element, delete,
-                        true /*changeIndentation*/);
+                        !AdtPrefs.getPrefs().getFormatGuiXml() /*changeIndentation*/);
             }
         }
     }
@@ -558,7 +563,8 @@ class RelativeLayoutConversionHelper {
                 }
             }
 
-            if (baselineRef != null && !baselineRef.getId().equals(childView.getId())) {
+            if (baselineRef != null && baselineRef.getId() != null
+                    && !baselineRef.getId().equals(childView.getId())) {
                 assert !isVertical;
                 // Only align if they share the same gravity
                 if ((childView.getGravity() & GRAVITY_VERT_MASK) ==