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

# Conflicts:
#	platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java

diff --cc java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java
Simple merge

diff --cc java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java
Simple merge

diff --cc java/java-tests/testSrc/com/intellij/codeInspection/OfflineInspectionResultViewTest.java
Simple merge

diff --cc platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
Simple merge

diff --cc platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
Simple merge

diff --cc platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
Simple merge

diff --cc platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java
index 8fef0ac468fd5d258be56a05046ee86c72cad8a9,0bcf14bddb778663caa47b30f6c821b4ecdb5bb6..a53b517c0022a35d688347dfac31e524041c7618
--- 1/platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java
--- 2/platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java
@@@ -169,16 -170,14 +169,14 @@@ public class ViewOfflineResultsAction e
      }
      else {
        inspectionProfile = new InspectionProfileImpl(profileName != null ? profileName : "Server Side") {
-         @Override
-         public boolean isToolEnabled(@Nullable final HighlightDisplayKey key, PsiElement element) {
-           return key != null && resMap.containsKey(key.toString());
-         }
- 
          @Override
          public HighlightDisplayLevel getErrorLevel(@NotNull final HighlightDisplayKey key, PsiElement element) {
 -          return ((InspectionProfile)InspectionProfileManager.getInstance().getRootProfile()).getErrorLevel(key, element);
 +          return InspectionProfileManager.getInstance().getCurrentProfile().getErrorLevel(key, element);
          }
        };
+       for (String id : resMap.keySet()) {
+         inspectionProfile.enableTool(id, project);
+       }
      }
      return showOfflineView(project, resMap, inspectionProfile, title);
    }

diff --cc platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
Simple merge

diff --cc platform/platform-impl/src/com/intellij/util/path.kt
Simple merge

diff --cc platform/platform-resources/src/META-INF/LangExtensionPoints.xml
Simple merge

diff --cc platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
Simple merge

diff --cc platform/util/resources/misc/registry.properties
Simple merge

diff --cc plugins/InspectionGadgets/testsrc/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspectionTest.java
Simple merge