Use ::: as scalacopts delimiter (bazel-contrib#1053)

* initial

* polish

* lint

* one more

* remove integ test

* add unit test

* add tests that uses scalacopts

* minor

* comment

* accumlative macro options

* rm tests

* more clear options

Author: wisechengyi

scala/private/rule_impls.bzl

@@ -141,7 +141,9 @@ DiagnosticsFile: {diagnostics_output}
 """.format(
         out = output.path,
         manifest = manifest.path,
-        scala_opts = ",".join(scalacopts),
+        # Using ':::' as delimiter because ',' can collide with actual scalac options
+        # https://github.com/bazelbuild/rules_scala/issues/1049
+        scala_opts = ":::".join(scalacopts),
         print_compile_time = print_compile_time,
         expect_java_output = expect_java_output,
         plugin_arg = plugin_arg,

src/java/io/bazel/rulesscala/scalac/CompileOptions.java

@@ -37,7 +37,7 @@ public CompileOptions(List<String> args) {
     outputName = getOrError(argMap, "JarOutput", "Missing required arg JarOutput");
     manifestPath = getOrError(argMap, "Manifest", "Missing required arg Manifest");
 
-    scalaOpts = getCommaList(argMap, "ScalacOpts");
+    scalaOpts = getTripleColonList(argMap, "ScalacOpts");
     printCompileTime = booleanGetOrFalse(argMap, "PrintCompileTime");
     expectJavaOutput = booleanGetOrTrue(argMap, "ExpectJavaOutput");
     pluginArgs = buildPluginArgs(getOrEmpty(argMap, "Plugins"));
@@ -101,6 +101,19 @@ private static HashMap<String, String> buildArgMap(List<String> lines) {
     return hm;
   }
 
+  protected static String[] getTripleColonList(Map<String, String> m, String k) {
+    if (m.containsKey(k)) {
+      String v = m.get(k);
+      if ("".equals(v)) {
+        return new String[] {};
+      } else {
+        return v.split(":::");
+      }
+    } else {
+      return new String[] {};
+    }
+  }
+
   private static String[] getCommaList(Map<String, String> m, String k) {
     if (m.containsKey(k)) {
       String v = m.get(k);

test/scalacopts/A.scala

@@ -0,0 +1,15 @@
+package scalacopts
+
+import scala.reflect.macros.blackbox
+import scala.language.experimental.macros
+
+object Macros {
+  def hello: String = macro macroSettings
+
+  def macroSettings(c: blackbox.Context): c.Expr[String] = {
+    import c.universe._
+    // c.settings are the values from scalac's -Xmacro-settings
+    val s = c.settings.mkString(",")
+    c.Expr(q"""${s}""")
+  }
+}

test/scalacopts/BUILD

@@ -0,0 +1,19 @@
+load("//scala:scala.bzl", "scala_macro_library", "scala_test")
+
+scala_macro_library(
+    name = "A",
+    srcs = ["A.scala"],
+)
+
+scala_test(
+    name = "EchoMacroSettings",
+    srcs = ["EchoMacroSettings.scala"],
+    scalacopts = [
+        # The macro settings are used in the test itself.
+        "-Xmacro-settings:name=Mike,location=US",
+        "-Xmacro-settings:hobby=basketball,soccer",
+    ],
+    deps = [
+        ":A",
+    ],
+)

test/scalacopts/EchoMacroSettings.scala

@@ -0,0 +1,23 @@
+// Copyright 2016 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package scalacopts
+
+import org.scalatest._
+
+class EchoMacroSettings extends FlatSpec {
+  "macro output" should "match scalac options" in {
+    assert(Macros.hello.equals("name=Mike,location=US,hobby=basketball,soccer"))
+  }
+}