removed unecessary methods and branching

Author: jyameo

dwds/lib/src/debugging/dart_runtime_debugger.dart

@@ -231,14 +231,4 @@ class DartRuntimeDebugger {
       ),
     );
   }
-
-  /// Generates a JS expression to retrieve a library variable.
-  /// This method is only available for the `RequireStrategy`.
-  String getLibraryVariableJsExpression(
-    String libraryUri,
-    String libraryName,
-    String variable,
-  ) {
-    return '${_loadStrategy.loadModuleSnippet}("dart_sdk").dart.getModuleLibraries("$libraryName")["$libraryUri"]["$variable"]';
-  }
 }

dwds/lib/src/debugging/inspector.dart

@@ -278,7 +278,9 @@ class AppInspector implements AppInspectorInterface {
   Future<RemoteObject> invoke(
     String targetId,
     String selector,
-    List<dynamic> arguments,
+    [
+    List<dynamic> arguments = const [],
+  ]
   ) async {
     final remoteArguments =
         arguments.cast<String>().map(remoteObjectFor).toList();
@@ -368,49 +370,6 @@ class AppInspector implements AppInspectorInterface {
     return _jsCallFunction(expression, arguments);
   }
 
-  /// Evaluates the specified top-level variable [variableName] within the
-  /// library identified by [libraryName] and [libraryUri] using the
-  /// RequireStrategy.
-  Future<RemoteObject> _evaluateLibraryVariable(
-    String libraryUri,
-    String libraryName,
-    String variableName,
-  ) {
-    return jsEvaluate(
-      globalToolConfiguration.loadStrategy.dartRuntimeDebugger
-          .getLibraryVariableJsExpression(
-        libraryUri,
-        libraryName,
-        variableName,
-      ),
-    );
-  }
-
-  /// Retrieves a reference to a library variable or method by evaluating
-  /// the specified [variableName] or invoking the provided [methodName].
-  /// The evaluation method is determined based on the current load strategy.
-  ///
-  /// If the load strategy uses `DdcLibraryBundleStrategy`, it evaluates the
-  /// method with the given [libraryUri] and [methodName]. Otherwise, it
-  /// evaluates the variable using [libraryUri], [libraryName], and [variableName].
-  Future<RemoteObject> getLibraryReference(
-    String libraryUri,
-    String libraryName,
-    String variableName,
-    String methodName,
-  ) {
-    return globalToolConfiguration.loadStrategy is DdcLibraryBundleStrategy
-        ? _evaluateLibraryMethodWithDdcLibraryBundle(
-            libraryUri,
-            methodName,
-          )
-        : _evaluateLibraryVariable(
-            libraryUri,
-            libraryName,
-            variableName,
-          );
-  }
-
   /// Call [function] with objects referred by [argumentIds] as arguments.
   @override
   Future<RemoteObject> callFunction(

dwds/test/instances/common/instance_common.dart

@@ -121,61 +121,47 @@ void runTests({
 
     final libraryUri = 'org-dartlang-app:///example/scopes/main.dart';
 
-    String libraryName(CompilationMode compilationMode) =>
-        compilationMode == CompilationMode.frontendServer
-            ? 'example/scopes/main.dart'
-            : 'example/scopes/main';
-
-    /// Retrieves a reference to a library variable or method by evaluating
-    /// the specified [variableName] and invoking the provided [methodName].
-    /// The target library must define both [variableName] and [methodName].
-    Future<RemoteObject> fetchLibraryReference(
-      String variableName,
-      String methodName,
-    ) =>
-        inspector.getLibraryReference(
-          libraryUri,
-          libraryName(compilationMode),
-          variableName,
-          methodName,
-        );
-
     String newInterceptorsExpression(String type) =>
         'new (require("dart_sdk")._interceptors.$type).new()';
 
     final newDartError = 'new (require("dart_sdk").dart).DartError';
 
     /// A reference to the the variable `libraryPublicFinal`, an instance of
     /// `MyTestClass`.
-    Future<RemoteObject> getLibraryPublicFinalRef() => fetchLibraryReference(
-          'libraryPublicFinal',
+    Future<RemoteObject> getLibraryPublicFinalRef() => inspector.invoke(
+          libraryUri,
           'getLibraryPublicFinal',
         );
 
     /// A reference to the the variable `libraryPublic`, a List of Strings.
-    Future<RemoteObject> getLibraryPublicRef() => fetchLibraryReference(
-          'libraryPublic',
+    Future<RemoteObject> getLibraryPublicRef() => inspector.invoke(
+          libraryUri,
           'getLibraryPublic',
         );
 
     /// A reference to the variable `map`.
-    Future<RemoteObject> getMapRef() => fetchLibraryReference(
-          'map',
+    Future<RemoteObject> getMapRef() => inspector.invoke(
+          libraryUri,
           'getMap',
         );
 
     /// A reference to the variable `identityMap`.
-    Future<RemoteObject> getIdentityMapRef() => fetchLibraryReference(
-          'identityMap',
+    Future<RemoteObject> getIdentityMapRef() => inspector.invoke(
+          libraryUri,
           'getIdentityMap',
         );
 
     /// A reference to the variable `stream`.
-    Future<RemoteObject> getStreamRef() => fetchLibraryReference(
-          'stream',
+    Future<RemoteObject> getStreamRef() => inspector.invoke(
+          libraryUri,
           'getStream',
         );
 
+    final unsupportedTestMsg =
+        'This test is not supported with the DDC Library '
+        "Bundle Format because the dartDevEmbedder doesn't let you access compiled "
+        'constructors at runtime.';
+
     group('instanceRef', () {
       setUp(() => setCurrentLogWriter(debug: debug));
 
@@ -292,7 +278,7 @@ void runTests({
         },
         skip: provider.ddcModuleFormat == ModuleFormat.ddc &&
                 canaryFeatures == true
-            ? 'This test is not supported with the DDC Library Bundle Format.'
+            ? unsupportedTestMsg
             : null,
       );
 
@@ -310,7 +296,7 @@ void runTests({
         },
         skip: provider.ddcModuleFormat == ModuleFormat.ddc &&
                 canaryFeatures == true
-            ? 'This test is not supported with the DDC Library Bundle Format.'
+            ? unsupportedTestMsg
             : null,
       );
 
@@ -328,7 +314,7 @@ void runTests({
         },
         skip: provider.ddcModuleFormat == ModuleFormat.ddc &&
                 canaryFeatures == true
-            ? 'This test is not supported with the DDC Library Bundle Format.'
+            ? unsupportedTestMsg
             : null,
       );
 
@@ -346,7 +332,7 @@ void runTests({
         },
         skip: provider.ddcModuleFormat == ModuleFormat.ddc &&
                 canaryFeatures == true
-            ? 'This test is not supported with the DDC Library Bundle Format.'
+            ? unsupportedTestMsg
             : null,
       );
     });
@@ -472,7 +458,7 @@ void runTests({
         },
         skip: provider.ddcModuleFormat == ModuleFormat.ddc &&
                 canaryFeatures == true
-            ? 'This test is not supported with the DDC Library Bundle Format.'
+            ? unsupportedTestMsg
             : null,
       );
 
@@ -490,7 +476,7 @@ void runTests({
         },
         skip: provider.ddcModuleFormat == ModuleFormat.ddc &&
                 canaryFeatures == true
-            ? 'This test is not supported with the DDC Library Bundle Format.'
+            ? unsupportedTestMsg
             : null,
       );
 
@@ -508,7 +494,7 @@ void runTests({
         },
         skip: provider.ddcModuleFormat == ModuleFormat.ddc &&
                 canaryFeatures == true
-            ? 'This test is not supported with the DDC Library Bundle Format.'
+            ? unsupportedTestMsg
             : null,
       );
 
@@ -526,7 +512,7 @@ void runTests({
         },
         skip: provider.ddcModuleFormat == ModuleFormat.ddc &&
                 canaryFeatures == true
-            ? 'This test is not supported with the DDC Library Bundle Format.'
+            ? unsupportedTestMsg
             : null,
       );
     });