API for lazy localized messages

Use `XBundle.lazyMessage()` API a string to be changed to its localized variant on a language plugin enabling w/o restart

`public static Supplier<String> lazyMessage() {...}` added into many bundle classes

GitOrigin-RevId: 8c6ef21c8bc774614e6bb94dad27ff5db6cbff07

images/src/org/intellij/images/ImagesBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class ImagesBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.ImagesBundle";
   private static final ImagesBundle INSTANCE = new ImagesBundle();
@@ -30,4 +32,9 @@ public class ImagesBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class CompilerBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.CompilerBundle";
   private static final CompilerBundle INSTANCE = new CompilerBundle();
@@ -30,4 +32,9 @@ public class CompilerBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

java/debugger/openapi/src/com/intellij/debugger/DebuggerBundle.java

@@ -22,6 +22,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class DebuggerBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.DebuggerBundle";
   private static final DebuggerBundle INSTANCE = new DebuggerBundle();
@@ -33,6 +35,11 @@ public class DebuggerBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   public static String getAddressDisplayName(final RemoteConnection connection) {
     return connection.isUseSockets() ? StringUtil.notNullize(connection.getDebuggerHostName()) + ":" + connection.getDebuggerAddress()
                                      : connection.getDebuggerAddress();

java/idea-ui/src/com/intellij/ide/JavaUiBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class JavaUiBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.JavaUiBundle";
   private static final JavaUiBundle INSTANCE = new JavaUiBundle();
@@ -16,4 +18,9 @@ public class JavaUiBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/QuickFixBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class QuickFixBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.QuickFixBundle";
   private static final QuickFixBundle INSTANCE = new QuickFixBundle();
@@ -16,4 +18,9 @@ public class QuickFixBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

java/java-impl/src/com/intellij/codeInsight/completion/CompletionBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class CompletionBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.CompletionBundle";
   private static final CompletionBundle INSTANCE = new CompletionBundle();
@@ -30,4 +32,9 @@ public class CompletionBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

java/java-impl/src/com/intellij/javadoc/JavadocBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class JavadocBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.JavadocBundle";
   private static final JavadocBundle INSTANCE = new JavadocBundle();
@@ -30,4 +32,9 @@ public class JavadocBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

java/java-impl/src/com/intellij/refactoring/RefactorJBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class RefactorJBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.RefactorJBundle";
   private static final RefactorJBundle INSTANCE = new RefactorJBundle();
@@ -30,4 +32,9 @@ public class RefactorJBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

java/java-psi-api/src/com/intellij/core/JavaCoreBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class JavaCoreBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.JavaCoreBundle";
   private static final JavaCoreBundle INSTANCE = new JavaCoreBundle();
@@ -30,7 +32,12 @@ public class JavaCoreBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
-  
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   public static boolean contains(String key) {
     return INSTANCE.containsKey(key);
   }

java/java-psi-impl/src/com/intellij/codeInsight/daemon/JavaErrorBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class JavaErrorBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.JavaErrorBundle";
   public static final JavaErrorBundle INSTANCE = new JavaErrorBundle();
@@ -15,6 +17,11 @@ public class JavaErrorBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   JavaErrorBundle() {
     super(BUNDLE);
   }

json/src/com/intellij/json/JsonBundle.java

@@ -5,6 +5,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class JsonBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.JsonBundle";
   private static final JsonBundle INSTANCE = new JsonBundle();
@@ -17,4 +19,9 @@ public class JsonBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/analysis-api/src/com/intellij/analysis/AnalysisScopeBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class AnalysisScopeBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.AnalysisScopeBundle";
   private static final AnalysisScopeBundle INSTANCE = new AnalysisScopeBundle();
@@ -30,4 +32,9 @@ public class AnalysisScopeBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/analysis-api/src/com/intellij/codeInsight/daemon/DaemonBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class DaemonBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.DaemonBundle";
   private static final DaemonBundle INSTANCE = new DaemonBundle();
@@ -30,4 +32,9 @@ public class DaemonBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/analysis-api/src/com/intellij/codeInspection/CommonQuickFixBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class CommonQuickFixBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.CommonQuickFixBundle";
   private static final CommonQuickFixBundle INSTANCE = new CommonQuickFixBundle();
@@ -16,4 +18,9 @@ public class CommonQuickFixBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/analysis-api/src/com/intellij/codeInspection/InspectionsBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class InspectionsBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.InspectionsBundle";
   private static final InspectionsBundle INSTANCE = new InspectionsBundle();
@@ -30,4 +32,9 @@ public class InspectionsBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/analysis-impl/src/com/intellij/find/FindBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class FindBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.FindBundle";
   private static final FindBundle INSTANCE = new FindBundle();
@@ -33,4 +35,9 @@ public class FindBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/core-api/src/com/intellij/codeInsight/CodeInsightBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class CodeInsightBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.CodeInsightBundle";
   private static final CodeInsightBundle INSTANCE = new CodeInsightBundle();
@@ -30,4 +32,9 @@ public class CodeInsightBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/core-api/src/com/intellij/openapi/editor/EditorBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class EditorBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.EditorBundle";
   private static final EditorBundle INSTANCE = new EditorBundle();
@@ -30,4 +32,9 @@ public class EditorBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/core-api/src/com/intellij/psi/PsiBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class PsiBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.PsiBundle";
   private static final PsiBundle INSTANCE = new PsiBundle();
@@ -30,7 +32,12 @@ public class PsiBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
-  
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   @NotNull
   public static String visibilityPresentation(@NotNull String modifier) {
     return message(modifier + ".visibility.presentation");

platform/core-impl/src/com/intellij/lang/LangBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class LangBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.LangBundle";
   private static final LangBundle INSTANCE = new LangBundle();
@@ -33,4 +35,9 @@ public class LangBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/core-impl/src/com/intellij/openapi/fileTypes/FileTypesBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class FileTypesBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.FileTypesBundle";
 
@@ -33,4 +35,9 @@ public class FileTypesBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java

@@ -5,6 +5,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class DupLocatorBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.DupLocatorBundle";
 
@@ -18,4 +20,9 @@ public class DupLocatorBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/dvcs-impl/src/com/intellij/dvcs/ui/DvcsBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class DvcsBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.DvcsBundle";
   private static final DvcsBundle INSTANCE = new DvcsBundle();
@@ -31,6 +33,11 @@ public class DvcsBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   @NotNull
   public static String getString(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) {
     return message(key);

platform/editor-ui-api/src/com/intellij/openapi/vcs/VcsBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class VcsBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.VcsBundle";
   public static final VcsBundle INSTANCE = new VcsBundle();
@@ -31,6 +33,11 @@ public class VcsBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   public static String getString(@PropertyKey(resourceBundle = BUNDLE) final String key) {
     return message(key);
   }

platform/lang-api/src/com/intellij/execution/ExecutionBundle.java

@@ -6,6 +6,8 @@ import com.intellij.DynamicBundle;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 /**
  * @author lesya
  */
@@ -15,6 +17,11 @@ public class ExecutionBundle extends DynamicBundle {
     return ourInstance.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = PATH_TO_BUNDLE) String key, Object @NotNull ... params) {
+    return ourInstance.getLazyMessage(key, params);
+  }
+
   public static final String PATH_TO_BUNDLE = "messages.ExecutionBundle";
   private static final AbstractBundle ourInstance = new ExecutionBundle();
 

platform/lang-api/src/com/intellij/refactoring/RefactoringBundle.java

@@ -22,6 +22,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class RefactoringBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.RefactoringBundle";
   private static final RefactoringBundle INSTANCE = new RefactoringBundle();
@@ -32,7 +34,12 @@ public class RefactoringBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
-  
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   @NotNull
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) {
     return INSTANCE.getMessage(key);

platform/lang-api/src/com/intellij/usageView/UsageViewBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class UsageViewBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.UsageView";
 
@@ -33,6 +35,11 @@ public class UsageViewBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   @SuppressWarnings({"AutoBoxing"})
   public static String getOccurencesString(int usagesCount, int filesCount) {
     return " (" + message("occurence.info.occurence", usagesCount, filesCount) + ")";

platform/lang-impl/src/com/intellij/codeEditor/printing/CodeEditorBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class CodeEditorBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.CodeEditorBundle";
   private static final CodeEditorBundle INSTANCE = new CodeEditorBundle();
@@ -31,4 +33,9 @@ public class CodeEditorBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/lang-impl/src/com/intellij/tools/ToolsBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class ToolsBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.ToolsBundle";
   private static final ToolsBundle INSTANCE = new ToolsBundle();
@@ -33,4 +35,9 @@ public class ToolsBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/platform-api/src/com/intellij/openapi/application/ApplicationBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 /**
  * Provides access to localized properties of the IntelliJ Platform.
  */
@@ -35,4 +37,9 @@ public class ApplicationBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/platform-api/src/com/intellij/openapi/diff/DiffBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class DiffBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.DiffBundle";
 
@@ -31,4 +33,9 @@ public class DiffBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/platform-api/src/com/intellij/openapi/keymap/KeyMapBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class KeyMapBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.KeyMapBundle";
   private static final KeyMapBundle INSTANCE = new KeyMapBundle();
@@ -31,4 +33,9 @@ public class KeyMapBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/platform-api/src/com/intellij/openapi/options/OptionsBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class OptionsBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.OptionsBundle";
   public static final OptionsBundle INSTANCE = new OptionsBundle();
@@ -30,4 +32,9 @@ public class OptionsBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/platform-impl/src/com/intellij/diagnostic/DiagnosticBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class DiagnosticBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.DiagnosticBundle";
   private static final DiagnosticBundle INSTANCE = new DiagnosticBundle();
@@ -30,4 +32,9 @@ public class DiagnosticBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/projectModel-api/src/com/intellij/openapi/project/ProjectBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public final class ProjectBundle extends DynamicBundle {
   @NonNls
   public static final String BUNDLE = "messages.ProjectBundle";
@@ -19,4 +21,9 @@ public final class ProjectBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class CloudBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.CloudBundle";
   private static final CloudBundle INSTANCE = new CloudBundle();
@@ -30,4 +32,9 @@ public class CloudBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestsRunnerBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class SMTestsRunnerBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.SMTestsRunnerBundle";
   private static final SMTestsRunnerBundle INSTANCE = new SMTestsRunnerBundle();
@@ -30,4 +32,9 @@ public class SMTestsRunnerBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java

@@ -5,6 +5,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class SSRBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.SSRBundle";
   private static final SSRBundle INSTANCE = new SSRBundle();
@@ -15,4 +17,9 @@ public class SSRBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/tasks-platform-impl/src/com/intellij/tasks/TaskBundle.java

@@ -5,6 +5,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class TaskBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.TaskBundle";
   private static final TaskBundle INSTANCE = new TaskBundle();
@@ -15,4 +17,9 @@ public class TaskBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

platform/util/src/com/intellij/AbstractBundle.java

@@ -45,7 +45,7 @@ public abstract class AbstractBundle {
   }
 
   @NotNull
-  public Supplier<String> localizedMessage(@NotNull String key, Object @NotNull ... params) {
+  public Supplier<String> getLazyMessage(@NotNull String key, Object @NotNull ... params) {
     return () -> getMessage(key, params);
   }
 

platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class XDebuggerBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.XDebuggerBundle";
   private static final XDebuggerBundle INSTANCE = new XDebuggerBundle();
@@ -31,4 +33,9 @@ public class XDebuggerBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class InspectionGadgetsBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.InspectionGadgetsBundle";
   private static final InspectionGadgetsBundle INSTANCE = new InspectionGadgetsBundle();
@@ -16,4 +18,9 @@ public class InspectionGadgetsBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/IntelliLang/src/org/intellij/plugins/intelliLang/IntelliLangBundle.java

@@ -7,6 +7,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class IntelliLangBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.IntelliLangBundle";
   private static final IntelliLangBundle INSTANCE = new IntelliLangBundle();
@@ -17,4 +19,9 @@ public class IntelliLangBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class IntentionPowerPackBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.IntentionPowerPackBundle";
   private static final IntentionPowerPackBundle INSTANCE = new IntentionPowerPackBundle();
@@ -31,6 +33,11 @@ public class IntentionPowerPackBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   public static String defaultableMessage(@PropertyKey(resourceBundle = BUNDLE) String key, Object... params) {
     return INSTANCE.messageOrDefault(key, "default", true, params);
   }

plugins/ant/src/com/intellij/lang/ant/AntBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class AntBundle extends DynamicBundle {
   @NonNls protected static final String BUNDLE = "messages.AntBundle";
   private static final AntBundle INSTANCE = new AntBundle();
@@ -30,4 +32,9 @@ public class AntBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class AntActionsBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.AntActionsBundle";
   private static final AntActionsBundle INSTANCE = new AntActionsBundle();
@@ -30,4 +32,9 @@ public class AntActionsBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/cvs/cvs-core/src/com/intellij/CvsBundle.java

@@ -19,6 +19,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class CvsBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.CvsBundle";
   private static final CvsBundle INSTANCE = new CvsBundle();
@@ -30,6 +32,11 @@ public class CvsBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   public static String getCvsDisplayName() {
     return message("general.cvs.display.name");
   }

plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class EclipseBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.EclipseBundle";
   private static final EclipseBundle INSTANCE = new EclipseBundle();
@@ -30,4 +32,9 @@ public class EclipseBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/git4idea/src/git4idea/i18n/GitBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class GitBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.GitBundle";
   private static final GitBundle INSTANCE = new GitBundle();
@@ -31,6 +33,11 @@ public class GitBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   @NotNull
   public static String getString(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) {
     return message(key);

plugins/gradle/java/src/codeInspection/GradleInspectionBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class GradleInspectionBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.GradleInspectionBundle";
   private static final GradleInspectionBundle INSTANCE = new GradleInspectionBundle();
@@ -30,4 +32,9 @@ public class GradleInspectionBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.java

@@ -20,6 +20,8 @@ import com.intellij.DynamicBundle;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class GroovyBundle extends DynamicBundle {
   public static final String BUNDLE = "messages.GroovyBundle";
   private static final GroovyBundle INSTANCE = new GroovyBundle();
@@ -30,4 +32,9 @@ public class GroovyBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyInspectionBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class GroovyInspectionBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.GroovyInspectionBundle";
   private static final GroovyInspectionBundle INSTANCE = new GroovyInspectionBundle();
@@ -30,4 +32,9 @@ public class GroovyInspectionBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/intentions/GroovyIntentionsBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class GroovyIntentionsBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.GroovyIntentionsBundle";
   private static final GroovyIntentionsBundle INSTANCE = new GroovyIntentionsBundle();
@@ -31,4 +33,9 @@ public class GroovyIntentionsBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyCodeInsightBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class GroovyCodeInsightBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.GroovyCodeInsightBundle";
   private static final GroovyCodeInsightBundle INSTANCE = new GroovyCodeInsightBundle();
@@ -30,4 +32,9 @@ public class GroovyCodeInsightBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class GroovyDocBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.GroovyDocBundle";
   private static final GroovyDocBundle INSTANCE = new GroovyDocBundle();
@@ -31,5 +33,10 @@ public class GroovyDocBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }
 

plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class GroovyRefactoringBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.GroovyRefactoringBundle";
   private static final GroovyRefactoringBundle INSTANCE = new GroovyRefactoringBundle();
@@ -31,4 +33,9 @@ public class GroovyRefactoringBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/hg4idea/src/org/zmlx/hg4idea/HgBundle.java

@@ -17,6 +17,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class HgBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.HgBundle";
   private static final HgBundle INSTANCE = new HgBundle();
@@ -27,4 +29,9 @@ public class HgBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/markdown/src/org/intellij/plugins/markdown/MarkdownBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class MarkdownBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.MarkdownBundle";
   private static final MarkdownBundle INSTANCE = new MarkdownBundle();
@@ -30,4 +32,9 @@ public class MarkdownBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class MavenDomBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.MavenDomBundle";
   private static final MavenDomBundle INSTANCE = new MavenDomBundle();
@@ -30,4 +32,9 @@ public class MavenDomBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class IndicesBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.MavenIndicesBundle";
   private static final IndicesBundle INSTANCE = new IndicesBundle();
@@ -30,4 +32,9 @@ public class IndicesBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class MavenProjectBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.MavenProjectBundle";
   private static final MavenProjectBundle INSTANCE = new MavenProjectBundle();
@@ -30,4 +32,9 @@ public class MavenProjectBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class TasksBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.MavenTasksBundle";
   private static final TasksBundle INSTANCE = new TasksBundle();
@@ -30,4 +32,9 @@ public class TasksBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class MavenWizardBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.MavenWizardBundle";
   private static final MavenWizardBundle INSTANCE = new MavenWizardBundle();
@@ -16,4 +18,9 @@ public class MavenWizardBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class PropertiesBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.PropertiesBundle";
   private static final PropertiesBundle INSTANCE = new PropertiesBundle();
@@ -30,4 +32,9 @@ public class PropertiesBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/sh/src/com/intellij/sh/ShBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class ShBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.ShBundle";
   private static final ShBundle INSTANCE = new ShBundle();
@@ -16,4 +18,9 @@ public class ShBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class SvnBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.SvnBundle";
 
@@ -32,6 +34,11 @@ public class SvnBundle extends DynamicBundle {
     return INSTANCE.getMessage(key, params);
   }
 
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+
   @NotNull
   public static String getString(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) {
     return message(key);

plugins/ui-designer-core/src/com/intellij/designer/DesignerBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class DesignerBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.DesignerBundle";
   private static final DesignerBundle INSTANCE = new DesignerBundle();
@@ -30,4 +32,9 @@ public class DesignerBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/ui-designer/src/com/intellij/uiDesigner/UIDesignerBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class UIDesignerBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.UIDesignerBundle";
   private static final UIDesignerBundle INSTANCE = new UIDesignerBundle();
@@ -30,4 +32,9 @@ public class UIDesignerBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

plugins/yaml/src/org/jetbrains/yaml/YAMLBundle.java

@@ -5,6 +5,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class YAMLBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.YAMLBundle";
   private static final YAMLBundle INSTANCE = new YAMLBundle();
@@ -15,4 +17,9 @@ public class YAMLBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

python/python-psi-impl/src/com/jetbrains/python/PyPsiBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class PyPsiBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.PyPsiBundle";
   public static final PyPsiBundle INSTANCE = new PyPsiBundle();
@@ -30,4 +32,9 @@ public class PyPsiBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

python/rest/src/com/jetbrains/rest/RestBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class RestBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.RestBundle";
   private static final RestBundle INSTANCE = new RestBundle();
@@ -30,4 +32,9 @@ public class RestBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

python/src/com/jetbrains/python/PyBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class PyBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.PyBundle";
   public static final PyBundle INSTANCE = new PyBundle();
@@ -30,4 +32,9 @@ public class PyBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

spellchecker/src/com/intellij/spellchecker/util/SpellCheckerBundle.java

@@ -20,6 +20,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class SpellCheckerBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.SpellCheckerBundle";
   private static final SpellCheckerBundle INSTANCE = new SpellCheckerBundle();
@@ -30,4 +32,9 @@ public class SpellCheckerBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

xml/dom-openapi/src/com/intellij/util/xml/DomBundle.java

@@ -21,6 +21,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class DomBundle extends DynamicBundle {
   @NonNls private static final String BUNDLE = "messages.DomBundle";
   private static final DomBundle INSTANCE = new DomBundle();
@@ -31,4 +33,9 @@ public class DomBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }

xml/xml-psi-api/src/com/intellij/xml/XmlBundle.java

@@ -6,6 +6,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
+import java.util.function.Supplier;
+
 public class XmlBundle extends DynamicBundle {
   @NonNls public static final String BUNDLE = "messages.XmlBundle";
   private static final XmlBundle INSTANCE = new XmlBundle();
@@ -16,4 +18,9 @@ public class XmlBundle extends DynamicBundle {
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
     return INSTANCE.getMessage(key, params);
   }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
 }