Merge remote-tracking branch 'origin/master' into amakeev/gradle

GitOrigin-RevId: f9a633252daf311ecab19002c0f4757052eee9dc

.idea/libraries/Trove4j.xml

 <component name="libraryTable">
   <library name="Trove4j" type="repository">
-    <properties maven-id="org.jetbrains.intellij.deps:trove4j:1.0.20190215" />
+    <properties maven-id="org.jetbrains.intellij.deps:trove4j:1.0.20190514" />
     <ANNOTATIONS>
       <root url="file://$PROJECT_DIR$/lib/annotations/trove4j" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20190215/trove4j-1.0.20190215.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20190514/trove4j-1.0.20190514.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20190215/trove4j-1.0.20190215-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20190514/trove4j-1.0.20190514-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file

.idea/libraries/lz4_java.xml

 <component name="libraryTable">
   <library name="lz4-java" type="repository">
-    <properties maven-id="net.jpountz.lz4:lz4:1.3.0" />
+    <properties maven-id="org.lz4:lz4-java:1.6.0" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/jpountz/lz4/lz4/1.3.0/lz4-1.3.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/lz4/lz4-java/1.6.0/lz4-java-1.6.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/jpountz/lz4/lz4/1.3.0/lz4-1.3.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/lz4/lz4-java/1.6.0/lz4-java-1.6.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file

.idea/modules.xml

@@ -596,6 +596,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/platform-main/intellij.platform.main.iml" filepath="$PROJECT_DIR$/platform/platform-main/intellij.platform.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.tests.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.annotations.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.annotations.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/projectModel-api/intellij.platform.projectModel.iml" filepath="$PROJECT_DIR$/platform/projectModel-api/intellij.platform.projectModel.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/projectModel-impl/intellij.platform.projectModel.impl.iml" filepath="$PROJECT_DIR$/platform/projectModel-impl/intellij.platform.projectModel.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/remote-servers/api/intellij.platform.remoteServers.iml" filepath="$PROJECT_DIR$/platform/remote-servers/api/intellij.platform.remoteServers.iml" />
@@ -637,6 +638,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml" filepath="$PROJECT_DIR$/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml" filepath="$PROJECT_DIR$/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml" filepath="$PROJECT_DIR$/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.testFramework.iml" filepath="$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.tests.iml" filepath="$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/properties/intellij.properties.iml" filepath="$PROJECT_DIR$/plugins/properties/intellij.properties.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/properties/properties-psi-api/intellij.properties.psi.iml" filepath="$PROJECT_DIR$/plugins/properties/properties-psi-api/intellij.properties.psi.iml" />
@@ -670,6 +672,7 @@
       <module fileurl="file://$PROJECT_DIR$/xml/relaxng/intellij.relaxng.iml" filepath="$PROJECT_DIR$/xml/relaxng/intellij.relaxng.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/sh/intellij.sh.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.iml" />
       <module fileurl="file://$PROJECT_DIR$/spellchecker/intellij.spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/intellij.spellchecker.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml" />

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 class UnicodeCharacterNames {
         return -1; // give up
       }
       byte[] namePool = (byte[])initNamePool.invoke(null);
-      name = name.trim().toUpperCase(Locale.ROOT);
+      name = StringUtil.toUpperCase(name.trim());
       byte[] key = name.getBytes(StandardCharsets.ISO_8859_1);
       final int[][] lookup = ReflectionUtil.getField(aClass, null, int[][].class, "lookup");
       if (lookup == null) throw new RuntimeException();

RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpIntentionAction.java

@@ -7,7 +7,6 @@ import com.intellij.lang.Language;
 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;
@@ -23,14 +22,12 @@ import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 
 final class CheckRegExpIntentionAction extends QuickEditAction implements Iconable {
-  CheckRegExpIntentionAction() {
+  @Override
+  public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     if (PlatformUtils.isPyCharmEducational()) {
-      throw ExtensionNotApplicableException.INSTANCE;
+      return false;
     }
-  }
 
-  @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;

build/conf/nsis/idea.nsi

@@ -1398,6 +1398,15 @@ SectionEnd
 Function .onInit
   SetRegView 32
   Call createLog
+  ${If} ${RunningX64}
+    Goto init
+  ${Else}
+    StrCmp ${JRE_32BIT_VERSION_SUPPORTED} "0" install_jbr11_bundled_on_win32 init
+install_jbr11_bundled_on_win32:
+    MessageBox MB_OK "$(not_supported_32bit_win_version)"
+    Abort
+  ${EndIf}
+init:
   !insertmacro INSTALLOPTIONS_EXTRACT "UninstallOldVersions.ini"
   !insertmacro INSTALLOPTIONS_EXTRACT "Desktop.ini"
   Call getInstallationOptionsPositions

build/conf/nsis/idea_en.nsi

@@ -28,3 +28,4 @@ LangString uninstaller_relocated ${LANG_ENGLISH} "Uninstall hasn't detected fold
 LangString empty_or_upgrade_folder ${LANG_ENGLISH} "Please select an empty folder."
 LangString application_running ${LANG_ENGLISH} "$INSTDIR is running. Close the application and retry the installation."
 LangString download_jre_32bit_version ${LANG_ENGLISH} "Download and install 32-bit JetBrains Runtime"
+LangString not_supported_32bit_win_version ${LANG_ENGLISH} "This installation contains JetBrains Runtime 11 which does not support Microsoft Windows 32-bit version."

build/dependencies/gradle.properties

@@ -5,5 +5,5 @@ jetSignBuild=42.30
 secondJreVersion=11
 secondJreBuild=11_0_3b248.2
 bundledMavenVersion=3.6.0
-jdkBuild=u202b1514.23
+jdkBuild=u202b1566.2
 gradleApiVersion=5.2.1

build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy

@@ -87,6 +87,7 @@ abstract class BaseIdeaProperties extends ProductProperties {
     "intellij.java.debugger.streams",
     "intellij.android.smali",
     "intellij.statsCollector",
+    "intellij.sh",
     "intellij.vcs.changeReminder"
   ]
   protected static final Map<String, String> CE_CLASS_VERSIONS = [

build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy

@@ -37,7 +37,11 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
     productLayout.classesLoadingOrderFilePath = "$home/build/order.txt"
 
     mavenArtifacts.forIdeModules = true
-    mavenArtifacts.additionalModules = ["intellij.tools.jps.buildScriptDependencies"]
+    mavenArtifacts.additionalModules = [
+      "intellij.tools.jps.buildScriptDependencies",
+      "intellij.platform.debugger.testFramework",
+      "intellij.platform.vcs.testFramework"
+    ]
 
     versionCheckerConfig = CE_CLASS_VERSIONS
   }

images/src/org/intellij/images/editor/actions/BackgroundImageDialog.java

@@ -48,8 +48,10 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
+import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 
 import static com.intellij.openapi.wm.impl.IdeBackgroundUtil.*;
 
@@ -473,7 +475,7 @@ public class BackgroundImageDialog extends DialogWrapper {
     IdeBackgroundUtil.Anchor[] values = IdeBackgroundUtil.Anchor.values();
     String[] names = new String[values.length];
     for (int i = 0; i < names.length; i++) {
-      names[i] = values[i].name().replace('_', '-').toLowerCase(Locale.ENGLISH);
+      names[i] = StringUtil.toLowerCase(values[i].name().replace('_', '-'));
     }
     Color color = getSelectionBackground();
     p.setLayout(new GridLayout(3, 3, 1, 1));
@@ -490,7 +492,7 @@ public class BackgroundImageDialog extends DialogWrapper {
     String[] names = new String[values.length];
     BufferedImage image = sampleImage();
     for (int i = 0; i < names.length; i++) {
-      names[i] = values[i].name().replace('_', '-').toLowerCase(Locale.ENGLISH);
+      names[i] = StringUtil.toLowerCase(values[i].name().replace('_', '-'));
     }
     Color color = getSelectionBackground();
     p.setLayout(new GridLayout(1, values.length, 1, 1));

images/src/org/intellij/images/editor/impl/ImageEditorUI.java

@@ -69,7 +69,6 @@ import java.beans.PropertyChangeListener;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.net.URL;
-import java.util.Locale;
 
 /**
  * Image editor UI
@@ -193,7 +192,7 @@ final class ImageEditorUI extends JPanel implements DataProvider, CopyProvider,
       if (format == null) {
         format = editor != null ? ImagesBundle.message("unknown.format") : "";
       } else {
-        format = format.toUpperCase(Locale.ENGLISH);
+        format = StringUtil.toUpperCase(format);
       }
       VirtualFile file = editor != null ? editor.getFile() : null;
       infoLabel.setText(

images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java

@@ -30,7 +30,6 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
-import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -68,9 +67,9 @@ final class ImageFileTypeManagerImpl extends ImageFileTypeManager {
   public void createFileTypes(final @NotNull FileTypeConsumer consumer) {
     final Set<String> processed = new THashSet<>();
     for (String format : ImageIO.getReaderFormatNames()) {
-      processed.add(format.toLowerCase(Locale.ENGLISH));
+      processed.add(StringUtil.toLowerCase(format));
     }
-    processed.add(IfsUtil.ICO_FORMAT.toLowerCase(Locale.ENGLISH));
+    processed.add(StringUtil.toLowerCase(IfsUtil.ICO_FORMAT));
 
     consumer.consume(IMAGE_FILE_TYPE, StringUtil.join(processed, FileTypeConsumer.EXTENSION_DELIMITER));
     consumer.consume(SvgFileType.INSTANCE, "svg");

images/src/org/intellij/images/ui/ThumbnailComponentUI.java

@@ -17,6 +17,7 @@ package org.intellij.images.ui;
 
 import com.intellij.ide.ui.UISettings;
 import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.JBColor;
 import com.intellij.util.ui.UIUtil;
 import icons.ImagesIcons;
@@ -136,7 +137,7 @@ public class ThumbnailComponentUI extends ComponentUI {
         Font font = getSmallFont().deriveFont(Font.BOLD);
         FontMetrics fontMetrics = g.getFontMetrics(font);
 
-        String format = tc.getFormat().toUpperCase();
+        String format = StringUtil.toUpperCase(tc.getFormat());
         int stringWidth = fontMetrics.stringWidth(format);
         int x = ImagesIcons.ThumbnailBlank.getIconWidth() - stringWidth + 2;
         int y = ImagesIcons.ThumbnailBlank.getIconHeight() - fontMetrics.getHeight() + 4;

intellij.idea.community.main.iml

@@ -130,5 +130,6 @@
     <orderEntry type="module" module-name="intellij.testng.rt.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.editorconfig" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.vcs.changeReminder" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.sh" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file

java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java

@@ -22,6 +22,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NonNls;
 
 import java.io.File;
@@ -81,7 +82,7 @@ public class CompilerCacheManager implements Disposable {
 
   public static String getCompilerIdString(Compiler compiler) {
     @NonNls String description = compiler.getDescription();
-    return description.replaceAll("\\s+", "_").replaceAll("[\\.\\?]", "_").toLowerCase();
+    return StringUtil.toLowerCase(description.replaceAll("\\s+", "_").replaceAll("[\\.\\?]", "_"));
   }
   
   synchronized void flushCaches() {

java/compiler/javac2/src/com/intellij/ant/Javac2.java

@@ -582,10 +582,10 @@ public class Javac2 extends Javac {
         return myFormCache.get(formFilePath);
       }
 
-      String lowerFormFilePath = formFilePath.toLowerCase();
+      String lowerFormFilePath = formFilePath.toLowerCase(Locale.ENGLISH);
       log("Searching for form " + lowerFormFilePath, Project.MSG_VERBOSE);
       for (File file : myFormFiles) {
-        String name = file.getAbsolutePath().replace(File.separatorChar, '/').toLowerCase();
+        String name = file.getAbsolutePath().replace(File.separatorChar, '/').toLowerCase(Locale.ENGLISH);
         log("Comparing with " + name, Project.MSG_VERBOSE);
         if (name.endsWith(lowerFormFilePath)) {
           return loadForm(formFilePath, new FileInputStream(file));

java/compiler/javac2/src/com/intellij/ant/PrefixedPath.java

@@ -19,6 +19,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Path;
 
 import java.io.File;
+import java.util.Locale;
 
 /**
  * Allows to specify relative output prefix for Path.
@@ -50,7 +51,7 @@ public class PrefixedPath extends Path {
     String prefix = myPrefix;
     if (prefix != null) {
       prefix = trimStartSlash(ensureEndsWithSlash(prefix));
-      if (!relativePath.toLowerCase().startsWith(prefix.toLowerCase())) {
+      if (!relativePath.toLowerCase(Locale.ENGLISH).startsWith(prefix.toLowerCase(Locale.ENGLISH))) {
         return null;
       }
       relativePath = relativePath.substring(prefix.length());

java/compiler/openapi/src/com/intellij/compiler/ant/BuildProperties.java

@@ -21,6 +21,7 @@ import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NonNls;
@@ -223,7 +224,7 @@ public abstract class BuildProperties extends CompositeGenerator {
    */
   @NonNls
   public static String convertName(@NonNls final String name) {
-    return name.replaceAll("\"", "").replaceAll("\\s+", "_").toLowerCase();
+    return StringUtil.toLowerCase(name.replaceAll("\"", "").replaceAll("\\s+", "_"));
   }
 
   @NonNls

java/compiler/tests/com/intellij/compiler/BaseCompilerTestCase.java

@@ -23,8 +23,11 @@ import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.artifacts.ArtifactManager;
 import com.intellij.packaging.impl.compiler.ArtifactCompileScope;
+import com.intellij.pom.java.LanguageLevel;
 import com.intellij.testFramework.*;
 import com.intellij.util.concurrency.Semaphore;
+import com.intellij.util.io.DirectoryContentSpec;
+import com.intellij.util.io.DirectoryContentSpecKt;
 import com.intellij.util.io.TestFileSystemBuilder;
 import com.intellij.util.ui.UIUtil;
 import gnu.trove.THashSet;
@@ -69,6 +72,12 @@ public abstract class BaseCompilerTestCase extends ModuleTestCase {
     BuildManager.getInstance().clearState(myProject);
   }
 
+  @NotNull
+  @Override
+  protected LanguageLevel getProjectLanguageLevel() {
+    return LanguageLevel.JDK_1_8;
+  }
+
   @Override
   protected Sdk getTestProjectJdk() {
     return JavaAwareProjectJdkTableImpl.getInstanceEx().getInternalJdk();
@@ -262,7 +271,7 @@ public abstract class BaseCompilerTestCase extends ModuleTestCase {
     try {
       final long start = System.currentTimeMillis();
       while (!semaphore.waitFor(10)) {
-        if (System.currentTimeMillis() - start > 50 * 60 * 1000) {
+        if (!BuildManager.getInstance().isBuildProcessDebuggingEnabled() && System.currentTimeMillis() - start > 5 * 60 * 1000) {
           throw new RuntimeException("timeout");
         }
         if (SwingUtilities.isEventDispatchThread()) {
@@ -335,6 +344,10 @@ public abstract class BaseCompilerTestCase extends ModuleTestCase {
     assertOutput(module, item, false);
   }
 
+  protected static void assertOutput(Module module, DirectoryContentSpec spec) {
+    DirectoryContentSpecKt.assertMatches(getOutputDir(module, false), spec);
+  }
+
   protected static void assertOutput(Module module, TestFileSystemBuilder item, final boolean forTests) {
     File outputDir = getOutputDir(module, forTests);
     Assert.assertTrue((forTests? "Test output" : "Output") +" directory " + outputDir.getAbsolutePath() + " doesn't exist", outputDir.exists());