refactor: don't use kotlin-compiler-embeddable

Author: teixeira0x

ktfmt/pom.xml

@@ -45,7 +45,7 @@
  </dependency>
  <dependency>
  <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-compiler-embeddable</artifactId>
+ <artifactId>kotlin-compiler</artifactId>
  <version>${kotlin.version}</version>
  </dependency>
  <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->

ktfmt/src/main/java/com/facebook/ktfmt/debughelpers/PrintAstVisitor.kt

@@ -16,7 +16,7 @@
 
 package com.facebook.ktfmt.debughelpers
 
-import org.jetbrains.kotlin.com.intellij.psi.PsiElement
+import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
 
 class PrintAstVisitor : KtTreeVisitorVoid() {

ktfmt/src/main/java/com/facebook/ktfmt/format/EnumEntryList.kt

@@ -16,7 +16,7 @@
 
 package com.facebook.ktfmt.format
 
-import org.jetbrains.kotlin.com.intellij.psi.PsiElement
+import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtClassBody
 import org.jetbrains.kotlin.psi.KtEnumEntry

ktfmt/src/main/java/com/facebook/ktfmt/format/Formatter.kt

@@ -30,12 +30,12 @@ import com.google.googlejavaformat.Newlines
 import com.google.googlejavaformat.OpsBuilder
 import com.google.googlejavaformat.java.FormatterException
 import com.google.googlejavaformat.java.JavaOutput
-import org.jetbrains.kotlin.com.intellij.openapi.util.text.StringUtil
-import org.jetbrains.kotlin.com.intellij.openapi.util.text.StringUtilRt.convertLineSeparators
-import org.jetbrains.kotlin.com.intellij.psi.PsiComment
-import org.jetbrains.kotlin.com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.com.intellij.psi.PsiElementVisitor
-import org.jetbrains.kotlin.com.intellij.psi.PsiWhiteSpace
+import com.intellij.openapi.util.text.StringUtil
+import com.intellij.openapi.util.text.StringUtilRt.convertLineSeparators
+import com.intellij.psi.PsiComment
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiElementVisitor
+import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.kotlin.psi.KtImportDirective
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
@@ -53,6 +53,7 @@ object Formatter {
  @JvmField
  val GOOGLE_FORMAT =
  FormattingOptions(
+ maxWidth = 70,
  blockIndent = 2,
  continuationIndent = 2,
  )

ktfmt/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt

@@ -28,7 +28,7 @@ import com.google.googlejavaformat.Input
 import com.google.googlejavaformat.Newlines
 import com.google.googlejavaformat.java.FormatterException
 import com.google.googlejavaformat.java.JavaOutput
-import org.jetbrains.kotlin.com.intellij.openapi.util.text.StringUtil
+import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtFile
 

ktfmt/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt

@@ -26,10 +26,10 @@ import com.google.googlejavaformat.OpsBuilder
 import com.google.googlejavaformat.Output.BreakTag
 import java.util.ArrayDeque
 import java.util.Optional
-import org.jetbrains.kotlin.com.intellij.psi.PsiComment
-import org.jetbrains.kotlin.com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.com.intellij.psi.PsiWhiteSpace
-import org.jetbrains.kotlin.com.intellij.psi.stubs.PsiFileStubImpl
+import com.intellij.psi.PsiComment
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiWhiteSpace
+import com.intellij.psi.stubs.PsiFileStubImpl
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtAnnotatedExpression

ktfmt/src/main/java/com/facebook/ktfmt/format/ParseError.kt

@@ -16,8 +16,8 @@
 
 package com.facebook.ktfmt.format
 
-import org.jetbrains.kotlin.com.intellij.openapi.util.text.LineColumn
-import org.jetbrains.kotlin.com.intellij.psi.PsiElement
+import com.intellij.openapi.util.text.LineColumn
+import com.intellij.psi.PsiElement
 
 class ParseError(val errorDescription: String, val lineColumn: LineColumn) :
  IllegalArgumentException(

ktfmt/src/main/java/com/facebook/ktfmt/format/Parser.kt

@@ -21,11 +21,11 @@ import org.jetbrains.kotlin.cli.common.messages.MessageRenderer.PLAIN_RELATIVE_P
 import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
-import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer
-import org.jetbrains.kotlin.com.intellij.openapi.util.text.StringUtil
-import org.jetbrains.kotlin.com.intellij.psi.PsiErrorElement
-import org.jetbrains.kotlin.com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.com.intellij.testFramework.LightVirtualFile
+import com.intellij.openapi.util.Disposer
+import com.intellij.openapi.util.text.StringUtil
+import com.intellij.psi.PsiErrorElement
+import com.intellij.psi.PsiManager
+import com.intellij.testFramework.LightVirtualFile
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.psi.KtFile

ktfmt/src/main/java/com/facebook/ktfmt/format/RedundantElementManager.kt

@@ -16,8 +16,8 @@
 
 package com.facebook.ktfmt.format
 
-import org.jetbrains.kotlin.com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.com.intellij.psi.PsiWhiteSpace
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocImpl
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtImportList

ktfmt/src/main/java/com/facebook/ktfmt/format/RedundantImportDetector.kt

@@ -16,7 +16,7 @@
 
 package com.facebook.ktfmt.format
 
-import org.jetbrains.kotlin.com.intellij.psi.PsiElement
+import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocImpl
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocLink
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocName