mirror of
https://github.com/apple/pkl.git
synced 2026-04-23 08:48:36 +02:00
@@ -33,6 +33,7 @@ import org.pkl.core.util.IoUtils
|
|||||||
import org.pkl.formatter.Formatter
|
import org.pkl.formatter.Formatter
|
||||||
import org.pkl.formatter.GrammarVersion
|
import org.pkl.formatter.GrammarVersion
|
||||||
import org.pkl.parser.GenericParserError
|
import org.pkl.parser.GenericParserError
|
||||||
|
import org.pkl.parser.ParserError
|
||||||
|
|
||||||
class CliFormatterCommand
|
class CliFormatterCommand
|
||||||
@JvmOverloads
|
@JvmOverloads
|
||||||
@@ -127,7 +128,10 @@ constructor(
|
|||||||
consoleWriter.write(formatted)
|
consoleWriter.write(formatted)
|
||||||
consoleWriter.flush()
|
consoleWriter.flush()
|
||||||
}
|
}
|
||||||
} catch (pe: GenericParserError) {
|
} catch (pe: ParserError) { // thrown by the lexer
|
||||||
|
writeErrLine("Could not format `$pathStr`: $pe")
|
||||||
|
status.update(ERROR)
|
||||||
|
} catch (pe: GenericParserError) { // thrown by the generic parser
|
||||||
writeErrLine("Could not format `$pathStr`: $pe")
|
writeErrLine("Could not format `$pathStr`: $pe")
|
||||||
status.update(ERROR)
|
status.update(ERROR)
|
||||||
} catch (e: IOException) {
|
} catch (e: IOException) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
|
* Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,7 +19,9 @@ import java.nio.file.Path
|
|||||||
import kotlin.io.path.writeText
|
import kotlin.io.path.writeText
|
||||||
import org.assertj.core.api.Assertions.assertThat
|
import org.assertj.core.api.Assertions.assertThat
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
|
import org.junit.jupiter.api.assertThrows
|
||||||
import org.junit.jupiter.api.io.TempDir
|
import org.junit.jupiter.api.io.TempDir
|
||||||
|
import org.pkl.commons.cli.CliBugException
|
||||||
import org.pkl.commons.cli.CliException
|
import org.pkl.commons.cli.CliException
|
||||||
import org.pkl.core.util.StringBuilderWriter
|
import org.pkl.core.util.StringBuilderWriter
|
||||||
import org.pkl.formatter.GrammarVersion
|
import org.pkl.formatter.GrammarVersion
|
||||||
@@ -44,4 +46,22 @@ class CliFormatterTest {
|
|||||||
} catch (_: CliException) {}
|
} catch (_: CliException) {}
|
||||||
assertThat(sb.toString()).isEqualTo("foo = 1\n")
|
assertThat(sb.toString()).isEqualTo("foo = 1\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `parse errors do not result in bug exceptions`(@TempDir tempDir: Path) {
|
||||||
|
val file = tempDir.resolve("foo.pkl").also { it.writeText("foo = \"/foo/\\\${BAR}/baz\"") }
|
||||||
|
val sb = StringBuilder()
|
||||||
|
val writer = StringBuilderWriter(sb)
|
||||||
|
val cmd =
|
||||||
|
CliFormatterCommand(
|
||||||
|
listOf(file),
|
||||||
|
GrammarVersion.latest(),
|
||||||
|
overwrite = false,
|
||||||
|
diffNameOnly = false,
|
||||||
|
silent = false,
|
||||||
|
consoleWriter = writer,
|
||||||
|
)
|
||||||
|
val exc = assertThrows<CliException> { cmd.run() }
|
||||||
|
assertThat(exc).isNotInstanceOf(CliBugException::class.java)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user