Merge pull request #320 from cedricziel/php-storm

Author: cedricziel

.travis.yml

@@ -18,7 +18,7 @@ cache:
 matrix:
   include:
   - env: IDEA_VERSION="IU-2019.3.4" PHP_PLUGIN_VERSION="193.6911.15" PSI_VIEWER_PLUGIN_VERSION="193-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2019.3" SINCE_BUILD="193" UNTIL_BUILD="193.*"
-  - env: IDEA_VERSION="IU-2020.1" PHP_PLUGIN_VERSION="201.6668.153" PSI_VIEWER_PLUGIN_VERSION="201-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.1" SINCE_BUILD="201" UNTIL_BUILD="201.*"
+  - env: IDEA_VERSION="IU-2020.1.1" PHP_PLUGIN_VERSION="201.7223.91" PSI_VIEWER_PLUGIN_VERSION="201-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.1" SINCE_BUILD="201" UNTIL_BUILD="201.*"
 
 before_install:
 - "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"

gradle.properties

@@ -7,8 +7,8 @@ isEAP = false
 jFlexRelease = 1.7.0-1
 
 grammarKitPluginVersion = 2020.1
-ideaVersion = IU-2020.1
-phpPluginVersion = 201.6668.153
+ideaVersion = IU-2020.1.1
+phpPluginVersion = 201.7223.91
 psiViewerPluginVersion = 201-SNAPSHOT
 customSinceBuild=201
 customUntilBuild=201.*

lang-fluid/src/main/java/com/cedricziel/idea/fluid/viewHelpers/DefaultViewHelpersProvider.java

@@ -12,12 +12,9 @@
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
 import gnu.trove.THashMap;
-import org.apache.commons.io.IOUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
+import java.io.*;
 import java.util.Map;
 
 public class DefaultViewHelpersProvider implements ViewHelperProvider {
@@ -55,14 +52,14 @@ private synchronized Map<String, ViewHelper> getStringViewHelperMap(@NotNull Pro
 
     private String readSchema(String schemaLocation) {
         InputStream resourceAsStream = DefaultViewHelpersProvider.class.getResourceAsStream(schemaLocation);
-        StringWriter writer = new StringWriter();
+        String schema = "";
         try {
-            IOUtils.copy(resourceAsStream, writer);
+            schema = readFromInputStream(resourceAsStream);
         } catch (IOException e) {
             e.printStackTrace();
         }
 
-        return writer.toString();
+        return schema;
     }
 
     private class ViewHelperSchemaRecursiveElementVisitor extends XmlRecursiveElementVisitor {
@@ -137,4 +134,25 @@ String extractDocumentation(XmlTag attributeTag) {
             return attributeDocumentation.toString();
         }
     }
+
+    private String readFromInputStream(InputStream inputStream)
+        throws IOException {
+        StringBuilder resultStringBuilder = new StringBuilder();
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                resultStringBuilder.append(line).append("\n");
+            }
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return resultStringBuilder.toString();
+    }
 }

typo3-cms/src/main/java/com/cedricziel/idea/typo3/provider/AbstractServiceLocatorTypeProvider.java

@@ -22,7 +22,7 @@ public PhpType complete(String s, Project project) {
     }
 
     public Collection<? extends PhpNamedElement> getBySignature(String expression, Set<String> visited, int depth, Project project) {
-        int endIndex = expression.lastIndexOf("%");
+        int endIndex = expression.lastIndexOf(TRIM_KEY);
         if (endIndex == -1) {
             return Collections.emptySet();
         }