[All] Update Platform version to 2021.1 (#349)

Author: cedricziel

.github/workflows/gradle.yml

@@ -24,20 +24,20 @@ jobs:
     strategy:
       matrix:
         include:
-#        - idea_version: "IU-2020.2"
-#          java_version: "1.8"
-#          php_plugin_version: "202.6397.94"
-#          psi_viewer_plugin_version: "202-SNAPSHOT"
-#          grammar_kit_plugin_version: "2020.2.1"
-#          since_build: "202"
-#          until_build: "202.*"
-        - idea_version: "IU-203.5981.41-EAP-SNAPSHOT"
+        - idea_version: "IU-2020.3.3"
           java_version: "1.11"
-          php_plugin_version: "203.5981.43"
+          php_plugin_version: "203.7148.15"
           psi_viewer_plugin_version: "203-SNAPSHOT"
           grammar_kit_plugin_version: "2020.2.1"
           since_build: "203"
           until_build: "203.*"
+        - idea_version: "IU-211.6693.14-EAP-SNAPSHOT"
+          java_version: "1.11"
+          php_plugin_version: "211.6693.25"
+          psi_viewer_plugin_version: "211-SNAPSHOT"
+          grammar_kit_plugin_version: "2020.2.1"
+          since_build: "211"
+          until_build: "211.*"
 
     steps:
     - uses: actions/checkout@v2

.travis.yml

@@ -17,7 +17,8 @@ cache:
 
 matrix:
   include:
-  - env: IDEA_VERSION="IU-203.5981.41-EAP-SNAPSHOT" PHP_PLUGIN_VERSION="203.5981.43" PSI_VIEWER_PLUGIN_VERSION="203-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.2.1" SINCE_BUILD="203" UNTIL_BUILD="203.*"
+  - env: IDEA_VERSION="IU-2020.3.3" PHP_PLUGIN_VERSION="203.7148.15" PSI_VIEWER_PLUGIN_VERSION="203-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.2.1" SINCE_BUILD="203" UNTIL_BUILD="203.*"
+  - env: IDEA_VERSION="IU-211.6693.14-EAP-SNAPSHOT" PHP_PLUGIN_VERSION="211.6693.25" PSI_VIEWER_PLUGIN_VERSION="211-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.2.1" SINCE_BUILD="211" UNTIL_BUILD="211.*"
 
 before_install:
 - "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"

build.gradle

@@ -1,7 +1,7 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
-    id "org.jetbrains.intellij" version "0.6.3"
+    id "org.jetbrains.intellij" version "0.6.5"
     id "org.jetbrains.grammarkit" version "${grammarKitPluginVersion}" apply false
     id 'com.palantir.git-version' version "0.12.3"
 }

gradle.properties

@@ -7,11 +7,18 @@ isEAP = false
 jFlexRelease = 1.7.0-1
 
 grammarKitPluginVersion = 2020.2.1
-ideaVersion = IU-203.5981.41-EAP-SNAPSHOT
-phpPluginVersion = 203.5981.43
-psiViewerPluginVersion = 203-SNAPSHOT
-customSinceBuild=203
-customUntilBuild=203.*
+ideaVersion = IU-211.6693.14-EAP-SNAPSHOT
+phpPluginVersion = 211.6693.25
+psiViewerPluginVersion = 211-SNAPSHOT
+customSinceBuild=211
+customUntilBuild=211.*
+
+#grammarKitPluginVersion = 2020.2.1
+#ideaVersion = IU-2020.3.3
+#phpPluginVersion = 203.7148.15
+#psiViewerPluginVersion = 203-SNAPSHOT
+#customSinceBuild=203
+#customUntilBuild=203.*
 
 #grammarKitPluginVersion = 2020.2.1
 #ideaVersion = IU-2020.2

lang-fluid/src/main/java/com/cedricziel/idea/fluid/formatter/FluidBlockWithInjection.java

@@ -10,7 +10,6 @@
 import com.intellij.psi.formatter.common.InjectedLanguageBlockBuilder;
 import com.intellij.psi.formatter.common.InjectedLanguageBlockWrapper;
 import com.intellij.psi.formatter.xml.XmlFormattingPolicy;
-import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.template.formatter.AbstractXmlTemplateFormattingModelBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/FluidBraceMatcher.java

@@ -11,7 +11,7 @@
 public class FluidBraceMatcher implements PairedBraceMatcher {
     @NotNull
     @Override
-    public BracePair[] getPairs() {
+    public BracePair @NotNull [] getPairs() {
         return new BracePair[]{
             new BracePair(FluidTypes.LEFT_PARENTH, FluidTypes.RIGHT_PARENTH, false),
             new BracePair(FluidTypes.EXPR_START, FluidTypes.EXPR_END, true),

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/FluidFileHighlighter.java

@@ -98,7 +98,7 @@ public Lexer getHighlightingLexer() {
     }
 
     @NotNull
-    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
+    public TextAttributesKey @NotNull [] getTokenHighlights(IElementType tokenType) {
         if (tokenType.equals(FluidTypes.FIELD_CHAIN) || tokenType.equals(FluidTypes.IDENTIFIER) || tokenType.equals(FluidTypes.NAMESPACE)) {
             return IDENTIFIER_KEYS;
         } else if (tokenType.equals(FluidTypes.EXPR_END) || tokenType.equals(FluidTypes.EXPR_START)) {

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/FluidFileType.java

@@ -72,7 +72,7 @@ public Icon getIcon() {
     }
 
     @Override
-    public String getCharset(@NotNull VirtualFile file, @NotNull byte[] content) {
+    public String getCharset(@NotNull VirtualFile file, @NotNull byte @NotNull [] content) {
         return CharsetToolkit.UTF8;
     }
 

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/FluidParserDefinition.java

@@ -50,20 +50,20 @@ public PsiParser createParser(final Project project) {
     }
 
     @Override
-    public IFileElementType getFileNodeType() {
+    public @NotNull IFileElementType getFileNodeType() {
         return FILE;
     }
 
-    public PsiFile createFile(FileViewProvider viewProvider) {
+    public @NotNull PsiFile createFile(@NotNull FileViewProvider viewProvider) {
         return new FluidFile(viewProvider);
     }
 
     @Override
-    public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
+    public @NotNull SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
         return SpaceRequirements.MAY;
     }
 
-    public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
+    public @NotNull SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
         return SpaceRequirements.MAY;
     }
 

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/psi/impl/FluidElementImpl.java

@@ -22,7 +22,7 @@ public String toString() {
 
     @NotNull
     @Override
-    public PsiReference[] getReferences() {
+    public PsiReference @NotNull [] getReferences() {
         return ReferenceProvidersRegistry.getReferencesFromProviders(this);
     }