Open VariableUtils API (scalacenter#9)

iusildra · web-flow · commit 23df7eb041ad · 2023-06-20T09:53:56.000+02:00
* created provider for VariableUtils

* name fix
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/VariablesRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/VariablesRequestHandler.java
@@ -33,6 +33,7 @@
 import com.microsoft.java.debug.core.adapter.IEvaluationProvider;
 import com.microsoft.java.debug.core.adapter.IStackFrameManager;
 import com.microsoft.java.debug.core.adapter.variables.IVariableFormatter;
+import com.microsoft.java.debug.core.adapter.variables.IVariableProvider;
 import com.microsoft.java.debug.core.adapter.variables.JavaLogicalStructure;
 import com.microsoft.java.debug.core.adapter.variables.JavaLogicalStructure.LogicalStructureExpression;
 import com.microsoft.java.debug.core.adapter.variables.JavaLogicalStructure.LogicalVariable;
@@ -78,6 +79,7 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
         boolean showStaticVariables = DebugSettings.getCurrent().showStaticVariables;
 
         Map<String, Object> options = variableFormatter.getDefaultOptions();
+        IVariableProvider variableProvider = context.getProvider(IVariableProvider.class);
         VariableUtils.applyFormatterOptions(options, varArgs.format != null && varArgs.format.hex);
         IEvaluationProvider evaluationEngine = context.getProvider(IEvaluationProvider.class);
 
@@ -260,12 +262,12 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
                 String typeName = ((ObjectReference) containerNode.getProxiedVariable()).referenceType().name();
                 // TODO: This replacement will possibly change the $ in the class name itself.
                 typeName = typeName.replaceAll("\\$", ".");
-                evaluateName = VariableUtils.getEvaluateName(javaVariable.evaluateName, "((" + typeName + ")" + containerEvaluateName + ")", false);
+                evaluateName = variableProvider.getEvaluateName(javaVariable.evaluateName, "((" + typeName + ")" + containerEvaluateName + ")", false);
             } else {
                 if (containerEvaluateName != null && containerEvaluateName.contains("%s")) {
                     evaluateName = String.format(containerEvaluateName, javaVariable.evaluateName);
                 } else {
-                    evaluateName = VariableUtils.getEvaluateName(javaVariable.evaluateName, containerEvaluateName, containerNode.isIndexedVariable());
+                    evaluateName = variableProvider.getEvaluateName(javaVariable.evaluateName, containerEvaluateName, containerNode.isIndexedVariable());
                 }
             }
 
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/variables/IVariableProvider.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/variables/IVariableProvider.java
@@ -0,0 +1,14 @@
+package com.microsoft.java.debug.core.adapter.variables;
+
+import com.microsoft.java.debug.core.adapter.IProvider;
+
+public interface IVariableProvider extends IProvider {
+  /**
+   * Get the name for evaluation of variable.
+   *
+   * @param name           the variable name, if any
+   * @param containerName  the container name, if any
+   * @param isArrayElement is the variable an array element?
+   */
+  public String getEvaluateName(String name, String containerName, boolean isArrayElement);
+}
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/variables/VariableProvider.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/variables/VariableProvider.java
@@ -0,0 +1,8 @@
+package com.microsoft.java.debug.core.adapter.variables;
+
+public class VariableProvider implements IVariableProvider {
+    @Override
+    public String getEvaluateName(String name, String containerName, boolean isArrayElement) {
+        return VariableUtils.getEvaluateName(name, containerName, isArrayElement);
+    }
+}
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtProviderContextFactory.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtProviderContextFactory.java
@@ -38,6 +38,7 @@ public static IProviderContext createProviderContext() {
         context.registerProvider(IEvaluationProvider.class, new JdtEvaluationProvider());
         context.registerProvider(ICompletionsProvider.class, new CompletionsProvider());
         context.registerProvider(IStepFilterProvider.class, new StepFilterProvider());
+        context.registerProvider(IVariableProvider.class, new VariableProvider());
 
         return context;
     }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public static IProviderContext createProviderContext() {`
`38`	`38`	`context.registerProvider(IEvaluationProvider.class, new JdtEvaluationProvider());`
`39`	`39`	`context.registerProvider(ICompletionsProvider.class, new CompletionsProvider());`
`40`	`40`	`context.registerProvider(IStepFilterProvider.class, new StepFilterProvider());`
	`41`	`+ context.registerProvider(IVariableProvider.class, new VariableProvider());`
`41`	`42`
`42`	`43`	`return context;`
`43`	`44`	`}`