Merge pull request #2848 from tshedor/master

fix: respect query and required parameters

@@ -700,9 +700,7 @@ class GetDelegate extends RouterDelegate<RouteDecoder>
       RouteDecoder decoder, PageSettings arguments) {
       RouteDecoder decoder, PageSettings arguments) {
     final parameters =
     final parameters =
         arguments.params.isEmpty ? arguments.query : arguments.params;
         arguments.params.isEmpty ? arguments.query : arguments.params;
-    if (arguments.params.isEmpty) {
-      arguments.params.addAll(arguments.query);
-    }
+    arguments.params.addAll(arguments.query);
     if (decoder.parameters.isEmpty) {
     if (decoder.parameters.isEmpty) {
       decoder.parameters.addAll(parameters);
       decoder.parameters.addAll(parameters);
     }
     }

@@ -160,6 +160,14 @@ void main() {
 
 
       expect(Get.parameters['id'], '1234');
       expect(Get.parameters['id'], '1234');
       expect(Get.parameters['name'], 'ana');
       expect(Get.parameters['name'], 'ana');
+
+      Get.toNamed('/last/1234/ana/profile?job=dev');
+
+      await tester.pumpAndSettle();
+
+      expect(Get.parameters['id'], '1234');
+      expect(Get.parameters['name'], 'ana');
+      expect(Get.parameters['job'], 'dev');
     },
     },
   );
   );