diff --git a/edu/dependencies/build.gradle b/edu/dependencies/build.gradle
deleted file mode 100644
index 4003ec0899ec..000000000000
--- a/edu/dependencies/build.gradle
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-buildscript {
- repositories {
- maven { url "https://plugins.gradle.org/m2/" }
- }
-}
-
-
-apply plugin: 'idea'
-apply plugin: 'base'
-idea {
- module {
- inheritOutputDirs true
- }
-}
-
-
-group 'com.jetbrains.edu.dependencies'
-version '1.0'
-
-repositories {
- maven { url 'http://plugins.jetbrains.com/maven/' }
-}
-
-configurations {
- eduPlugin
- scalaPlugin
-}
-
-def EduToolsPluginId = "com.jetbrains.edu"
-def EduToolsPluginName = "EduTools"
-def EduToolsRepo= EduToolsChannel == "Stable" ? "com.jetbrains.plugins" : "${EduToolsChannel}.com.jetbrains.plugins"
-
-def ScalaPluginId = "org.intellij.scala"
-def ScalaPluginName = "Scala"
-
-dependencies {
- eduPlugin "$EduToolsRepo:$EduToolsPluginId:$EduToolsPluginVersion@zip"
- scalaPlugin "com.jetbrains.plugins:$ScalaPluginId:$ScalaPluginVersion@zip"
-}
-
-task setupEduToolsPlugin(dependsOn: configurations.eduPlugin, type: Sync) {
- from fileTree(configurations.eduPlugin.singleFile)
- into "${project.buildDir}/$EduToolsPluginName/"
- rename { String fileName ->
- fileName.replace(EduToolsPluginId, EduToolsPluginName) }
-}
-
-task deployEduToolsPlugin(dependsOn: setupEduToolsPlugin, type: Sync) {
- from zipTree("${project.buildDir}/$EduToolsPluginName/$EduToolsPluginName-${EduToolsPluginVersion}.zip")
- into "${System.getProperty("idea.config.path")}/plugins/"
- preserve {
- exclude "$EduToolsPluginName/**"
- }
-}
-
-task setupScalaPlugin(dependsOn: configurations.scalaPlugin, type: Sync) {
- from fileTree(configurations.scalaPlugin.singleFile)
- into "${project.buildDir}/$ScalaPluginName/"
- rename { String fileName ->
- fileName.replace(ScalaPluginId, ScalaPluginName) }
-}
-
-task deployScalaPlugin(dependsOn: setupScalaPlugin, type: Sync) {
- from zipTree("${project.buildDir}/$ScalaPluginName/$ScalaPluginName-${ScalaPluginVersion}.zip")
- into "${System.getProperty("idea.config.path")}/plugins/"
- preserve {
- exclude "$ScalaPluginName/**"
- }
-}
\ No newline at end of file
diff --git a/edu/dependencies/gradle.properties b/edu/dependencies/gradle.properties
deleted file mode 100644
index efbebefafc43..000000000000
--- a/edu/dependencies/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-EduToolsPluginVersion=2.1-2018.3-1060
-EduToolsChannel=Beta
-ScalaPluginVersion=2018.3.4
diff --git a/edu/dependencies/gradle/wrapper/gradle-wrapper.jar b/edu/dependencies/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 6b6ea3ab4ff4..000000000000
Binary files a/edu/dependencies/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/edu/dependencies/gradle/wrapper/gradle-wrapper.properties b/edu/dependencies/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index c1714705edd9..000000000000
--- a/edu/dependencies/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
diff --git a/edu/dependencies/gradlew b/edu/dependencies/gradlew
deleted file mode 100755
index cccdd3d517fc..000000000000
--- a/edu/dependencies/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
- echo "$*"
-}
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/edu/dependencies/gradlew.bat b/edu/dependencies/gradlew.bat
deleted file mode 100644
index f9553162f122..000000000000
--- a/edu/dependencies/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/edu/dependencies/groovy/org/jetbrains/intellij/build/EduUtils.groovy b/edu/dependencies/groovy/org/jetbrains/intellij/build/EduUtils.groovy
deleted file mode 100644
index 30728824ad7c..000000000000
--- a/edu/dependencies/groovy/org/jetbrains/intellij/build/EduUtils.groovy
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jetbrains.intellij.build
-/*
- * Copyright 2000-2018 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import com.intellij.util.SystemProperties
-import com.intellij.util.io.ZipUtil
-
-class EduUtils {
- static void copyPlugin(String pluginName, String dependenciesPath, BuildContext buildContext, String targetDirectory) {
- def dependenciesProjectDir = new File(dependenciesPath)
- new GradleRunner(dependenciesProjectDir, buildContext.messages, SystemProperties.getJavaHome()).run(
- "Downloading $pluginName plugin...", "setup${pluginName}Plugin")
- Properties properties = new Properties()
- new File(dependenciesProjectDir, "gradle.properties").withInputStream {
- properties.load(it)
- }
-
- def pluginZip = new File("${dependenciesProjectDir.absolutePath}/build/$pluginName/$pluginName-${properties.getProperty("${pluginName}PluginVersion")}.zip")
- if (!pluginZip.exists()) {
- throw new IllegalStateException("$pluginName bundled plugin is not found. Plugin path:${pluginZip.canonicalPath}")
- }
- ZipUtil.extract(pluginZip, new File("$targetDirectory/plugins/"), new FilenameFilter() {
- @Override
- boolean accept(File dir, String name) {
- return true
- }
- })
- }
-}
\ No newline at end of file
diff --git a/edu/dependencies/intellij.edu.dependencies.iml b/edu/dependencies/intellij.edu.dependencies.iml
deleted file mode 100644
index b370369e11ee..000000000000
--- a/edu/dependencies/intellij.edu.dependencies.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edu/idea/build/groovy/org/jetbrains/intellij/build/IdeaEduProperties.groovy b/edu/idea/build/groovy/org/jetbrains/intellij/build/IdeaEduProperties.groovy
deleted file mode 100644
index 062be21727db..000000000000
--- a/edu/idea/build/groovy/org/jetbrains/intellij/build/IdeaEduProperties.groovy
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.jetbrains.intellij.build
-/*
- * Copyright 2000-2018 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import groovy.transform.CompileDynamic
-import groovy.transform.CompileStatic
-
-@CompileStatic
-class IdeaEduProperties extends IdeaCommunityProperties {
- private final String dependenciesPath
-
- IdeaEduProperties(String home) {
- super(home)
- productCode = "IE"
- dependenciesPath = "$home/edu/dependencies"
- }
-
- @Override
- @CompileDynamic
- void copyAdditionalFiles(BuildContext buildContext, String targetDirectory) {
- super.copyAdditionalFiles(buildContext, targetDirectory)
-
- EduUtils.copyPlugin("EduTools", dependenciesPath, buildContext, targetDirectory)
- EduUtils.copyPlugin("Scala", dependenciesPath, buildContext, targetDirectory)
- }
-
- @Override
- WindowsDistributionCustomizer createWindowsCustomizer(String projectHome) {
- WindowsDistributionCustomizer base = super.createWindowsCustomizer(projectHome)
-
- return new WindowsDistributionCustomizer() {
- {
- icoPath = base.icoPath
- icoPathForEAP = base.icoPathForEAP
- installerImagesPath = base.installerImagesPath
- fileAssociations = base.fileAssociations
- }
-
- @Override
- String getFullNameIncludingEdition(ApplicationInfoProperties applicationInfo) { "IntelliJ IDEA Educational Edition" }
-
- @Override
- String getFullNameIncludingEditionAndVendor(ApplicationInfoProperties applicationInfo) { "IntelliJ IDEA Educational Edition" }
-
- @Override
- String getUninstallFeedbackPageUrl(ApplicationInfoProperties applicationInfo) {
- "https://www.jetbrains.com/idea/uninstall/?edition=IE-${applicationInfo.majorVersion}.${applicationInfo.minorVersion}"
- }
-
- @Override
- String getBaseDownloadUrlForJre() { "https://download.jetbrains.com/idea" }
- }
- }
-
- @Override
- LinuxDistributionCustomizer createLinuxCustomizer(String projectHome) {
- LinuxDistributionCustomizer base = super.createLinuxCustomizer(projectHome)
-
- return new LinuxDistributionCustomizer() {
- {
- iconPngPath = base.iconPngPath
- iconPngPathForEAP = base.iconPngPathForEAP
- snapName = "intellij-idea-educational"
- snapDescription =
- "IDEA Edu combines interactive learning with a powerful real-world professional development tool to provide " +
- "a platform for the most effective learning and teaching experience."
- }
-
- @Override
- String getRootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber) { "idea-IE-$buildNumber" }
- }
- }
-
- @Override
- MacDistributionCustomizer createMacCustomizer(String projectHome) {
- MacDistributionCustomizer base = super.createMacCustomizer(projectHome)
-
- return new MacDistributionCustomizer() {
- {
- icnsPath = base.icnsPath
- urlSchemes = base.urlSchemes
- associateIpr = base.associateIpr
- fileAssociations = base.fileAssociations
- enableYourkitAgentInEAP = base.enableYourkitAgentInEAP
- bundleIdentifier = "com.jetbrains.intellij.ie"
- dmgImagePath = base.dmgImagePath
- icnsPathForEAP = base.icnsPathForEAP
- }
-
- @Override
- String getRootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber) {
- applicationInfo.isEAP ? "IntelliJ IDEA ${applicationInfo.majorVersion}.${applicationInfo.minorVersionMainPart} EDU EAP.app" :
- "IntelliJ IDEA EDU.app"
- }
- }
- }
-
- @Override
- String getSystemSelector(ApplicationInfoProperties applicationInfo) {
- "IdeaIE${applicationInfo.majorVersion}.${applicationInfo.minorVersionMainPart}"
- }
-
- @Override
- String getBaseArtifactName(ApplicationInfoProperties applicationInfo, String buildNumber) { "ideaIE-$buildNumber" }
-
- @Override
- String getOutputDirectoryName(ApplicationInfoProperties applicationInfo) { "idea-edu" }
-}
\ No newline at end of file
diff --git a/edu/idea/build/intellij.edu.idea.build.iml b/edu/idea/build/intellij.edu.idea.build.iml
deleted file mode 100644
index e9f75946fe6a..000000000000
--- a/edu/idea/build/intellij.edu.idea.build.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edu/idea/build/scripts/idea_community_edu.gant b/edu/idea/build/scripts/idea_community_edu.gant
deleted file mode 100644
index f0109ffa2304..000000000000
--- a/edu/idea/build/scripts/idea_community_edu.gant
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.jetbrains.intellij.build.BuildTasks
-
-target("default": "Default") {
- BuildTasks.buildProduct("org.jetbrains.intellij.build.IdeaEduProperties",
- ["edu/idea/build/groovy", "edu/dependencies/groovy"], "", this)
-}
-
diff --git a/edu/idea/intellij.edu.idea.iml b/edu/idea/intellij.edu.idea.iml
deleted file mode 100644
index c90834f2d607..000000000000
--- a/edu/idea/intellij.edu.idea.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/platform/core-api/src/com/intellij/util/PlatformUtils.java b/platform/core-api/src/com/intellij/util/PlatformUtils.java
index 24a02f5ffb67..03a2e14ebb0b 100644
--- a/platform/core-api/src/com/intellij/util/PlatformUtils.java
+++ b/platform/core-api/src/com/intellij/util/PlatformUtils.java
@@ -37,6 +37,7 @@ public class PlatformUtils {
// NOTE: If you add any new prefixes to this list, please update the IntelliJPlatformProduct class in DevKit plugin
public static final String IDEA_PREFIX = "idea";
public static final String IDEA_CE_PREFIX = "Idea";
+ public static final String IDEA_EDU_PREFIX = "IdeaEdu";
public static final String APPCODE_PREFIX = "AppCode";
public static final String CLION_PREFIX = "CLion";
public static final String PYCHARM_PREFIX = "Python";
@@ -68,7 +69,7 @@ public class PlatformUtils {
}
public static boolean isIntelliJ() {
- return isIdeaUltimate() || isIdeaCommunity();
+ return isIdeaUltimate() || isIdeaCommunity() || isIdeaEducational();
}
public static boolean isIdeaUltimate() {
@@ -79,6 +80,10 @@ public class PlatformUtils {
return is(IDEA_CE_PREFIX);
}
+ private static boolean isIdeaEducational() {
+ return is(IDEA_EDU_PREFIX);
+ }
+
public static boolean isRubyMine() {
return is(RUBY_PREFIX);
}
diff --git a/plugins/devkit/devkit-core/src/projectRoots/IntelliJPlatformProduct.java b/plugins/devkit/devkit-core/src/projectRoots/IntelliJPlatformProduct.java
index 00b9d968dfb3..7b2aa94e9d30 100644
--- a/plugins/devkit/devkit-core/src/projectRoots/IntelliJPlatformProduct.java
+++ b/plugins/devkit/devkit-core/src/projectRoots/IntelliJPlatformProduct.java
@@ -23,6 +23,7 @@ import com.intellij.util.PlatformUtils;
public enum IntelliJPlatformProduct {
IDEA("IU", "IntelliJ IDEA", null),
IDEA_IC("IC", "IntelliJ IDEA Community Edition", PlatformUtils.IDEA_CE_PREFIX),
+ IDEA_IE("IE", "IntelliJ IDEA Educational Edition", PlatformUtils.IDEA_EDU_PREFIX),
RUBYMINE("RM", "RubyMine", PlatformUtils.RUBY_PREFIX),
PYCHARM("PY", "PyCharm", PlatformUtils.PYCHARM_PREFIX),
PYCHARM_PC("PC", "PyCharm Community Edition", PlatformUtils.PYCHARM_CE_PREFIX),