IDEA-210281 Cleanup Gradle settings: separate Runner configurable rem…

…oved GitOrigin-RevId: adbc39121fe91beb633e125b4cf39bfe0a422e4b
aquagray · May 17, 2019 · b54aaf7 · b54aaf7
1 parent 7eb07b6
commit b54aaf7
Show file tree

Hide file tree

Showing 4,753 changed files with 25,034 additions and 125,447 deletions.
diff --git a/.idea/artifacts/maven_event_listener.xml b/.idea/artifacts/maven_event_listener.xml
diff --git a/.idea/libraries/Objenesis.xml b/.idea/libraries/Objenesis.xml
diff --git a/.idea/libraries/Trove4j.xml b/.idea/libraries/Trove4j.xml
diff --git a/.idea/libraries/completion_ranking_kotlin.xml b/.idea/libraries/completion_ranking_kotlin.xml
diff --git a/.idea/libraries/de_ruedigermoeller_fst.xml b/.idea/libraries/de_ruedigermoeller_fst.xml
diff --git a/.idea/libraries/ion.xml b/.idea/libraries/ion.xml
diff --git a/.idea/libraries/kotlinx_coroutines_jdk8.xml b/.idea/libraries/kotlinx_coroutines_jdk8.xml
diff --git a/.idea/libraries/lz4_java.xml b/.idea/libraries/lz4_java.xml
diff --git a/.idea/libraries/mockito.xml b/.idea/libraries/mockito.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/UnicodeCharacterNames.java b/RegExpSupport/src/org/intellij/lang/regexp/UnicodeCharacterNames.java
@@ -15,13 +15,13 @@
  */
 package org.intellij.lang.regexp;
 
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ReflectionUtil;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 import java.util.function.Consumer;
 
 /**
@@ -96,7 +96,7 @@ public static int getCodePoint(String name) {
         return -1; // give up
       }
       byte[] namePool = (byte[])initNamePool.invoke(null);
-      name = StringUtil.toUpperCase(name.trim());
+      name = name.trim().toUpperCase(Locale.ROOT);
       byte[] key = name.getBytes(StandardCharsets.ISO_8859_1);
       final int[][] lookup = ReflectionUtil.getField(aClass, null, int[][].class, "lookup");
       if (lookup == null) throw new RuntimeException();

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpIntentionAction.java b/RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpIntentionAction.java
@@ -7,6 +7,7 @@
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.extensions.ExtensionNotApplicableException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.Pair;
@@ -22,12 +23,14 @@
 import javax.swing.*;
 
 final class CheckRegExpIntentionAction extends QuickEditAction implements Iconable {
-  @Override
-  public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
+  CheckRegExpIntentionAction() {
     if (PlatformUtils.isPyCharmEducational()) {
-      return false;
+      throw ExtensionNotApplicableException.INSTANCE;
     }
+  }
 
+  @Override
+  public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     if (editor.getUserData(CheckRegExpForm.CHECK_REG_EXP_EDITOR) != null) {
       // to disable intention inside CheckRegExpForm itself
       return false;

diff --git a/RegExpSupport/test/org/intellij/lang/regexp/RegExpCompletionTest.java b/RegExpSupport/test/org/intellij/lang/regexp/RegExpCompletionTest.java
@@ -41,19 +41,11 @@ public void testNamedCharacter() {
       myFixture.configureByText(RegExpFileType.INSTANCE, "\\N{SMILE<caret>}");
       final LookupElement[] elements = myFixture.completeBasic();
       final List<String> strings = ContainerUtil.map(elements, LookupElement::getLookupString);
-      List<String> alwaysPresent = Arrays.asList("SMILE", "SMILING FACE WITH SMILING EYES", "SMILING FACE WITH HEART-SHAPED EYES",
-                                                 "SMILING CAT FACE WITH HEART-SHAPED EYES", "SMILING FACE WITH OPEN MOUTH AND SMILING EYES",
-                                                 "SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES", "CAT FACE WITH WRY SMILE",
-                                                 "GRINNING CAT FACE WITH SMILING EYES", "GRINNING FACE WITH SMILING EYES",
-                                                 "KISSING FACE WITH SMILING EYES");
-      String message = strings.toString();
-      assertTrue(message, strings.containsAll(alwaysPresent));
-      List<String> other = new ArrayList<>(strings);
-      other.removeAll(alwaysPresent);
-      // Unicode 10.0
-      List<String> maybePresent = Arrays.asList("SMILING FACE WITH SMILING EYES AND HAND COVERING MOUTH", "SIGNWRITING MOUTH SMILE",
-                                                "SIGNWRITING MOUTH SMILE OPEN", "SIGNWRITING MOUTH SMILE WRINKLED");
-      assertTrue(message, maybePresent.containsAll(other));
+      assertEquals(Arrays.asList("SMILE", "SMILING FACE WITH SMILING EYES", "SMILING FACE WITH HEART-SHAPED EYES",
+                                 "SMILING CAT FACE WITH HEART-SHAPED EYES", "SMILING FACE WITH OPEN MOUTH AND SMILING EYES",
+                                 "SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES", "CAT FACE WITH WRY SMILE",
+                                 "GRINNING CAT FACE WITH SMILING EYES", "GRINNING FACE WITH SMILING EYES",
+                                 "KISSING FACE WITH SMILING EYES"), strings);
     }
 
     public void testBackSlashVariants() {