Merge pull request Haehnchen#1192 from cedricziel/2018-2-eap

Add 2018.2 to build matrix

Author: Haehnchen

.travis.yml

@@ -22,6 +22,7 @@ before_install:
 - "export ORG_GRADLE_PROJECT_annotationPluginVersion=${ANNOTATION_PLUGIN_VERSION}"
 
 env:
+ - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-182.2949.4" PHP_PLUGIN_VERSION="182.2949.27" TWIG_PLUGIN_VERSION="182.2757.22" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.1" PHP_PLUGIN_VERSION="181.4203.565" TWIG_PLUGIN_VERSION="181.3741.23" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2017.3.5" PHP_PLUGIN_VERSION="173.4301.34" TWIG_PLUGIN_VERSION="173.4301.7" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.2.1"
 

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 
 plugins {
- id "org.jetbrains.intellij" version "0.2.18"
+ id "org.jetbrains.intellij" version "0.3.3"
 }
 
 apply plugin: 'idea'
@@ -34,7 +34,6 @@ intellij {
 
  patchPluginXml {
  sinceBuild '173'
- untilBuild '181.*'
  }
 }
 

gradle.properties

@@ -1,8 +1,15 @@
-ideaVersion = IU-2018.1
-phpPluginVersion = 181.4203.565
-twigPluginVersion = 181.3741.23
+ideaVersion = IU-182.2949.4
+phpPluginVersion = 182.2949.27
+twigPluginVersion = 182.2757.22
 toolboxPluginVersion = 0.4.6
 annotationPluginVersion = 5.3
+
+#ideaVersion = IU-2018.1
+#phpPluginVersion = 181.4203.565
+#twigPluginVersion = 181.3741.23
+#toolboxPluginVersion = 0.4.6
+#annotationPluginVersion = 5.3
+
 #ideaVersion = IU-2017.3.5
 #phpPluginVersion = 173.4301.34
 #twigPluginVersion = 173.4301.7

src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlQuotedEscapedInspection.java

@@ -5,6 +5,7 @@
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.PsiErrorElement;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.util.SymfonyUtil;
 import org.apache.commons.lang.StringUtils;
@@ -19,30 +20,36 @@ public class YamlQuotedEscapedInspection extends LocalInspectionTool {
  @NotNull
  public PsiElementVisitor buildVisitor(final @NotNull ProblemsHolder holder, boolean isOnTheFly) {
 
- if(!Symfony2ProjectComponent.isEnabled(holder.getProject())) {
+ if (!Symfony2ProjectComponent.isEnabled(holder.getProject())) {
  return super.buildVisitor(holder, isOnTheFly);
  }
 
  return new PsiElementVisitor() {
  @Override
  public void visitElement(PsiElement element) {
- if(element.getNode().getElementType() == YAMLTokenTypes.SCALAR_DSTRING && SymfonyUtil.isVersionGreaterThenEquals(element.getProject(), "2.8")) {
+ if (element.getNode().getElementType() == YAMLTokenTypes.SCALAR_DSTRING && SymfonyUtil.isVersionGreaterThenEquals(element.getProject(), "2.8")) {
  // "Foo\Foo" -> "Foo\\Foo"
  String text = StringUtils.strip(element.getText(), "\"");
 
  // dont check to long strings
  // ascii chars that need to be escape; some @see Symfony\Component\Yaml\Unescaper
- if(text.length() < 255 && text.matches(".*[^\\\\]\\\\[^\\\\0abtnvfre \"/N_LPxuU].*")) {
+ if (text.length() < 255 && text.matches(".*[^\\\\]\\\\[^\\\\0abtnvfre \"/N_LPxuU].*")) {
  holder.registerProblem(element, "Not escaping a backslash in a double-quoted string is deprecated", ProblemHighlightType.WEAK_WARNING);
  }
  } else if (element.getNode().getElementType() == YAMLTokenTypes.TEXT && SymfonyUtil.isVersionGreaterThenEquals(element.getProject(), "2.8")) {
  // @foo -> "@foo"
- String text = element.getText();
- if(text.length() > 1) {
+ String text;
+ if (parentIsErrorAndHasPreviousElement(element)) {
+ text = element.getParent().getPrevSibling().getText();
+ } else {
+ text = element.getText();
+ }
+
+ if (text.length() > 1 || (parentIsErrorAndHasPreviousElement(element) && text.length() >= 1)) {
  String startChar = text.substring(0, 1);
- if(startChar.equals("@") || startChar.equals("`") || startChar.equals("|") || startChar.equals(">")) {
+ if (startChar.equals("@") || startChar.equals("`") || startChar.equals("|") || startChar.equals(">")) {
  holder.registerProblem(element, String.format("Deprecated usage of '%s' at the beginning of unquoted string", startChar), ProblemHighlightType.WEAK_WARNING);
- } else if(startChar.equals("%")) {
+ } else if (startChar.equals("%")) {
  // deprecated in => "3.1"; but as most user will need to migrate in 2.8 let them know it already
  holder.registerProblem(element, "Not quoting a scalar starting with the '%' indicator character is deprecated since Symfony 3.1", ProblemHighlightType.WEAK_WARNING);
  }
@@ -53,4 +60,9 @@ public void visitElement(PsiElement element) {
  };
  }
 
+ private boolean parentIsErrorAndHasPreviousElement(@NotNull PsiElement element) {
+ PsiElement parent = element.getParent();
+
+ return parent instanceof PsiErrorElement && parent.getPrevSibling() != null;
+ }
 }