⬆️ QD-11230 Fix merging of configuration, update error messages (#678)

Author: evgenyim

platform/effectiveconfig/config.go

@@ -275,18 +275,18 @@ func verifyEffectiveQodanaYamlIdeAndLinterMatchLocal(
 		failedToCreateEffectiveConfigurationMessage := "Failed to create effective configuration"
 
 		topMessageTemplate := "'%s: %s' is specified in one of files provided by 'imports' from " + localQodanaYamlPathFromRoot + " '%s' is required in root qodana.yaml"
-		bottomMessageTemplate := "Add `ide: %s` to " + localQodanaYamlPathFromRoot
+		bottomMessageTemplate := "Add `%s: %s` to " + localQodanaYamlPathFromRoot
 		if effectiveIde != localQodanaYaml.Ide {
 			msg.ErrorMessage(failedToCreateEffectiveConfigurationMessage)
 			msg.ErrorMessage(topMessageTemplate, "ide", effectiveIde, "ide")
-			msg.ErrorMessage(bottomMessageTemplate, effectiveIde)
+			msg.ErrorMessage(bottomMessageTemplate, "ide", effectiveIde)
 			return errors.New("effective.qodana.yaml `ide` doesn't match root qodana.yaml `ide`")
 		}
 		//goland:noinspection GoDfaConstantCondition
 		if effectiveLinter != localQodanaYaml.Linter {
 			msg.ErrorMessage(failedToCreateEffectiveConfigurationMessage)
 			msg.ErrorMessage(topMessageTemplate, "linter", effectiveLinter, "linter")
-			msg.ErrorMessage(bottomMessageTemplate, effectiveLinter)
+			msg.ErrorMessage(bottomMessageTemplate, "linter", effectiveLinter)
 			return errors.New("effective.qodana.yaml `linter` doesn't match root qodana.yaml `linter`")
 		}
 	}

platform/effectiveconfig/testdata/ide and linter defined in root and child qodana yaml/expected/effective.qodana.yaml

@@ -5,12 +5,12 @@ ide: QDJVM
 linter: 'jetbrains/qodana-jvm:latest'
 
 include:
-  # from root
-  - name: InspectionA
-  - name: InspectionB #from root
   # from inner
   - name: InspectionC # from inner
   - name: InspectionD
+  # from root
+  - name: InspectionA
+  - name: InspectionB #from root
 
 #this is a failure conditions section
 failureConditions:

platform/effectiveconfig/testdata/local and global input qodana yaml/expected/effective.qodana.yaml

@@ -4,12 +4,12 @@ profile:
   path: b-profile.yaml
 
 include:
-  # from local
-  - name: InspectionA
-  - name: InspectionB #from local
   # from global
   - name: InspectionC # from global
   - name: InspectionD
+  # from local
+  - name: InspectionA
+  - name: InspectionB #from local
 
 #this is a failure conditions section
 failureConditions:

platform/effectiveconfig/testdata/local and global input qodana yaml/expected/qodana-config.json

@@ -21,12 +21,12 @@
         "L_OVER_G",
         "LG",
         "LG",
-        "L",
-        "L",
-        "L",
         "G",
         "G",
         "G",
+        "L",
+        "L",
+        "L",
         "LG",
         "LG",
         "LG",
@@ -37,6 +37,6 @@
         "G"
       ]
     },
-    "content": "version: 1.0\n\nprofile:\n  path: b-profile.yaml\n\ninclude:\n  # from local\n  - name: InspectionA\n  - name: InspectionB #from local\n  # from global\n  - name: InspectionC # from global\n  - name: InspectionD\n\n#this is a failure conditions section\nfailureConditions:\n  # this is a severityThresholds section\n  severityThresholds:\n    any: 1 #from local\n    critical: 2 # from local\n    moderate: 3 # moderate is global"
+    "content": "version: 1.0\n\nprofile:\n  path: b-profile.yaml\n\ninclude:\n  # from global\n  - name: InspectionC # from global\n  - name: InspectionD\n  # from local\n  - name: InspectionA\n  - name: InspectionB #from local\n\n#this is a failure conditions section\nfailureConditions:\n  # this is a severityThresholds section\n  severityThresholds:\n    any: 1 #from local\n    critical: 2 # from local\n    moderate: 3 # moderate is global"
   }
 }

platform/effectiveconfig/testdata/only local input qodana yaml/expected/a-profile.yaml

@@ -2,6 +2,17 @@ name: qodana.recommended
 baseProfile: Project Default
 
 groups:
+  - groupId: NonReSharperInspections
+    groups:
+      - ALL
+      - '!ReSharperInspections'
+      - '!QodanaDotNetInspections'
+
+  - groupId: LowSeverity
+    groups:
+      - 'severity:WEAK WARNING'
+      - 'severity:HINT'
+      - 'severity:TYPO'
   - groupId: ReSharperInspections # ReSharper inspections are enabled by default
     groups:
       - 'category:C++'
@@ -110,19 +121,12 @@ groups:
       - RiderStaticSanityInspections # Inspections that appear in sanity profile
       - 'severity:INFORMATION' # Qodana doesn't run "invisible" and "technical" in IDE inspections
       - 'severity:TEXT ATTRIBUTES' # Qodana don't run "invisible" and "technical" in IDE inspections
-  - groupId: NonReSharperInspections
-    groups:
-      - ALL
-      - '!ReSharperInspections'
-      - '!QodanaDotNetInspections'
-
-  - groupId: LowSeverity
-    groups:
-      - 'severity:WEAK WARNING'
-      - 'severity:HINT'
-      - 'severity:TYPO'
 
 inspections:
+  - group: LowSeverity # CLT doesn't provide them by default
+    enabled: false
+  - group: NonReSharperInspections
+    enabled: false
   - group: DotnetExcluded
     enabled: false
   - group: QodanaDotNetInspections # Explicitly enable coverage and dependency vulnerability analysis by default
@@ -134,8 +138,4 @@ inspections:
       - '.qodana/**'
       - '**/*.DotSettings' # Ignore .DotSettings files by default
       - 'scope#$gitignore' # $gitignore scope available only in qodana execution
-      - 'scope#$UnrealEngine' # Ignore Unreal Engine files by default
-  - group: LowSeverity # CLT doesn't provide them by default
-    enabled: false
-  - group: NonReSharperInspections
-    enabled: false
+      - 'scope#$UnrealEngine' # Ignore Unreal Engine files by default

platform/effectiveconfig/testdata/only local input qodana yaml/expected/effective.qodana.yaml

@@ -4,12 +4,12 @@ profile:
   path: a-profile.yaml
 
 include:
-  # from root
-  - name: InspectionA
-  - name: InspectionB #from root
   # from inner
   - name: InspectionC # from inner
   - name: InspectionD
+  # from root
+  - name: InspectionA
+  - name: InspectionB #from root
 
 #this is a failure conditions section
 failureConditions:

tooling/resources.json

@@ -1,8 +1,8 @@
 {
     "config-loader-cli.jar": {
         "url": "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/qodana/config-loader-cli/$version/config-loader-cli-$version.jar",
-        "version": "0.0.31",
-        "sha256": "38a58de7c76f08c172fd21d299ef9a122637caa48b9c1444997387bbfebc6d84"
+        "version": "0.0.34",
+        "sha256": "1e58d22658ba6c8d33234dc73a146418d770e5a8d23bf44bdb8f94667bf756d8"
     },
     "publisher-cli.jar": {
         "url": "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/qodana/publisher-cli/$version/publisher-cli-$version.jar",