Fix YAML tests for platform >= 2018 3 (Haehnchen#1307)

cedricziel · web-flow · commit 90963a2902af · 2019-04-28T18:19:51.000+02:00
Fix YAML tests for platform &gt;= 2018 3
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ env:
   - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-183.2153.8" PHP_PLUGIN_VERSION="183.2153.44" TWIG_PLUGIN_VERSION="183.2153.44" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
   - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.2.5" PHP_PLUGIN_VERSION="182.4892.16" TWIG_PLUGIN_VERSION="182.3458.35" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
   - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.2" PHP_PLUGIN_VERSION="182.3684.42" TWIG_PLUGIN_VERSION="182.3458.35" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
-  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.3" PHP_PLUGIN_VERSION="183.4284.150" TWIG_PLUGIN_VERSION="183.3795.24" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
+  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.3.6" PHP_PLUGIN_VERSION="183.5429.47" TWIG_PLUGIN_VERSION="183.3795.24" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
 
 script:
 - "./gradlew check verifyPlugin buildPlugin"
diff --git a/build.gradle b/build.gradle
@@ -16,9 +16,12 @@ plugins {
 def htmlFixer = { htmlFile -> file(htmlFile).text.replace('<html>', '').replace('</html>', '') }
 
 apply plugin: 'idea'
-apply plugin: 'org.jetbrains.intellij'
+
 apply plugin: 'java'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
+apply plugin: 'org.jetbrains.intellij'
 intellij {
     version ideaVersion
     updateSinceUntilBuild false
diff --git a/gradle.properties b/gradle.properties
@@ -4,8 +4,8 @@
 #toolboxPluginVersion = 0.4.6
 #annotationPluginVersion = 5.3
 
-ideaVersion = IU-2018.3
-phpPluginVersion = 183.4284.150
+ideaVersion = IU-2018.3.6
+phpPluginVersion = 183.5429.47
 twigPluginVersion = 183.3795.24
 toolboxPluginVersion = 0.4.6
 annotationPluginVersion = 5.3
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Apr 28 18:02:14 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlUnquotedColon.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlUnquotedColon.java
@@ -12,6 +12,8 @@
 import org.jetbrains.yaml.psi.YAMLCompoundValue;
 import org.jetbrains.yaml.psi.YAMLKeyValue;
 
+import static fr.adrienbrault.idea.symfony2plugin.util.VersionUtil.productVersionGreaterThanOrEqual;
+
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
@@ -39,7 +41,7 @@ private static class MyPsiElementVisitor extends PsiElementVisitor {
         public void visitElement(PsiElement element) {
             // every array element implements this interface
             // check for inside "foo: <foo: foo>"
-            if(!(element instanceof YAMLCompoundValue) || element.getNode().getElementType() != YAMLElementTypes.COMPOUND_VALUE) {
+            if(!isIllegalColonExpression(element)) {
                 super.visitElement(element);
                 return;
             }
@@ -67,5 +69,14 @@ public void visitElement(PsiElement element) {
 
             super.visitElement(element);
         }
+
+        private boolean isIllegalColonExpression(PsiElement element) {
+
+            if (productVersionGreaterThanOrEqual(2018, 3)) {
+                return (element instanceof YAMLCompoundValue) && element.getNode().getElementType() == YAMLElementTypes.MAPPING;
+            }
+
+            return (element instanceof YAMLCompoundValue) && element.getNode().getElementType() == YAMLElementTypes.COMPOUND_VALUE;
+        }
     }
 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/VersionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/VersionUtil.java
@@ -0,0 +1,11 @@
+package fr.adrienbrault.idea.symfony2plugin.util;
+
+import com.intellij.openapi.application.ApplicationInfo;
+
+public class VersionUtil {
+    public static boolean productVersionGreaterThanOrEqual(int major, int minor) {
+        ApplicationInfo instance = ApplicationInfo.getInstance();
+
+        return Integer.valueOf(instance.getMajorVersion()) > major || (Integer.valueOf(instance.getMajorVersion()).equals(major) && Integer.valueOf(instance.getMinorVersionMainPart()) >= minor);
+    }
+}
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java
@@ -1,5 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.tests.util.yaml;
 
+import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
@@ -336,16 +337,31 @@ public void testInsertKeyWithArrayValue() {
 
         YamlHelper.insertKeyIntoFile(yamlFile, yamlKeyValue, "services");
 
-        assertEquals("" +
-                        "services:\n" +
-                        "   foo:\n" +
-                        "       car: test\n" +
-                        "   my_service:\n" +
-                        "     class: foo\n" +
-                        "     tag:\n" +
-                        "     - foo",
-                yamlFile.getText()
-        );
+        ApplicationInfo instance = ApplicationInfo.getInstance();
+        String minorVersion = instance.getMinorVersionMainPart();
+        if (instance.getMajorVersion().equals("2019") || (instance.getMajorVersion().equals("2018") && Integer.valueOf(minorVersion) >= 3)) {
+            assertEquals("" +
+                            "services:\n" +
+                            "   foo:\n" +
+                            "       car: test\n" +
+                            "   my_service:\n" +
+                            "     class: foo\n" +
+                            "     tag:\n" +
+                            "       - foo",
+                    yamlFile.getText()
+            );
+        } else {
+            assertEquals("" +
+                            "services:\n" +
+                            "   foo:\n" +
+                            "       car: test\n" +
+                            "   my_service:\n" +
+                            "     class: foo\n" +
+                            "     tag:\n" +
+                            "     - foo",
+                    yamlFile.getText()
+            );
+        }
     }
 
     /**
