Merge remote-tracking branch 'origin/master'

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index d8fe919d6501b7a3425fadbe57a0b1043f5dcc83..67bfbb237141a5ef3ef7bd280ff96aec7fd06880 100644 (file)
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -255,6 +255,32 @@
         <codeStyleSettings language="SQL">
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
         </codeStyleSettings>
+        <codeStyleSettings language="TypeScript">
+          <option name="KEEP_LINE_BREAKS" value="false" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
         <codeStyleSettings language="XML">
           <indentOptions>
             <option name="INDENT_SIZE" value="2" />

diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index f4e8a0fab8d714c894ece71e5dc7e25e27d2dc22..8924010f19411e165fb1c9a7936717be32277466 100644 (file)
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -134,6 +134,7 @@
     <inspection_tool class="InfiniteLoopJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="InfiniteRecursionJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="InnerClassMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="InspectionDescriptionNotFoundInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="InstanceofCatchParameter" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="InstanceofIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="InterceptionAnnotationWithoutRuntimeRetention" enabled="false" level="WARNING" enabled_by_default="false" />

diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index 58682b2ca3694975f76241a9523c0605d2b171d1..48a94941324f5b4bdd204fc21d3fe2e00e761afc 100644 (file)
--- a/.idea/libraries/Netty.xml
+++ b/.idea/libraries/Netty.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="Netty">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.0.Alpha1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-all-15.13.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

diff --git a/.idea/libraries/asm4.xml b/.idea/libraries/asm4.xml
index 5fa4ef1ddb666fa4e36847ccdc80a7296c8439df..3ed48ba9daf57f7420a17d3741ced8693d111364 100644 (file)
--- a/.idea/libraries/asm4.xml
+++ b/.idea/libraries/asm4.xml
@@ -5,7 +5,7 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/asm4-src.zip!/"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/asm4-src.zip!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file

diff --git a/.idea/modules.xml b/.idea/modules.xml
index b01a3db7ff6bc7e5a56e44bd7ee1550e1071acc6..7173cae34b58c33c74e91eef7ee546e49cdf3bed 100644 (file)
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -137,6 +137,7 @@
       <module fileurl="file://$PROJECT_DIR$/xml/relaxng/relaxng.iml" filepath="$PROJECT_DIR$/xml/relaxng/relaxng.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/platform/remote-servers/agent-rt/remote-servers-agent-rt.iml" filepath="$PROJECT_DIR$/platform/remote-servers/agent-rt/remote-servers-agent-rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/remote-servers/api/remote-servers-api.iml" filepath="$PROJECT_DIR$/platform/remote-servers/api/remote-servers-api.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/remote-servers-git/remote-servers-git.iml" filepath="$PROJECT_DIR$/plugins/git4idea/remote-servers-git/remote-servers-git.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/remote-servers/impl/remote-servers-impl.iml" filepath="$PROJECT_DIR$/platform/remote-servers/impl/remote-servers-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/java/remote-servers/api/remote-servers-java-api.iml" filepath="$PROJECT_DIR$/java/remote-servers/api/remote-servers-java-api.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/remote-servers/impl/remote-servers-java-impl.iml" filepath="$PROJECT_DIR$/java/remote-servers/impl/remote-servers-java-impl.iml" group="java" />
@@ -173,6 +174,8 @@
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/xml/impl/xml.iml" filepath="$PROJECT_DIR$/xml/impl/xml.iml" group="xml" />
+      <module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" group="xml" />
+      <module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/openapi/xml-openapi.iml" filepath="$PROJECT_DIR$/xml/openapi/xml-openapi.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-psi-api/xml-psi-api.iml" filepath="$PROJECT_DIR$/xml/xml-psi-api/xml-psi-api.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-psi-impl/xml-psi-impl.iml" filepath="$PROJECT_DIR$/xml/xml-psi-impl/xml-psi-impl.iml" group="xml" />
@@ -182,8 +185,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" filepath="$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" group="xml" />
-      <module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" group="xml" />
     </modules>
   </component>
 </project>

diff --git a/bin/mac/inspect.sh b/bin/mac/inspect.sh
index b135e0376b240bd1fce1bf7f025574ab97f13ec8..5cdb35af6ebd73ab97b3eb5f79c1cdb06b85a657 100644 (file)
--- a/bin/mac/inspect.sh
+++ b/bin/mac/inspect.sh
@@ -5,7 +5,7 @@
 # ------------------------------------------------------
 #
 
-export DEFAULT_PROJECT_PATH=`pwd`
+export DEFAULT_PROJECT_PATH="$(pwd)"
 
-IDE_BIN_HOME="$(dirname "$0")"
-exec "$IDE_BIN_HOME/../Contents/MacOS/@@script_name@@" inspect $*
+IDE_BIN_HOME="${0%/*}"
+exec "$IDE_BIN_HOME/../Contents/MacOS/@@script_name@@" inspect "$@"

diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh
index 2edf65a030f5fcbebbd04c6a899f9d315d2ec732..dfa1a419a59488ac5d713fddfdba1a9919e644b2 100755 (executable)
--- a/bin/scripts/unix/idea.sh
+++ b/bin/scripts/unix/idea.sh
@@ -162,6 +162,6 @@ export LD_LIBRARY_PATH
 # Run the IDE.
 # ---------------------------------------------------------------------
 while true ; do
-  eval "$JDK/bin/java" $ALL_JVM_ARGS -Djb.restart.code=88 $MAIN_CLASS_NAME $*
+  eval "$JDK/bin/java" $ALL_JVM_ARGS -Djb.restart.code=88 $MAIN_CLASS_NAME "$@"
   test $? -ne 88 && break
 done

diff --git a/bin/scripts/unix/inspect.sh b/bin/scripts/unix/inspect.sh
index 4b4f140e9a69ace3a730e50f1d9ebbf18a8be2c3..26aadfa805eceb3054e4e909bf5c428daa2826e1 100644 (file)
--- a/bin/scripts/unix/inspect.sh
+++ b/bin/scripts/unix/inspect.sh
@@ -5,7 +5,7 @@
 # ------------------------------------------------------
 #
 
-export DEFAULT_PROJECT_PATH=`pwd`
+export DEFAULT_PROJECT_PATH="$(pwd)"
 
-IDE_BIN_HOME="$(dirname "$0")"
-exec "$IDE_BIN_HOME/@@script_name@@" inspect $*
+IDE_BIN_HOME="${0%/*}"
+exec "$IDE_BIN_HOME/@@script_name@@" inspect "$@"

diff --git a/build.txt b/build.txt
index 7a425c0554a6045475ecfd67cd7f4180c6d3a888..c0c337080250b1a4832133db987c191a235a8ff9 100644 (file)
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-132.SNAPSHOT
+134.SNAPSHOT

diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant
index e254d81506d92e64ba49a59f2e9fbea34b2a20f6..b4ae0799980d838eec9c86e00c47751805edb02e 100644 (file)
--- a/build/scripts/dist.gant
+++ b/build/scripts/dist.gant
@@ -151,9 +151,9 @@ private layoutWin(Map args, String home, Paths paths) {
   winVMOptions(target, null, "idea.exe", "idea64.exe")
   List resourcePaths = ["$home/community-resources/src", "$home/platform/icons/src"]
   buildWinLauncher(home, "$home/bin/WinLauncher/WinLauncher.exe", "$target/bin/idea.exe", appInfoFile(),
-                   "$home/build/conf/ideaCE-launcher.properties", null, resourcePaths)
+                   "$home/build/conf/ideaCE-launcher.properties", args.ce_exe_selector, resourcePaths)
   buildWinLauncher(home, "$home/bin/WinLauncher/WinLauncher64.exe", "$target/bin/idea64.exe", appInfoFile(),
-                   "$home/build/conf/ideaCE64-launcher.properties", null, resourcePaths)
+                   "$home/build/conf/ideaCE64-launcher.properties", args.ce_exe_selector, resourcePaths)
 }
 
 private layoutMac(Map _args, String home, Paths paths) {

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 79a45061194b491b875f20f32bff4aa0b2dda35a..436e838ffd4998b2c4dba4f24b5ce9b1eac58b9d 100644 (file)
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -56,13 +56,13 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "java-analysis-api",
     "java-indexing-api",
     "java-psi-api",
+    "js-analysis-api",
     "jsp-openapi",
     "jsp-base-openapi",
     "openapi",
     "remote-servers-api",
     "remote-servers-java-api",
     "testFramework-java",
-    "xml-analysis-api",
   ].flatten()
 
   //noinspection GroovyAssignabilityCheck
@@ -78,6 +78,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "java-indexing-impl",
     "java-impl",
     "java-psi-impl",
+    "js-analysis-impl",
     "jsp-spi",
     "manifest",
     "platform-main",
@@ -85,7 +86,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "remote-servers-java-impl",
     "testFramework",
     "tests_bootstrap",
-    "xml-analysis-impl",
           ].flatten()
 
   ant.patternset(id: "resources.included") {

diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 1c597021c7008b46c88aea707eb12f1ada7f9d2a..07dfd61bdb6474ec84146a9ed208f83cb3be32b7 100644 (file)
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -396,6 +396,8 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
   if (args.inspect_script != null && args.inspect_script != "inspect") {
     ant.move(file: "$path/bin/inspect.sh", tofile: "$path/bin/${args.inspect_script}.sh")
   }
+
+  ant.fixcrlf(srcdir: "$path/bin", includes: "*.sh", eol: "unix")
 })
 
 binding.setVariable("winScripts", { String target, String home, String name, Map args ->
@@ -747,14 +749,9 @@ binding.setVariable("buildWinLauncher", { String ch, String inputPath, String ou
                                           String launcherProperties, String pathsSelector, List resourcePaths ->
   projectBuilder.stage("winLauncher")
 
-  File launcherPropertiesTempFile = null;
   if (pathsSelector != null) {
-    String propertiesContent = new File(launcherProperties).text
-    if (propertiesContent.contains("__PRODUCT_PATHS_SELECTOR__")) {
-      propertiesContent = propertiesContent.replace("__PRODUCT_PATHS_SELECTOR__", pathsSelector)
-      launcherPropertiesTempFile = File.createTempFile("launcher", ".properties")
-      launcherPropertiesTempFile.write(propertiesContent)
-      launcherProperties = launcherPropertiesTempFile.getAbsolutePath()
+    ant.replace(file: launcherProperties) {
+      replacefilter(token: "__PRODUCT_PATHS_SELECTOR__", value: pathsSelector)
     }
   }
 
@@ -776,10 +773,6 @@ binding.setVariable("buildWinLauncher", { String ch, String inputPath, String ou
       }
     }
   }
-
-  if (launcherPropertiesTempFile != null) {
-    launcherPropertiesTempFile.delete()
-  }
 })
 
 binding.setVariable("collectUsedJars", { List modules, List approvedJars, List forbiddenJars, List modulesToBuild ->

diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java
index e823e88e77d48ac98f0bc7b3bbd8e4241dff6e4a..ca18acaf0919bbe574d3177231cdc465ab10ed65 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 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.
@@ -201,7 +201,7 @@ public class BuildArtifactAction extends DumbAwareAction {
                     info + "Do you want to continue and clear these directories?";
         }
         final int answer = Messages.showYesNoDialog(myProject, message, "Clean Artifacts", null);
-        if (answer != 0) {
+        if (answer != Messages.YES) {
           return;
         }
       }

diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java
index f141aa002bc4a2f891fa044a7ec0f68b9efc7af9..62645c9d9bdab984b28d500761310a8b04f0d787 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java
@@ -93,7 +93,7 @@ public class GenerateAntBuildAction extends CompileActionBase {
       int rc = Messages
         .showOkCancelDialog(project, CompilerBundle.message("generate.ant.build.custom.compiler.conflict.message", msg.toString()),
                             CompilerBundle.message("generate.ant.build.custom.compiler.conflict.title"), Messages.getErrorIcon());
-      if (rc != 0) {
+      if (rc != Messages.OK) {
         return false;
       }
     }

diff --git