From 4e9cbeefaa99d8eabff923321f0aec0cf7167c0e Mon Sep 17 00:00:00 2001
From: Morgan Bartholomew <morgan.bartholomew@jetbrains.com>
Date: Mon, 9 Feb 2026 13:07:03 +1000
Subject: [PATCH] PY-83546 Ruff and ty: link console paths

GitOrigin-RevId: 26e4b525cb2beaa7061688eb586886fcaea6d365
---
 .../intellij.python.community.impl.xml        |  1 +
 .../python/run/AstralConsoleFilterProvider.kt | 22 +++++
 .../jetbrains/python/run/AstralPathFilter.kt  | 85 +++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 python/src/com/jetbrains/python/run/AstralConsoleFilterProvider.kt
 create mode 100644 python/src/com/jetbrains/python/run/AstralPathFilter.kt

diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml
index d44d29e0420c..6a4b0e9ffedf 100644
--- a/python/pluginResources/intellij.python.community.impl.xml
+++ b/python/pluginResources/intellij.python.community.impl.xml
@@ -529,6 +529,7 @@
     <consoleHistoryModelProvider implementation="com.jetbrains.python.console.PyConsoleHistoryModelProvider"/>
     <scratch.rootType implementation="com.jetbrains.python.console.PyConsoleRootType"/>
     <consoleFilterProvider implementation="com.jetbrains.python.run.PyMessageFilterProvider"/>
+    <consoleFilterProvider implementation="com.jetbrains.python.run.AstralConsoleFilterProvider"/>
 
     <!-- Run Anything -->
     <runAnything.executionProvider order="after RunAnythingRunConfigurationProvider"
diff --git a/python/src/com/jetbrains/python/run/AstralConsoleFilterProvider.kt b/python/src/com/jetbrains/python/run/AstralConsoleFilterProvider.kt
new file mode 100644
index 000000000000..0331e46906aa
--- /dev/null
+++ b/python/src/com/jetbrains/python/run/AstralConsoleFilterProvider.kt
@@ -0,0 +1,22 @@
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.jetbrains.python.run
+
+import com.intellij.execution.filters.ConsoleFilterProvider
+import com.intellij.execution.filters.Filter
+import com.intellij.openapi.project.Project
+
+/**
+ * Provides console filters for Python-related tools that use non-standard output formats.
+ *
+ * This provider adds support for:
+ * - Ruff diagnostic format (cargo/clippy-style with arrow prefix)
+ * - ty type checker diagnostic format (same as Ruff)
+ *
+ * @see AstralPathFilter
+ */
+internal class AstralConsoleFilterProvider : ConsoleFilterProvider {
+  override fun getDefaultFilters(project: Project): Array<Filter> {
+    val workingDirectory = project.basePath
+    return arrayOf(AstralPathFilter(project, workingDirectory))
+  }
+}
diff --git a/python/src/com/jetbrains/python/run/AstralPathFilter.kt b/python/src/com/jetbrains/python/run/AstralPathFilter.kt
new file mode 100644
index 000000000000..5926943121f2
--- /dev/null
+++ b/python/src/com/jetbrains/python/run/AstralPathFilter.kt
@@ -0,0 +1,85 @@
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.jetbrains.python.run
+
+import com.intellij.execution.filters.FileHyperlinkInfoBase
+import com.intellij.execution.filters.Filter
+import com.intellij.openapi.project.DumbAware
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.LocalFileSystem
+import com.intellij.openapi.vfs.VirtualFile
+import kotlin.io.path.Path
+import kotlin.io.path.pathString
+
+/**
+ * Console filter that creates hyperlinks for file paths in Ruff/ty diagnostic output.
+ *
+ * Matches the new cargo/clippy-style format used by Ruff and ty:
+ * ```
+ *   --> common/decorators.py:16:9
+ * ```
+ *
+ * This format uses a separate line for file paths with an arrow prefix,
+ * allowing multiple file references in a single diagnostic.
+ */
+internal class AstralPathFilter(private val project: Project, private val workingDirectory: String?) : Filter, DumbAware {
+
+  private val pattern = Regex("""( *--> )(?<file>.+):(?<line>\d+):(?<column>\d+)""")
+
+  override fun applyFilter(line: String, entireLength: Int): Filter.Result? {
+    val lineTrimmed = line.trimEnd()
+    val (prefix, file, linerGroup, columnGroup) = pattern.matchEntire(lineTrimmed)?.destructured ?: return null
+
+    val fileName = file.replace('\\', '/')
+
+    val virtualFile = findFileByName(fileName) ?: return null
+
+    val hyperlinkInfo = AstralFileHyperlinkInfo(
+      virtualFile = virtualFile,
+      project = project,
+      line = linerGroup.toInt() - 1,
+      column = columnGroup.toInt() - 1,
+    )
+
+    val lineOffset = entireLength - line.length
+    val linkStart = lineOffset + prefix.length
+    val linkEnd = lineOffset + lineTrimmed.length
+
+    return Filter.Result(linkStart, linkEnd, hyperlinkInfo)
+  }
+
+  private fun findFileByName(fileName: String): VirtualFile? {
+    val fs = LocalFileSystem.getInstance()
+
+    // Try as absolute path first
+    var vFile = fs.findFileByPath(fileName)
+    if (vFile != null) {
+      return vFile
+    }
+
+    // Try relative to project base path
+    val projectBasePath = project.basePath
+    if (projectBasePath != null) {
+      vFile = fs.findFileByPath(Path(projectBasePath, fileName).pathString)
+      if (vFile != null) {
+        return vFile
+      }
+    }
+
+    // Try relative to working directory
+    if (!workingDirectory.isNullOrBlank()) {
+      vFile = fs.findFileByPath(Path(workingDirectory, fileName).pathString)
+      if (vFile != null) {
+        return vFile
+      }
+    }
+
+    return null
+  }
+
+  private class AstralFileHyperlinkInfo(
+    override val virtualFile: VirtualFile,
+    project: Project,
+    line: Int,
+    column: Int,
+  ) : FileHyperlinkInfoBase(project, line, column, myUseBrowser = true)
+}