IJPL-161883 Fix cyclic initialization between LocalizationStateService and MacroManager

Bundle.getMessage calls moved from constructors to the getDescription method in some *Macro classes to use it lazy and avoid issues with cyclic dependencies when getting the locale.


(cherry picked from commit 7741209200df121e4e7785ee58fd48c329a18077)

IJ-CR-149835

GitOrigin-RevId: a213423284890ad9f7b01e53da0c7129f430b4cf

platform/macro/api-dump-unreviewed.txt

@@ -13,6 +13,7 @@ c:com.intellij.ide.macro.ClipboardContentMacro
 f:com.intellij.ide.macro.ColumnNumberMacro
 - com.intellij.ide.macro.EditorMacro
 - <init>():V
+- getDescription():java.lang.String
 f:com.intellij.ide.macro.CompilerContextMakeMacro
 - com.intellij.ide.macro.Macro
 - sf:COMPILER_CONTEXT_MAKE_KEY:com.intellij.openapi.actionSystem.DataKey
@@ -29,12 +30,11 @@ c:com.intellij.ide.macro.ContentRootMacro
 - getName():java.lang.String
 a:com.intellij.ide.macro.EditorMacro
 - com.intellij.ide.macro.Macro
-- <init>(java.lang.String,java.lang.String):V
+- <init>(java.lang.String):V
 - f:expand(com.intellij.openapi.actionSystem.DataContext):java.lang.String
 - pa:expand(com.intellij.openapi.editor.Editor):java.lang.String
 - ps:getColumnNumber(com.intellij.openapi.editor.Editor,I):java.lang.String
 - ps:getColumnNumber(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.LogicalPosition):java.lang.String
-- getDescription():java.lang.String
 - ps:getLineNumber(com.intellij.openapi.editor.Editor,I):I
 - getName():java.lang.String
 f:com.intellij.ide.macro.FileDirMacro
@@ -193,6 +193,7 @@ f:com.intellij.ide.macro.JdkPathMacro
 f:com.intellij.ide.macro.LineNumberMacro
 - com.intellij.ide.macro.EditorMacro
 - <init>():V
+- getDescription():java.lang.String
 a:com.intellij.ide.macro.Macro
 - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName
 - <init>():V
@@ -321,22 +322,27 @@ c:com.intellij.ide.macro.SelectedTextMacro
 - com.intellij.ide.macro.EditorMacro
 - <init>():V
 - p:expand(com.intellij.openapi.editor.Editor):java.lang.String
+- getDescription():java.lang.String
 c:com.intellij.ide.macro.SelectionEndColumnMacro
 - com.intellij.ide.macro.EditorMacro
 - <init>():V
 - p:expand(com.intellij.openapi.editor.Editor):java.lang.String
+- getDescription():java.lang.String
 c:com.intellij.ide.macro.SelectionEndLineMacro
 - com.intellij.ide.macro.EditorMacro
 - <init>():V
 - p:expand(com.intellij.openapi.editor.Editor):java.lang.String
+- getDescription():java.lang.String
 c:com.intellij.ide.macro.SelectionStartColumnMacro
 - com.intellij.ide.macro.EditorMacro
 - <init>():V
 - p:expand(com.intellij.openapi.editor.Editor):java.lang.String
+- getDescription():java.lang.String
 c:com.intellij.ide.macro.SelectionStartLineMacro
 - com.intellij.ide.macro.EditorMacro
 - <init>():V
 - p:expand(com.intellij.openapi.editor.Editor):java.lang.String
+- getDescription():java.lang.String
 f:com.intellij.ide.macro.SourcepathEntryMacro
 - com.intellij.ide.macro.Macro
 - com.intellij.ide.macro.PathMacro

platform/macro/src/com/intellij/ide/macro/ColumnNumberMacro.java

@@ -18,10 +18,17 @@ package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeCoreBundle;
 import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
 
 public final class ColumnNumberMacro extends EditorMacro {
   public ColumnNumberMacro() {
-    super("ColumnNumber", IdeCoreBundle.message("macro.column.number"));
+    super("ColumnNumber");
+  }
+
+  @Override
+  @NotNull
+  public String getDescription() {
+    return IdeCoreBundle.message("macro.column.number");
   }
 
   @Override

platform/macro/src/com/intellij/ide/macro/EditorMacro.java

@@ -6,18 +6,15 @@ import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorCoreUtil;
 import com.intellij.openapi.editor.LogicalPosition;
-import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 
 public abstract class EditorMacro extends Macro {
   private final String myName;
-  private final @Nls String myDescription;
 
-  public EditorMacro(@NotNull String name, @NotNull @Nls String description) {
+  public EditorMacro(@NotNull String name) {
     myName = name;
-    myDescription = description;
   }
 
   @NotNull
@@ -26,12 +23,6 @@ public abstract class EditorMacro extends Macro {
     return myName;
   }
 
-  @NotNull
-  @Override
-  public String getDescription() {
-    return myDescription;
-  }
-
   @Override
   public final String expand(@NotNull DataContext dataContext) {
     Editor editor = CommonDataKeys.EDITOR.getData(dataContext);

platform/macro/src/com/intellij/ide/macro/LineNumberMacro.java

@@ -18,10 +18,17 @@ package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeCoreBundle;
 import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
 
 public final class LineNumberMacro extends EditorMacro {
   public LineNumberMacro() {
-    super("LineNumber", IdeCoreBundle.message("macro.line.number"));
+    super("LineNumber");
+  }
+
+  @Override
+  @NotNull
+  public String getDescription() {
+    return IdeCoreBundle.message("macro.line.number");
   }
 
   @Override

platform/macro/src/com/intellij/ide/macro/SelectedTextMacro.java

@@ -3,11 +3,18 @@ package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeCoreBundle;
 import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
 
 
 public class SelectedTextMacro extends EditorMacro {
   public SelectedTextMacro() {
-    super("SelectedText", IdeCoreBundle.message("ide.macro.text.selected.in.the.editor"));
+    super("SelectedText");
+  }
+
+  @Override
+  @NotNull
+  public String getDescription() {
+    return IdeCoreBundle.message("ide.macro.text.selected.in.the.editor");
   }
 
   @Override

platform/macro/src/com/intellij/ide/macro/SelectionEndColumnMacro.java

@@ -3,11 +3,18 @@ package com.intellij.ide.macro;
 
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
 
 
 public class SelectionEndColumnMacro extends EditorMacro {
   public SelectionEndColumnMacro() {
-    super("SelectionEndColumn", ExecutionBundle.message("ide.macro.selected.text.end.column.number"));
+    super("SelectionEndColumn");
+  }
+
+  @Override
+  @NotNull
+  public String getDescription() {
+    return ExecutionBundle.message("ide.macro.selected.text.end.column.number");
   }
 
   @Override

platform/macro/src/com/intellij/ide/macro/SelectionEndLineMacro.java

@@ -3,11 +3,18 @@ package com.intellij.ide.macro;
 
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
 
 
 public class SelectionEndLineMacro extends EditorMacro {
   public SelectionEndLineMacro() {
-    super("SelectionEndLine", ExecutionBundle.message("ide.macro.selected.text.end.line.number"));
+    super("SelectionEndLine");
+  }
+
+  @Override
+  @NotNull
+  public String getDescription() {
+    return ExecutionBundle.message("ide.macro.selected.text.end.line.number");
   }
 
   @Override

platform/macro/src/com/intellij/ide/macro/SelectionStartColumnMacro.java

@@ -3,11 +3,18 @@ package com.intellij.ide.macro;
 
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
 
 
 public class SelectionStartColumnMacro extends EditorMacro {
   public SelectionStartColumnMacro() {
-    super("SelectionStartColumn", ExecutionBundle.message("ide.macro.selected.text.start.column.number"));
+    super("SelectionStartColumn");
+  }
+
+  @Override
+  @NotNull
+  public String getDescription() {
+    return ExecutionBundle.message("ide.macro.selected.text.start.column.number");
   }
 
   @Override

platform/macro/src/com/intellij/ide/macro/SelectionStartLineMacro.java

@@ -3,11 +3,18 @@ package com.intellij.ide.macro;
 
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
 
 
 public class SelectionStartLineMacro extends EditorMacro {
   public SelectionStartLineMacro() {
-    super("SelectionStartLine", ExecutionBundle.message("ide.macro.selected.text.start.line.number"));
+    super("SelectionStartLine");
+  }
+
+  @Override
+  @NotNull
+  public String getDescription() {
+    return ExecutionBundle.message("ide.macro.selected.text.start.line.number");
   }
 
   @Override