Merge remote-tracking branch 'origin/master'

diff --git a/.idea/libraries/bouncy_castle.xml b/.idea/libraries/bouncy_castle.xml
new file mode 100644 (file)
index 0000000..4e4673a
--- /dev/null
+++ b/.idea/libraries/bouncy_castle.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="bouncy-castle">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/bcpkix-jdk15on-1.48.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/bcprov-jdk15on-1.48.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/builder_model.xml b/.idea/libraries/builder_model.xml
index 232e3ef09430ad61a35736564139bd9ed228ae45..34a541dc26d58f5688f3186384a62aad486822e0 100644 (file)
--- a/.idea/libraries/builder_model.xml
+++ b/.idea/libraries/builder_model.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="builder-model">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/builder-model-1.4.0-beta2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/builder-model-2.0.0-alpha7.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

diff --git a/.idea/libraries/commons_compress.xml b/.idea/libraries/commons_compress.xml
new file mode 100644 (file)
index 0000000..7d2018e
--- /dev/null
+++ b/.idea/libraries/commons_compress.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="commons-compress">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/commons-compress-1.10.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/commons-compress-1.10-src.zip!/commons-compress-1.10-src/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/commons-compress-1.10-src.zip!/commons-compress-1.10-src/src/test/java" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/jgraphx_3_4_0_1.xml b/.idea/libraries/jgraphx_3_4_0_1.xml
new file mode 100644 (file)
index 0000000..a648030
--- /dev/null
+++ b/.idea/libraries/jgraphx_3_4_0_1.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="jgraphx-3.4.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/jgraphx-3.4.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/truth.xml b/.idea/libraries/truth.xml
new file mode 100644 (file)
index 0000000..c9d61aa
--- /dev/null
+++ b/.idea/libraries/truth.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="truth">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/truth-0.28.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1e07d739f2433d174676c59ac4909420c49f84bc..4ceca82dd5bba20ecf3a9887a592c6284614e5d9 100644 (file)
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -113,6 +113,10 @@
       <module fileurl="file://$PROJECT_DIR$/images/images.iml" filepath="$PROJECT_DIR$/images/images.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/indexing-api/indexing-api.iml" filepath="$PROJECT_DIR$/platform/indexing-api/indexing-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" filepath="$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/instant-run/instant-run-annotations/instant-run-annotations.iml" filepath="$PROJECT_DIR$/android/tools-base/instant-run/instant-run-annotations/instant-run-annotations.iml" group="android/sdktools/instant-run" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/instant-run/instant-run-client/instant-run-client.iml" filepath="$PROJECT_DIR$/android/tools-base/instant-run/instant-run-client/instant-run-client.iml" group="android/sdktools/instant-run" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/instant-run/instant-run-common/instant-run-common.iml" filepath="$PROJECT_DIR$/android/tools-base/instant-run/instant-run-common/instant-run-common.iml" group="android/sdktools/instant-run" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/instant-run/instant-run-runtime/instant-run-runtime.iml" filepath="$PROJECT_DIR$/android/tools-base/instant-run/instant-run-runtime/instant-run-runtime.iml" group="android/sdktools/instant-run" />
       <module fileurl="file://$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" filepath="$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/java/compiler/instrumentation-util-8/instrumentation-util-8.iml" filepath="$PROJECT_DIR$/java/compiler/instrumentation-util-8/instrumentation-util-8.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml" group="jps" />
@@ -218,6 +222,7 @@
       <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" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/repository/repository.iml" filepath="$PROJECT_DIR$/android/tools-base/repository/repository.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/resources/resources.iml" filepath="$PROJECT_DIR$/resources/resources.iml" />
       <module fileurl="file://$PROJECT_DIR$/resources-en/resources-en.iml" filepath="$PROJECT_DIR$/resources-en/resources-en.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/rest/rest.iml" filepath="$PROJECT_DIR$/python/rest/rest.iml" group="python" />

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 28e9c5776f4eb616a2614fc26f0ff04a5e011381..7b87103e70dbf7f41565b82d074f0eeb976db079 100644 (file)
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -843,6 +843,9 @@ def layoutAndroid(String androidHome, String androidToolsBaseHome) {
       jar("manifest-merger.jar") {
         module("manifest-merger")
       }
+      jar("repository.jar") {
+        module("repository")
+      }
       jar("sdk-tools.jar") {
         module("assetstudio")
         module("ddmlib")
@@ -856,6 +859,9 @@ def layoutAndroid(String androidHome, String androidToolsBaseHome) {
         module("chartlib")
         module("builder-model")
         module("builder-test-api")
+        module("instant-run-common")
+        module("instant-run-client")
+        module("instant-run-runtime")
       }
       jar("androidAnnotations.jar") {
         fileset(dir: "$androidHome/android/annotations")

diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 597590909bc100465d8a591c3a6ec1153b748749..e7d1bd41f2a31b0fb0a5922bdb7b48e9573f45a4 100644 (file)
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -186,6 +186,7 @@ libraryLicense(name: "coverage.py", attachedTo: "python-helpers", version: "3.7.
 libraryLicense(name: "Cucumber-Core", libraryName: "cucumber-core", version: "1.2.4", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Cucumber-Groovy", libraryName: "cucumber-groovy", version: "1.2.4", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.2.4", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
+libraryLicense(name: "data-binding", libraryName: "data-binding.jar", license: "Apache 2.0", url: "http://source.android.com/")
 libraryLicense(name: "Diffutils", libraryName: "Diffutils", version: "1.2.1", license: "The Apache Software License, Version 2.0", url: "https://code.google.com/archive/p/java-diff-utils/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "docutils", attachedTo: "python-helpers", version: "0.8", license: "BSD", url: "http://docutils.sourceforge.net/")
 libraryLicense(name: "DTDParser", version: "1.13", license: "LGPL", url: "http://sourceforge.net/projects/dtdparser/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1")
@@ -233,6 +234,7 @@ libraryLicense(name: "JGit", libraryName: "jgit", version: "4.0", license: "Ecli
 libraryLicense(name: "JGoodies Common", libraryName: "jgoodies-common", version: "1.2.1", license: "BSD ", url: "http://www.jgoodies.com/freeware/libraries/looks/", licenseUrl: "https://opensource.org/licenses/bsd-license.html")
 libraryLicense(name: "JGoodies Forms", libraryName: "jgoodies-forms", version: "1.1-preview 2006-05-04 11:55:37", license: "BSD ", url: "http://www.jgoodies.com/freeware/libraries/forms/", licenseUrl: "https://opensource.org/licenses/bsd-license.html")
 libraryLicense(name: "JGoodies Looks", libraryName: "jgoodies-looks", version: "2.4.2", license: "BSD ", url: "http://www.jgoodies.com/freeware/libraries/looks/", licenseUrl: "https://opensource.org/licenses/bsd-license.html")
+libraryLicense(name: "jgraphx", libraryName: "jgraphx-3.4.0.1", version: "3.4.0.1", license: "BSD", url: "https://github.com/jgraph/jgraphx")
 libraryLicense(name: "JNA", libraryName: "jna", version: "4.1.0", license: "LGPL 2.1", url: "https://github.com/java-native-access/jna", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1.php")
 libraryLicense(name: "jsch-agent-proxy for svnkit trilead", libraryName: "jsch.agentproxy.svnkit-trilead-ssh2.jar", version: "0.0.7", license: "BSD", url: "https://github.com/ymnk/jsch-agent-proxy", licenseUrl: "https://github.com/ymnk/jsch-agent-proxy/blob/master/LICENSE.txt")
 libraryLicense(name: "jsch-agent-proxy", libraryName: "jsch-agent-proxy", version: "0.0.7", license: "BSD", url: "https://github.com/ymnk/jsch-agent-proxy", licenseUrl: "https://github.com/ymnk/jsch-agent-proxy/blob/master/LICENSE.txt")

diff --git a/community-tests/src/tests/testGroups.properties b/community-tests/src/tests/testGroups.properties
index 943213f21675f0494bd1b0b7be15319f8a147f86..dfbe6a89f3dda26d516b80d085f2225562c9486d 100644 (file)
--- a/community-tests/src/tests/testGroups.properties
+++ b/community-tests/src/tests/testGroups.properties
@@ -33,6 +33,11 @@ org.jetbrains.android.sdk.AndroidSdkUtilsTest
 org.jetbrains.android.sdk.AndroidSdkDataTest
 com.android.tools.idea.gradle.AndroidGradleModelTest
 com.android.tools.idea.gradle.InternalAndroidModelViewTest
+com.android.tools.idea.gradle.invoker.GradleInvokerWithArtifactTest
+com.android.tools.idea.gradle.structure.configurables.editor.dependencies.AndroidSdkRepositorySearchTest
+com.android.tools.idea.gradle.testing.*
+com.android.tools.idea.gradle.util.UpdateGradlePluginVersionTest
+com.android.tools.idea.javadoc.AndroidJavaDocWithGradleTest
 com.android.tools.idea.gradle.project.GradleProjectImporterTest
 com.android.tools.idea.gradle.compiler.AndroidGradleBuildProcessParametersProviderTest
 com.android.tools.idea.sdk.JdksTest
@@ -55,6 +60,7 @@ com.android.tools.idea.wizard.NewTemplateObjectWizardTest
 org.jetbrains.android.run.AndroidRunConfigurationTest
 com.android.tools.idea.run.GradleApkProviderTest
 com.android.tools.idea.run.LaunchUtilsTest
+com.android.tools.idea.run.AndroidTestConfigurationProducerTest
 org.jetbrains.android.facet.IdeaSourceProviderTest
 com.android.tools.idea.gradle.service.resolve.AndroidResolveTest
 com.android.tools.idea.gradle.service.resolve.AndroidDslContributorTest
@@ -66,6 +72,7 @@ com.android.tools.idea.navigator.packageview.AndroidPackageViewTest
 com.android.tools.idea.gradle.project.AndroidGradleProjectDataTest
 com.android.tools.idea.exportSignedPackage.ExportSignedPackageTest
 com.android.tools.idea.avdmanager.AvdManagerConnectionTest
+com.android.tools.idea.avdmanager.AvdDisplayListTest
 com.android.tools.idea.ddms.adb.AdbServiceTest
 com.android.tools.idea.navigator.AndroidProjectViewTest
 com.android.navigation.NavigationEditorTest
@@ -78,6 +85,7 @@ com.android.tools.idea.wizard.ConfigureAndroidModuleStepDynamicTest
 com.android.tools.idea.editors.AndroidGeneratedSourcesFilterTest
 com.android.tools.idea.editors.theme.ThemeEditorStyleTest
 com.android.tools.idea.editors.theme.ThemeEditorUtilsTest
+com.android.tools.idea.editors.theme.ConfiguredThemeEditorStyleTest
 com.android.tools.idea.editors.theme.qualifiers.QualifierUtilsTest
 com.android.tools.idea.gradle.IdeaAndroidProjectTest
 com.android.tools.idea.gradle.project.AndroidGradleProjectImportingTest
@@ -116,6 +124,8 @@ com.android.tools.idea.editors.strings.StringResourceDataTest
 com.android.tools.idea.rendering.ClassConverterTest
 com.android.tools.idea.gradle.service.notification.errors.UnknownHostErrorHandlerTest
 com.android.tools.idea.wizard.AsyncValidatorTest
+org.jetbrains.jps.android.AndroidBuilderTest
+com.android.tools.idea.gradle.service.notification.hyperlink.CustomNotificationListenerTest
 
 [GRADLE_INTEGRATION_TESTS]
 org.jetbrains.plugins.gradle.importing.*

diff --git a/lib/commons-compress-1.10.jar b/lib/commons-compress-1.10.jar
new file mode 100644 (file)
index 0000000..75ced20
Binary files /dev/null and b/lib/commons-compress-1.10.jar differ

diff --git a/lib/org.eclipse.wst.xml.xpath2.processor_1.1.0.jar b/lib/org.eclipse.wst.xml.xpath2.processor_1.1.0.jar
new file mode 100644 (file)
index 0000000..a688d18
Binary files /dev/null and b/lib/org.eclipse.wst.xml.xpath2.processor_1.1.0.jar differ

diff --git a/lib/src/commons-compress-1.10-src.zip b/lib/src/commons-compress-1.10-src.zip
new file mode 100644 (file)
index 0000000..f061a2b
Binary files /dev/null and b/lib/src/commons-compress-1.10-src.zip differ

diff --git a/platform/platform-api/src/com/intellij/ui/components/labels/ActionLink.java b/platform/platform-api/src/com/intellij/ui/components/labels/ActionLink.java
index 4a790facf2ee5d17be95abb356470d02d2cc28d7..601881fb4df12f7d0286a9babfc3f41a8b8c0380 100644 (file)
--- a/platform/platform-api/src/com/intellij/ui/components/labels/ActionLink.java
+++ b/platform/platform-api/src/com/intellij/ui/components/labels/ActionLink.java
@@ -22,6 +22,7 @@ import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 import javax.swing.*;
 import java.awt.*;
@@ -119,4 +120,9 @@ public class ActionLink extends LinkLabel implements DataProvider {
 
     return null;
   }
+
+  @TestOnly
+  public AnAction getAction() {
+    return myAction;
+  }
 }

diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
index 6c64a7bdf392ed1861fe0b2fabbc394d5ab2a65b..a421c078f493ee6cc9a445b22f056b23af0b5db0 100644 (file)
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
@@ -533,6 +533,8 @@ public interface CodeInsightTestFixture extends IdeaProjectTestFixture {
 
   void testFolding(@NotNull String fileName);
 
+  void testFoldingWithCollapseStatus(@NotNull final String verificationFileName, @Nullable String destinationFileName);
+
   void testFoldingWithCollapseStatus(@NotNull String fileName);
 
   void assertPreferredCompletionItems(int selected, @NotNull String... expected);

diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index 75c5530092cc0e688a3b57bb2bce4ef324fa937d..7d07c15d161fdd3ec4eb48ce3daccfe03a604fef 100644 (file)
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -1822,7 +1822,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
     return result.toString();
   }
 
-  private void testFoldingRegions(@NotNull String verificationFileName, boolean doCheckCollapseStatus) {
+  private void testFoldingRegions(@NotNull String verificationFileName, @Nullable String destinationFileName, boolean doCheckCollapseStatus) {
     String expectedContent;
     try {
       expectedContent = FileUtil.loadFile(new File(verificationFileName));
@@ -1834,21 +1834,35 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
 
     expectedContent = StringUtil.replace(expectedContent, "\r", "");
     final String cleanContent = expectedContent.replaceAll(START_FOLD, "").replaceAll(END_FOLD, "");
-
-    configureByText(FileTypeManager.getInstance().getFileTypeByFileName(verificationFileName), cleanContent);
+    if (destinationFileName == null) {
+      configureByText(FileTypeManager.getInstance().getFileTypeByFileName(verificationFileName), cleanContent);
+    }
+    else {
+      try {
+        FileUtil.writeToFile(new File(destinationFileName), cleanContent);
+        configureFromExistingVirtualFile(LocalFileSystem.getInstance().refreshAndFindFileByPath(destinationFileName));
+      }
+      catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
     final String actual = getFoldingDescription(doCheckCollapseStatus);
-
     Assert.assertEquals(expectedContent, actual);
   }
 
   @Override
   public void testFoldingWithCollapseStatus(@NotNull final String verificationFileName) {
-    testFoldingRegions(verificationFileName, true);
+    testFoldingRegions(verificationFileName, null, true);
+  }
+
+  @Override
+  public void testFoldingWithCollapseStatus(@NotNull final String verificationFileName, @Nullable String destinationFileName) {
+    testFoldingRegions(verificationFileName, destinationFileName, true);
   }
 
   @Override
   public void testFolding(@NotNull final String verificationFileName) {
-    testFoldingRegions(verificationFileName, false);
+    testFoldingRegions(verificationFileName, null, false);
   }
 
   @Override

diff --git a/platform/util/src/com/intellij/util/concurrency/SchedulingWrapper.java b/platform/util/src/com/intellij/util/concurrency/SchedulingWrapper.java
index 7cafbe9a159ed6ffb836ebfc7309ec5958833e64..d0626cfb6b445f58c67f9ef6acf2e6c94301b4e8 100644 (file)
--- a/platform/util/src/com/intellij/util/concurrency/SchedulingWrapper.java
+++ b/platform/util/src/com/intellij/util/concurrency/SchedulingWrapper.java
@@ -322,7 +322,7 @@ class SchedulingWrapper implements ScheduledExecutorService {
                                                 long initialDelay,
                                                 long period,
                                                 @NotNull TimeUnit unit) {
-    throw new IncorrectOperationException("Not supported because it's bad for hibernation; use scheduleWithFixedDelay() instead.");
+    throw new IncorrectOperationException("Not supported because it's bad for hibernation; use scheduleWithFixedDelay() with the same parameters instead.");
   }
 
   @NotNull

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrApplicationStatementImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrApplicationStatementImpl.java
index 87de91e4b1aa92cebee343cffee7c0f011943ef2..b50ac70b3ceabebf408d31a238bd4c2b4f028965 100644 (file)
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrApplicationStatementImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrApplicationStatementImpl.java
@@ -41,10 +41,9 @@ public class GrApplicationStatementImpl extends GrMethodCallImpl implements GrAp
     return "Call expression";
   }
 
-  @NotNull
   @Override
   public GrCommandArgumentList getArgumentList() {
-    return findNotNullChildByClass(GrCommandArgumentList.class);
+    return findChildByClass(GrCommandArgumentList.class);
   }
 
   @Override