Skip to content

fix: convert file paths to workspace-relative paths #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xepozz merged 3 commits into from
Jan 26, 2026
Merged

fix: convert file paths to workspace-relative paths #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14cdf4e
fix: convert file paths to workspace-relative paths
Jan 22, 2026
cf54098
fix: handle null configuration
xepozz Jan 25, 2026
a7ce747
refactor: simplify file path handling
xepozz Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/kotlin/com/github/xepozz/mago/config/MagoSchemaHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ class MagoSchemaHolder(val project: Project) {
if (run) return
run = true

val magoConfiguration = MagoProjectConfiguration
.getInstance(project)
.findSelectedConfiguration(project)
val magoConfiguration = MagoProjectConfiguration.getInstance(project)
.run { findConfigurationById(selectedConfigurationId, project) }
?: return

ApplicationManager.getApplication().executeOnPooledThread {
Expand Down
25 changes: 23 additions & 2 deletions src/main/kotlin/com/github/xepozz/mago/qualityTool/MagoAnnotatorProxy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import com.intellij.codeInspection.InspectionProfile
import com.intellij.execution.configurations.ParametersList
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.io.FileUtil
import com.intellij.psi.PsiFile
import com.jetbrains.php.tools.quality.QualityToolAnnotator
import com.jetbrains.php.tools.quality.QualityToolAnnotatorInfo
import com.jetbrains.php.tools.quality.QualityToolConfiguration
import java.io.File

open class MagoAnnotatorProxy : QualityToolAnnotator<MagoValidationInspection>() {
companion object {
Expand All @@ -22,7 +24,8 @@ open class MagoAnnotatorProxy : QualityToolAnnotator<MagoValidationInspection>()
addConfig(project, settings)

add("fmt")
addAll(files)
files.map { toWorkspaceRelativePath(project, it) }
.forEach { add(it) }
}
.plus(ParametersList.parse(settings.formatAdditionalParameters))
.apply { println("format options: ${this.joinToString(" ")}") }
Expand All @@ -32,13 +35,31 @@ open class MagoAnnotatorProxy : QualityToolAnnotator<MagoValidationInspection>()
addConfig(project, settings)

add("analyze")
add(filePath)
add(toWorkspaceRelativePath(project, filePath))
add("--reporting-format=json")
// filePath?.let { add(it) }
}
.plus(ParametersList.parse(settings.analyzeAdditionalParameters))
.apply { println("analyze options: ${this.joinToString(" ")}") }

private fun toWorkspaceRelativePath(project: Project, absoluteFilePath: String): String {
val base = project.basePath ?: return ensureMagoPath(absoluteFilePath)
println("project base: $base")

val relative = FileUtil.getRelativePath(base, absoluteFilePath, File.separatorChar)
return ensureMagoPath(relative ?: absoluteFilePath)
}

private fun ensureMagoPath(path: String): String {
return when {
path.isEmpty() -> path
FileUtil.isAbsolute(path) -> path
path.startsWith("./") || path.startsWith(".\\") -> path
// Mago ignores relative paths unless they are explicitly prefixed.
else -> ".${File.separator}$path"
}
}

private fun MutableList<String>.addWorkspace(project: Project) {
val projectPath = updateIfRemoteMappingExists(
project.basePath ?: return,
Expand Down