Split up EditorUtil

... to `EditorUtil` and `ReformatUtil`. This is to get rid of the
circular dependency between `android/src/com/android/tools/idea/util/`
and "android/src/org/jetbrains/android/uipreview/", which is for the
next step to extract "uipreview" and the related out of
`intellij.android.core` module.

Here, we make `EditorUtil` sit with `AndroidEditorSettings` inside
`uipreview` package. And now `uipreview` package depends on `util`
package.

Bug: 202967571
Test: n/a
Change-Id: I9684d8bdbadc7aa3062797a6dec70125754ecf4b

2 files changed, 4 insertions, 3 deletions

diff --git a/android-lint/src/com/android/tools/idea/lint/quickFixes/GenerateMotionSceneFix.kt b/android-lint/src/com/android/tools/idea/lint/quickFixes/GenerateMotionSceneFix.kt
index 531e990b835..bad6d4f9802 100644
--- a/android-lint/src/com/android/tools/idea/lint/quickFixes/GenerateMotionSceneFix.kt
+++ b/android-lint/src/com/android/tools/idea/lint/quickFixes/GenerateMotionSceneFix.kt
@@ -27,7 +27,7 @@ import com.android.resources.ResourceUrl
 import com.android.tools.idea.lint.common.AndroidQuickfixContexts
 import com.android.tools.idea.lint.common.LintIdeQuickFix
 import com.android.tools.idea.res.ResourceRepositoryManager
-import com.android.tools.idea.util.EditorUtil
+import com.android.tools.idea.util.ReformatUtil
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.vfs.VfsUtil
@@ -37,6 +37,7 @@ import com.intellij.psi.xml.XmlTag
 import org.intellij.lang.annotations.Language
 import org.jetbrains.android.facet.AndroidFacet
 import org.jetbrains.android.facet.ResourceFolderManager
+import org.jetbrains.android.uipreview.EditorUtil
 import org.jetbrains.android.util.AndroidUtils.createChildDirectoryIfNotExist
 import java.io.IOException
 
@@ -69,7 +70,7 @@ class GenerateMotionSceneFix(val url: ResourceUrl) : LintIdeQuickFix {
         val xmlDir = createChildDirectoryIfNotExist(project, primaryResourceDir, FD_RES_XML)
         val resFile = xmlDir.createChildData(project, "${url.name}$DOT_XML")
         VfsUtil.saveText(resFile, generateMotionSceneContent(widgetId))
-        EditorUtil.reformatAndRearrange(project, resFile)
+        ReformatUtil.reformatAndRearrange(project, resFile)
         EditorUtil.openEditor(project, resFile)
         EditorUtil.selectEditor(project, resFile)
         motionTag?.setAttribute(ATTR_CONSTRAINT_LAYOUT_DESCRIPTION, AUTO_URI, url.toString())
diff --git a/android-lint/src/com/android/tools/idea/lint/quickFixes/MoveToDebugManifestQuickFix.java b/android-lint/src/com/android/tools/idea/lint/quickFixes/MoveToDebugManifestQuickFix.java
index 91c0645a592..9a709d25977 100644
--- a/android-lint/src/com/android/tools/idea/lint/quickFixes/MoveToDebugManifestQuickFix.java
+++ b/android-lint/src/com/android/tools/idea/lint/quickFixes/MoveToDebugManifestQuickFix.java
@@ -26,7 +26,6 @@ import com.android.tools.idea.gradle.model.IdeBuildTypeContainer;
 import com.android.tools.idea.gradle.project.model.AndroidModuleModel;
 import com.android.tools.idea.lint.common.AndroidQuickfixContexts;
 import com.android.tools.idea.lint.common.LintIdeQuickFix;
-import com.android.tools.idea.util.EditorUtil;
 import com.android.utils.Pair;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
@@ -47,6 +46,7 @@ import com.intellij.psi.xml.XmlTag;
 import java.io.IOException;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.facet.SourceProviderManager;
+import org.jetbrains.android.uipreview.EditorUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;