Merge branch 'issue-177' into idea-203

# Conflicts: # build.gradle
ikopysov · Oct 30, 2020 · bf42e35 · bf42e35
2 parents 25694c8 + 248fbc8
commit bf42e35
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -49,24 +49,24 @@ sourceSets {
 intellij {
     // full list of IntelliJ IDEA releases at https://www.jetbrains.com/intellij-repository/releases
     // full list of IntelliJ IDEA EAP releases at https://www.jetbrains.com/intellij-repository/snapshots
-    version 'IU-2020.2.3'
+    version 'IU-203.4818.26-EAP-SNAPSHOT'
     //version '2018.2.2'
     sandboxDirectory project.rootDir.canonicalPath + "/.sandbox"
     plugins 'java',
             //'PythonCore:201.6073.9',
-            'Pythonid:202.7660.27',
+            'Pythonid:203.4818.26',
             'Kotlin',
-            'org.intellij.scala:2020.2.11',
+            'org.intellij.scala:2020.3.8',
             'JavaScriptLanguage',
             'CSS',
-            'Dart:202.7319.5',
+            'Dart:203.4818.26',
             'Groovy',
             'properties',
-            'org.jetbrains.plugins.ruby:202.7660.26',
-            'com.jetbrains.php:202.7660.42',
+            'org.jetbrains.plugins.ruby:203.4818.26',
+            'com.jetbrains.php:203.4818.52',
             'java-i18n',
             'DatabaseTools',
-            'org.jetbrains.plugins.go:202.7660.3'
+            'org.jetbrains.plugins.go:203.4818.26'
     updateSinceUntilBuild true
 
 //    plugins = ["PythonCore:2018.2.182.3684.101"]

diff --git a/src/de/endrullis/idea/postfixtemplates/languages/scala/CustomScalaStringPostfixTemplate.java b/src/de/endrullis/idea/postfixtemplates/languages/scala/CustomScalaStringPostfixTemplate.java
@@ -36,7 +36,7 @@ public class CustomScalaStringPostfixTemplate extends ScalaStringBasedPostfixTem
 
 	static final Pattern IMPORT_PATTERN = Pattern.compile("\\[IMPORT ([^\\]]+)\\]");
 
-	private static final Map<String, Condition<PsiElement>> type2psiCondition = new HashMap<String, Condition<PsiElement>>() {{
+	private static final Map<String, Condition<PsiElement>> type2psiCondition = new HashMap<>() {{
 		put(SpecialType.ANY.name(), e -> true);
 		put(SpecialType.VOID.name(), VOID);
 		put(SpecialType.NON_VOID.name(), NON_VOID);

diff --git a/src/de/endrullis/idea/postfixtemplates/languages/scala/ScalaPostfixTemplatesUtils.java b/src/de/endrullis/idea/postfixtemplates/languages/scala/ScalaPostfixTemplatesUtils.java
@@ -3,7 +3,7 @@
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.plugins.scala.lang.completion.postfix.templates.selector.AncestorSelector;
-import scala.collection.JavaConverters;
+import scala.jdk.javaapi.CollectionConverters;
 
 import java.util.Arrays;
 import java.util.List;
@@ -32,7 +32,7 @@ public static Condition<PsiElement> isDescendant(String... classes) {
 	}
 
 	public static Condition<PsiElement> isDescendant(List<String> classes) {
-		return AncestorSelector.isSameOrInheritor(JavaConverters.asScalaBuffer(classes));
+		return AncestorSelector.isSameOrInheritor(CollectionConverters.asScala(classes).toSeq());
 	}
 
 }