Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
#	platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
#	platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java

diff --cc java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
Simple merge

diff --cc platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
index 3d5028c3c5181547d730d90a5a10790ed15091d7,8b943bcb5776622a06247a973f31aa2bfff2c727..912e4f46a353730bb390076ff460285de0f9964f
--- 1/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
--- 2/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
+++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
@@@ -24,7 -25,8 +25,7 @@@ import com.intellij.ide.ui.laf.darcula.
  import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo;
  import com.intellij.openapi.Disposable;
  import com.intellij.openapi.application.ApplicationBundle;
 -import com.intellij.openapi.application.ex.ApplicationInfoEx;
+ import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.editor.colors.ColorKey;
  import com.intellij.openapi.editor.colors.EditorColorsManager;
  import com.intellij.openapi.editor.colors.EditorColorsScheme;

diff --cc platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
Simple merge

diff --cc platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index 2ea743b42b627237713d3637fcb623f7d96b9bcd,3d44d496a39c58d2cc23f5725db8abc2e6bfd2d9..c0cd4d2a4a2012449fb4ab453d55d3a520df0e98
--- 1/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
--- 2/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@@ -1194,25 -1264,22 +1194,22 @@@ public class CodeInsightTestFixtureImp
      super.setUp();
  
      TestRunnerUtil.replaceIdeEventQueueSafely();
-     EdtTestUtil.runInEdtAndWait(new ThrowableRunnable<Throwable>() {
-       @Override
-       public void run() throws Throwable {
-         myProjectFixture.setUp();
-         myTempDirFixture.setUp();
+     EdtTestUtil.runInEdtAndWait(() -> {
+       myProjectFixture.setUp();
+       myTempDirFixture.setUp();
  
-         VirtualFile tempDir = myTempDirFixture.getFile("");
-         PlatformTestCase.synchronizeTempDirVfs(tempDir);
+       VirtualFile tempDir = myTempDirFixture.getFile("");
+       PlatformTestCase.synchronizeTempDirVfs(tempDir);
  
 -      myPsiManager = (PsiManagerImpl)PsiManager.getInstance(getProject());
 -      configureInspections(LocalInspectionTool.EMPTY_ARRAY, getProject(), Collections.emptyList(), getTestRootDisposable());
 +        myPsiManager = (PsiManagerImpl)PsiManager.getInstance(getProject());
 +        InspectionsKt.configureInspections(LocalInspectionTool.EMPTY_ARRAY, getProject(), getTestRootDisposable());
  
-         DaemonCodeAnalyzerImpl daemonCodeAnalyzer = (DaemonCodeAnalyzerImpl)DaemonCodeAnalyzer.getInstance(getProject());
-         daemonCodeAnalyzer.prepareForTest();
+       DaemonCodeAnalyzerImpl daemonCodeAnalyzer = (DaemonCodeAnalyzerImpl)DaemonCodeAnalyzer.getInstance(getProject());
+       daemonCodeAnalyzer.prepareForTest();
  
-         DaemonCodeAnalyzerSettings.getInstance().setImportHintEnabled(false);
-         ensureIndexesUpToDate(getProject());
-         ((StartupManagerImpl)StartupManagerEx.getInstanceEx(getProject())).runPostStartupActivities();
-       }
+       DaemonCodeAnalyzerSettings.getInstance().setImportHintEnabled(false);
+       ensureIndexesUpToDate(getProject());
+       ((StartupManagerImpl)StartupManagerEx.getInstanceEx(getProject())).runPostStartupActivities();
      });
    }