Fix a bunch of build warnings

facebook · Feb 25, 2022 · e88be9e · e88be9e
1 parent ebdebf9
commit e88be9e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 26 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -144,11 +144,11 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
+            <version>31.0.1-jre</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
+            <artifactId>kotlin-stdlib-jdk7</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>
@@ -165,7 +165,7 @@
         <dependency>
             <groupId>com.google.googlejavaformat</groupId>
             <artifactId>google-java-format</artifactId>
-            <version>1.8</version>
+            <version>1.14.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/core/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt b/core/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt
@@ -107,7 +107,6 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
    */
   @Throws(FormatterException::class)
   internal fun characterRangeToTokenRange(offset: Int, length: Int): Range<Int> {
-    var length = length
     val requiredLength = offset + length
     if (requiredLength > text.length) {
       throw FormatterException(
@@ -116,14 +115,15 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
               length,
               requiredLength))
     }
-    when {
-      length < 0 -> return EMPTY_RANGE
-      length == 0 -> // 0 stands for "format the line under the cursor"
-      length = 1
-    }
+    val expandedLength =
+        when {
+          length < 0 -> return EMPTY_RANGE
+          length == 0 -> 1 // 0 stands for "format the line under the cursor"
+          else -> length
+        }
     val enclosed =
         getPositionTokenMap()
-            .subRangeMap(Range.closedOpen(offset, offset + length))
+            .subRangeMap(Range.closedOpen(offset, offset + expandedLength))
             .asMapOfRanges()
             .values
     return if (enclosed.isEmpty()) {
@@ -138,7 +138,7 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
     for (tok in toks) {
       builder.put(tok.position, tok.column)
     }
-    return builder.build()
+    return builder.buildOrThrow()
   }
 
   private fun buildToks(file: KtFile, fileText: String): ImmutableList<KotlinTok> {

diff --git a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt
@@ -1437,8 +1437,7 @@ class KotlinInputAstVisitor(
     builder.open(ZERO)
     builder.block(blockIndent) {
       builder.breakOp(Doc.FillMode.UNIFIED, "", ZERO)
-      val (enumEntries, nonEnumEntryStatements) =
-          body?.children?.partition { it is KtEnumEntry } ?: fail()
+      val (enumEntries, nonEnumEntryStatements) = body.children.partition { it is KtEnumEntry }
       builder.forcedBreak()
       visitEnumEntries(enumEntries)
 

diff --git a/core/src/main/java/com/facebook/ktfmt/format/Tokenizer.kt b/core/src/main/java/com/facebook/ktfmt/format/Tokenizer.kt
@@ -77,7 +77,6 @@ class Tokenizer(private val fileText: String, val file: KtFile) : KtTreeVisitorV
       }
       is LeafPsiElement -> {
         val elementText = element.text
-        val startIndex = element.startOffset
         val endIndex = element.endOffset
         if (element is PsiWhiteSpace) {
           val matcher = WHITESPACE_NEWLINE_REGEX.matcher(elementText)

diff --git a/core/src/main/java/com/facebook/ktfmt/format/TypeNameClassifier.kt b/core/src/main/java/com/facebook/ktfmt/format/TypeNameClassifier.kt
@@ -124,16 +124,16 @@ object TypeNameClassifier {
         var hasUppercase = false
         var hasLowercase = false
         var first = true
-        for (element in name) {
-          if (!Character.isAlphabetic(element.toInt())) {
+        for (char in name) {
+          if (!Character.isAlphabetic(char.code)) {
             continue
           }
           if (first) {
-            firstUppercase = Character.isUpperCase(element)
+            firstUppercase = Character.isUpperCase(char)
             first = false
           }
-          hasUppercase = hasUppercase or Character.isUpperCase(element)
-          hasLowercase = hasLowercase or Character.isLowerCase(element)
+          hasUppercase = hasUppercase or Character.isUpperCase(char)
+          hasLowercase = hasLowercase or Character.isLowerCase(char)
         }
         return if (firstUppercase) {
           if (hasLowercase) UPPER_CAMEL else UPPERCASE

diff --git a/core/src/main/java/com/facebook/ktfmt/kdoc/KDocCommentsHelper.kt b/core/src/main/java/com/facebook/ktfmt/kdoc/KDocCommentsHelper.kt
@@ -86,13 +86,12 @@ class KDocCommentsHelper(private val lineSeparator: String, private val maxLineL
 
   // Wraps and re-indents line comments.
   private fun indentLineComments(lines: List<String>, column0: Int): String {
-    var lines = lines
-    lines = wrapLineComments(lines, column0)
+    val wrappedLines = wrapLineComments(lines, column0)
     val builder = StringBuilder()
-    builder.append(lines[0].trim())
+    builder.append(wrappedLines[0].trim())
     val indentString = Strings.repeat(" ", column0)
-    for (i in 1 until lines.size) {
-      builder.append(lineSeparator).append(indentString).append(lines[i].trim())
+    for (i in 1 until wrappedLines.size) {
+      builder.append(lineSeparator).append(indentString).append(wrappedLines[i].trim())
     }
     return builder.toString()
   }

diff --git a/core/src/test/java/com/facebook/ktfmt/cli/MainTest.kt b/core/src/test/java/com/facebook/ktfmt/cli/MainTest.kt
@@ -22,6 +22,7 @@ import java.io.File
 import java.io.PrintStream
 import java.lang.IllegalStateException
 import java.util.concurrent.ForkJoinPool
+import kotlin.io.path.createTempDirectory
 import org.junit.After
 import org.junit.Assert.fail
 import org.junit.Test
@@ -32,7 +33,7 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class MainTest {
 
-  private val root = createTempDir()
+  private val root = createTempDirectory().toFile()
 
   private val emptyInput = "".byteInputStream()
   private val out = ByteArrayOutputStream()

diff --git a/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt b/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt
@@ -2069,7 +2069,7 @@ class FormatterTest {
           deduceMaxWidth = true)
 
   @Test
-  fun `handle ? for nullalble types`() =
+  fun `handle qmark for nullalble types`() =
       assertFormatted(
           """
       |fun doItWithNullReturns(a: String, b: String): Int? {