@@ -5,10 +5,8 @@ import com.intellij.codeInspection.InspectionProfile
55import com.intellij.execution.configurations.ParametersList
66import com.intellij.openapi.diagnostic.Logger
77import com.intellij.openapi.project.Project
8- import com.intellij.psi.PsiFile
98import com.jetbrains.php.tools.quality.QualityToolAnnotator
109import com.jetbrains.php.tools.quality.QualityToolAnnotatorInfo
11- import com.jetbrains.php.tools.quality.QualityToolConfiguration
1210
1311open class MagoAnnotatorProxy : QualityToolAnnotator <MagoValidationInspection >() {
1412 companion object {
@@ -27,11 +25,12 @@ open class MagoAnnotatorProxy : QualityToolAnnotator<MagoValidationInspection>()
2725 .plus(ParametersList .parse(settings.formatAdditionalParameters))
2826 .apply { println (" format options: ${this .joinToString(" " )} " ) }
2927
30- fun getAnalyzeOptions (settings : MagoProjectConfiguration , project : Project , filePath : String? ) = buildList {
28+ fun getAnalyzeOptions (settings : MagoProjectConfiguration , project : Project , filePath : String ) = buildList {
3129 addWorkspace(project)
3230 addConfig(settings)
3331
3432 add(" analyze" )
33+ add(filePath)
3534 add(" --reporting-format=json" )
3635// filePath?.let { add(it) }
3736 }
@@ -56,44 +55,18 @@ open class MagoAnnotatorProxy : QualityToolAnnotator<MagoValidationInspection>()
5655 profile : InspectionProfile ? ,
5756 project : Project ,
5857 ): List <String > {
58+ checkNotNull(filePath)
5959 val settings = project.getService(MagoProjectConfiguration ::class .java)
6060
6161 return getAnalyzeOptions(settings, project, filePath)
6262 }
6363
64- override fun createAnnotatorInfo (
65- file : PsiFile ? ,
66- tool : MagoValidationInspection ,
67- inspectionProfile : InspectionProfile ,
68- project : Project ,
69- configuration : QualityToolConfiguration ,
70- isOnTheFly : Boolean ,
71- ): QualityToolAnnotatorInfo <MagoValidationInspection > {
72- if (! isOnTheFly) {
73- LOG .warn(" isOnTheFly is False" )
74- }
75-
76- println (" tool path: ${configuration.toolPath} " )
77-
78- return QualityToolAnnotatorInfo (
79- file,
80- tool,
81- inspectionProfile,
82- project,
83- configuration.interpreterId,
84- configuration.toolPath,
85- configuration.maxMessagesPerFile,
86- configuration.timeout,
87- false
88- )
89- }
90-
9164 override fun getQualityToolType () = MagoQualityToolType .INSTANCE
9265
9366 override fun createMessageProcessor (collectedInfo : QualityToolAnnotatorInfo <MagoValidationInspection >) =
9467 MagoMessageProcessor (collectedInfo)
9568
9669 override fun getPairedBatchInspectionShortName () = qualityToolType.inspectionId
9770
98- override fun runOnTempFiles () = false
71+ override fun runOnTempFiles () = true
9972}
0 commit comments