diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml
index 68486c6350e6..5fc34a223d8d 100644
--- a/.idea/externalDependencies.xml
+++ b/.idea/externalDependencies.xml
@@ -9,6 +9,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index 9d24dbe72c71..3ae05ffb9deb 100644
--- a/.idea/libraries/Netty.xml
+++ b/.idea/libraries/Netty.xml
@@ -4,11 +4,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 756f65a7ae81..064010d8399b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -230,7 +230,6 @@
-
diff --git a/bin/WinLauncher/WinLauncher.exe b/bin/WinLauncher/WinLauncher.exe
index 504c9adb4d57..974e6d495bbe 100644
Binary files a/bin/WinLauncher/WinLauncher.exe and b/bin/WinLauncher/WinLauncher.exe differ
diff --git a/bin/WinLauncher/WinLauncher64.exe b/bin/WinLauncher/WinLauncher64.exe
index 283fd804947a..63f5d186bd9c 100644
Binary files a/bin/WinLauncher/WinLauncher64.exe and b/bin/WinLauncher/WinLauncher64.exe differ
diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh
index 9b50bc413478..fd42138a7bb7 100755
--- a/bin/scripts/unix/idea.sh
+++ b/bin/scripts/unix/idea.sh
@@ -61,6 +61,9 @@ if [ -n "$@@product_uc@@_JDK" -a -x "$@@product_uc@@_JDK/bin/java" ]; then
JDK="$@@product_uc@@_JDK"
elif [ -s "$HOME/.@@system_selector@@/config/@@vm_options@@.jdk" ]; then
JDK=`$CAT $HOME/.@@system_selector@@/config/@@vm_options@@.jdk`
+ if [ ! -d $JDK ]; then
+ JDK=$IDE_HOME/$JDK
+ fi
elif [ -x "$IDE_HOME/jre/jre/bin/java" ] && "$IDE_HOME/jre/jre/bin/java" -version > /dev/null 2>&1 ; then
JDK="$IDE_HOME/jre"
elif [ -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
@@ -184,6 +187,7 @@ LD_LIBRARY_PATH="$IDE_BIN_HOME:$LD_LIBRARY_PATH" "$JAVA_BIN" \
$VM_OPTIONS \
"-Djb.vmOptionsFile=$VM_OPTIONS_FILE" \
"-XX:ErrorFile=$HOME/java_error_in_@@product_uc@@_%p.log" \
+ "-XX:HeapDumpPath=$HOME/java_error_in_@@product_uc@@.hprof" \
-Djb.restart.code=88 -Didea.paths.selector=@@system_selector@@ \
$IDE_PROPERTIES_PROPERTY \
@@ide_jvm_args@@ \
diff --git a/bin/scripts/win/idea.bat b/bin/scripts/win/idea.bat
index 107bc5ceba1d..5fb7dc3fcf6e 100644
--- a/bin/scripts/win/idea.bat
+++ b/bin/scripts/win/idea.bat
@@ -49,7 +49,7 @@ SET ACC=
FOR /F "usebackq delims=" %%i IN ("%VM_OPTIONS_FILE%") DO CALL "%IDE_BIN_DIR%\append.bat" "%%i"
IF EXIST "%VM_OPTIONS_FILE%" SET ACC=%ACC% -Djb.vmOptionsFile="%VM_OPTIONS_FILE%"
-SET COMMON_JVM_ARGS="-XX:ErrorFile=%USERPROFILE%\java_error_in_@@product_uc@@_%%p.log" "-Xbootclasspath/a:%IDE_HOME%/lib/boot.jar" -Didea.paths.selector=@@system_selector@@ %IDE_PROPERTIES_PROPERTY%
+SET COMMON_JVM_ARGS="-XX:ErrorFile=%USERPROFILE%\java_error_in_@@product_uc@@_%%p.log" "-XX:HeapDumpPath=%USERPROFILE%\java_error_in_@@product_uc@@.hprof" "-Xbootclasspath/a:%IDE_HOME%/lib/boot.jar" -Didea.paths.selector=@@system_selector@@ %IDE_PROPERTIES_PROPERTY%
SET IDE_JVM_ARGS=@@ide_jvm_args@@
SET ALL_JVM_ARGS=%ACC% %COMMON_JVM_ARGS% %IDE_JVM_ARGS%
diff --git a/build/conf/mac/Contents/Resources/idea.icns b/build/conf/mac/Contents/Resources/idea.icns
index de7d2af8a354..0aafdb670080 100644
Binary files a/build/conf/mac/Contents/Resources/idea.icns and b/build/conf/mac/Contents/Resources/idea.icns differ
diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index f6ca71196528..16cc8904799b 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -995,7 +995,8 @@ FunctionEnd
Function un.ConfirmDeleteSettings
!insertmacro MUI_HEADER_TEXT "$(uninstall_options)" "$(uninstall_options_prompt)"
!insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 1" "Text" "$(prompt_delete_settings)"
- !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 2" "Text" $INSTDIR
+ ${UnStrRep} $R1 $INSTDIR '\' '\\'
+ !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 2" "Text" $R1
!insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 3" "Text" "$(text_delete_settings)"
!insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 4" "Text" "$(confirm_delete_caches)"
!insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 5" "Text" "$(confirm_delete_settings)"
diff --git a/build/scripts/download_kotlin.gant b/build/scripts/download_kotlin.gant
index 58d9c0ab65e7..372dc3de7002 100644
--- a/build/scripts/download_kotlin.gant
+++ b/build/scripts/download_kotlin.gant
@@ -18,7 +18,7 @@ import com.intellij.util.text.VersionComparatorUtil
import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
includeTargets << new File("${guessHome(this)}/build/scripts/utils.gant")
-String kotlinBuildConfigurationOnPublicTeamCity = "Kotlin_Beta2_Idea142branch150versionNoTests"
+String kotlinBuildConfigurationOnPublicTeamCity = "Kotlin_Beta3_Idea142branch150versionNoTests"
target('default': 'Ensures that build/kotlinc directory contains JARs from Kotlin plugin compatible with current IDEA sources. These JARs are used by build scripts.') {
def communityHome = guessHome(this)
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 274c34253a24..9020c76bb204 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -39,6 +39,14 @@ binding.setVariable("p", {String key, String defaultValue = null ->
}
})
+binding.setVariable("versionSelector", {
+ def fullVersion = p("component.version.major") + "." + p("component.version.minor")
+ def versionParts = fullVersion.split("\\.")
+
+ def minor = versionParts[1]
+ versionParts[0] + (minor == "0" ? "": "." + minor)
+})
+
binding.setVariable("guessJdk", {
String javaHome = p("java.home")
@@ -379,7 +387,6 @@ binding.setVariable("platformApiModules", [
"projectModel-api",
"remote-servers-agent-rt",
"remote-servers-api",
- "structure-view-api",
"usageView",
"vcs-api-core",
"vcs-api",
@@ -1255,7 +1262,6 @@ binding.setVariable("analysisApiModules", [
"jps-model-api",
"jps-model-serialization",
"projectModel-api",
- "structure-view-api",
"util",
"util-rt",
"xml-analysis-api",
diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index a560573afb51..927181b61a4f 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -1,19 +1,33 @@
-
+
-
-
+
+
+
+
-
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
-
+
+
-
+