Rename Terminal.info to terminalInfo

CHANGELOG.md

@@ -20,6 +20,7 @@
 - Renamed `TerminalInfo.crClearsLine` to `supportsAnsiCursor`
 - Combined all `ColumnWidth` subclasses into a single class with factory methods. If you were using `ColumnWidth.Custom`, you should now use the `ColumnWidth` constructor.
 - The following `Terminal` methods are now extensions: `prompt()`, `info()`, `danger()`, `warning()`, `success()`, `muted()`
+- Renamed `Terminal.info` property to `Terminal.terminalInfo`
 
 ### Removed
 - Removed constructor overloads for `Terminal`. There is now one constructor with all default parameters. 

mordant-markdown/src/commonMain/kotlin/com/github/ajalt/mordant/markdown/Markdown.kt

@@ -22,7 +22,7 @@ class Markdown(
     private var document: Widget? = null
     private fun document(t: Terminal): Widget {
         if (document == null) {
-            document = MarkdownRenderer(markdown, t.theme, showHtml, hyperlinks ?: t.info.ansiHyperLinks).render()
+            document = MarkdownRenderer(markdown, t.theme, showHtml, hyperlinks ?: t.terminalInfo.ansiHyperLinks).render()
         }
         return document!!
     }

mordant/src/commonMain/kotlin/com/github/ajalt/mordant/animation/Animation.kt

@@ -148,7 +148,7 @@ abstract class Animation<T>(
                 text = terminal.render(rendered)
             )
         }
-        if (!old.interceptorInstalled && terminal.info.outputInteractive) {
+        if (!old.interceptorInstalled && terminal.terminalInfo.outputInteractive) {
             terminal.addInterceptor(interceptor)
         }
         // Print an empty widget to trigger our interceptor, which will add the rendered text
@@ -169,7 +169,7 @@ abstract class Animation<T>(
             startOfLine()
             if (CR_IMPLIES_LF) up(1)
 
-            if (terminal.info.supportsAnsiCursor) {
+            if (terminal.terminalInfo.supportsAnsiCursor) {
                 // IntelliJ doesn't support cursor moves, so this is all we can do
                 return@getMoves
             }

mordant/src/commonMain/kotlin/com/github/ajalt/mordant/input/RawMode.kt

@@ -13,7 +13,7 @@ import kotlin.time.TimeSource
  * @throws RuntimeException if the terminal is not interactive or raw mode cannot be entered.
  */
 fun Terminal.enterRawMode(mouseTracking: MouseTracking = MouseTracking.Off): RawModeScope {
-    if (!info.inputInteractive) {
+    if (!terminalInfo.inputInteractive) {
         throw IllegalStateException("Cannot enter raw mode on a non-interactive terminal")
     }
     return RawModeScope(this, terminalInterface.enterRawMode(mouseTracking), mouseTracking)

mordant/src/commonMain/kotlin/com/github/ajalt/mordant/terminal/Terminal.kt

@@ -29,7 +29,7 @@ class Terminal private constructor(
     private val nonInteractiveWidth: Int?,
     private val nonInteractiveHeight: Int?,
     /** The terminal capabilities that were detected or set in the constructor. */
-    val info: TerminalInfo,
+    val terminalInfo: TerminalInfo,
 ) {
 
     /**
@@ -65,7 +65,7 @@ class Terminal private constructor(
         forceHeight = height,
         nonInteractiveWidth = nonInteractiveWidth,
         nonInteractiveHeight = nonInteractiveHeight,
-        info = terminalInterface.info(
+        terminalInfo = terminalInterface.info(
             ansiLevel = ansiLevel,
             hyperlinks = hyperlinks,
             outputInteractive = interactive,
@@ -79,7 +79,7 @@ class Terminal private constructor(
     private val atomicSize: MppAtomicRef<Size> =
         MppAtomicRef(
             terminalInterface.detectSize(
-                info,
+                terminalInfo,
                 forceWidth,
                 forceHeight,
                 nonInteractiveWidth,
@@ -103,7 +103,7 @@ class Terminal private constructor(
     fun updateSize(): Size {
         return atomicSize.update {
             terminalInterface.detectSize(
-                info,
+                terminalInfo,
                 forceWidth,
                 forceHeight,
                 nonInteractiveWidth,
@@ -118,15 +118,15 @@ class Terminal private constructor(
      * If the terminal is not interactive, all the cursor functions are no-ops.
      */
     val cursor: TerminalCursor = when {
-        info.interactive -> makePrintingTerminalCursor(this)
+        terminalInfo.interactive -> makePrintingTerminalCursor(this)
         else -> DisabledTerminalCursor
     }
 
     /**
      * Print a [message] to the terminal.
      *
      * Any contained [TextColors] and [TextStyles] will be automatically downsampled based on the
-     * current terminal's [info].
+     * current terminal's [terminalInfo].
      *
      * @param message The message to print as a string.
      * @param whitespace How to handle whitespace and line wrapping. By default, whitespace is
@@ -152,7 +152,7 @@ class Terminal private constructor(
      * Print a [message] to the terminal, followed by a line break.
      *
      * Any contained [TextColors] and [TextStyles] will be automatically downsampled based on the
-     * current terminal's [info].
+     * current terminal's [terminalInfo].
      *
      * @param message The message to print as a string.
      * @param whitespace How to handle whitespace and line wrapping. By default, whitespace is
@@ -200,7 +200,7 @@ class Terminal private constructor(
      * Render a [message] to a string.
      *
      * Any contained [TextColors] and [TextStyles] will be automatically downsampled based on the
-     * current terminal's [info].
+     * current terminal's [terminalInfo].
      *
      * @param message The message to render as a string.
      * @param whitespace How to handle whitespace and line wrapping. By default, whitespace is
@@ -218,15 +218,15 @@ class Terminal private constructor(
         width: Int? = null,
     ): String {
         return when (message) {
-            is Lines -> renderLinesAnsi(message, info.ansiLevel, info.ansiHyperLinks)
+            is Lines -> renderLinesAnsi(message, terminalInfo.ansiLevel, terminalInfo.ansiHyperLinks)
             is Widget -> render(message)
             else -> render(Text(message.toString(), whitespace, align, overflowWrap, width))
         }
     }
 
     /** Render a [widget] as a string */
     fun render(widget: Widget): String {
-        return renderLinesAnsi(widget.render(this), info.ansiLevel, info.ansiHyperLinks)
+        return renderLinesAnsi(widget.render(this), terminalInfo.ansiLevel, terminalInfo.ansiHyperLinks)
     }
 
     /**

mordant/src/commonTest/kotlin/com/github/ajalt/mordant/terminal/PromptTest.kt

@@ -42,7 +42,7 @@ class PromptTest {
 
     @[Test JsName("custom_Prompt")]
     fun `custom Prompt`() {
-        t.info.ansiLevel = AnsiLevel.NONE
+        t.terminalInfo.ansiLevel = AnsiLevel.NONE
         class IntPrompt : Prompt<Int>("pr", t) {
             override fun convert(input: String): ConversionResult<Int> {
                 return input.toIntOrNull()

samples/detection/src/commonMain/kotlin/com/github/ajalt/mordant/samples/main.kt

@@ -11,7 +11,7 @@ fun main() {
     val theme = terminal.theme
     terminal.println(
         Panel(
-            Text(terminal.info.toString(), whitespace = NORMAL).withPadding(1),
+            Text(terminal.terminalInfo.toString(), whitespace = NORMAL).withPadding(1),
             Text(theme.info("Detected Terminal Info"))
         )
     )

samples/hexviewer/src/commonMain/kotlin/com/github/ajalt/mordant/samples/main.kt

@@ -40,7 +40,7 @@ fun main(args: Array<String>) {
     }
 
     // 4 chars per octet, -20 for borders + address
-    val w = (terminal.info.width - 20) / 4
+    val w = (terminal.size.width - 20) / 4
     // round down to nearest multiple of 8
     val octetsPerRow = (w - w % 8).coerceAtLeast(1)