Fix line endings on Windows (2nd attempt)

Author: julianhyde

testkit/src/main/java/org/apache/calcite/test/QuidemTest.java

@@ -348,7 +348,8 @@ public static class SubPlanCommand extends AbstractCommand {
             relNode = RelDecorrelator.decorrelateQuery(relNode, relBuilder);
           }
 
-          x.echo(ImmutableList.of(RelOptUtil.toString(relNode)));
+          final String s = RelOptUtil.toString(relNode);
+          x.echo(ImmutableList.copyOf(s.split(System.lineSeparator())));
         }
       } else {
         x.echo(content);
@@ -664,7 +665,26 @@ private static void applyRulesInOrder(String value,
 
   public static RelOptRule getCoreRule(String ruleName) {
     try {
-      Field ruleField = CoreRules.class.getField(ruleName);
+      // Support "ClassName.FIELD_NAME" syntax for non-CoreRules rule classes.
+      // E.g. "PruneEmptyRules.PROJECT_INSTANCE"
+      final Class<?> ruleClass;
+      final String fieldName;
+      int dotIndex = ruleName.indexOf('.');
+      if (dotIndex >= 0) {
+        String className = ruleName.substring(0, dotIndex);
+        fieldName = ruleName.substring(dotIndex + 1);
+        switch (className) {
+        case "PruneEmptyRules":
+          ruleClass = PruneEmptyRules.class;
+          break;
+        default:
+          throw new IllegalArgumentException("Unknown rule class: " + className);
+        }
+      } else {
+        ruleClass = CoreRules.class;
+        fieldName = ruleName;
+      }
+      Field ruleField = ruleClass.getField(fieldName);
       Object o = ruleField.get(null);
 
       if (o instanceof RelOptRule) {