Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 10 insertions, 5 deletions

diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
index c3d4e158c070..b27befd36b00 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
@@ -40,6 +40,7 @@ public class Descriptor {
   private final InspectionToolWrapper myToolWrapper;
   private final HighlightDisplayLevel myLevel;
   private boolean myEnabled = false;
+  @Nullable
   private final NamedScope myScope;
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.Descriptor");
   private final ScopeToolState myState;
@@ -99,6 +100,13 @@ public class Descriptor {
     return myConfig;
   }
 
+  public void loadConfig() {
+    if (myConfig == null) {
+      InspectionToolWrapper toolWrapper = getToolWrapper();
+      myConfig = createConfigElement(toolWrapper);
+    }
+  }
+
   @NotNull
   public InspectionToolWrapper getToolWrapper() {
     return myToolWrapper;
@@ -106,11 +114,7 @@ public class Descriptor {
 
   @Nullable
   public String loadDescription() {
-    if (myConfig == null) {
-      InspectionToolWrapper toolWrapper = getToolWrapper();
-      myConfig = createConfigElement(toolWrapper);
-    }
-
+    loadConfig();
     return myToolWrapper.loadDescription();
   }
 
@@ -133,6 +137,7 @@ public class Descriptor {
     return myGroup;
   }
 
+  @Nullable
   public NamedScope getScope() {
     return myScope;
   }