From 7988a24a01464a01d80b8a772a8f90ba3224c751 Mon Sep 17 00:00:00 2001 From: Bor Kae Hwang Date: Thu, 23 Jan 2020 12:20:07 -0700 Subject: [PATCH] Move conf file --- scala/scalafmt/conf/.scalafmt.conf => .scalafmt.conf | 2 +- scala/scalafmt/scalafmt_repositories.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename scala/scalafmt/conf/.scalafmt.conf => .scalafmt.conf (87%) diff --git a/scala/scalafmt/conf/.scalafmt.conf b/.scalafmt.conf similarity index 87% rename from scala/scalafmt/conf/.scalafmt.conf rename to .scalafmt.conf index 5490b5f71..dfb81c64b 100644 --- a/scala/scalafmt/conf/.scalafmt.conf +++ b/.scalafmt.conf @@ -5,7 +5,7 @@ danglingParentheses = true docstrings = JavaDoc importSelectors = singleLine maxColumn = 120 -newlines.afterImplicitKWInVerticalMultiline = true +verticalMultiline.newlineBeforeImplicitKW = true rewrite.redundantBraces.stringInterpolation = true rewrite.rules = [ RedundantParens, diff --git a/scala/scalafmt/scalafmt_repositories.bzl b/scala/scalafmt/scalafmt_repositories.bzl index 6c902dfbb..73f67f46c 100644 --- a/scala/scalafmt/scalafmt_repositories.bzl +++ b/scala/scalafmt/scalafmt_repositories.bzl @@ -10,7 +10,7 @@ def scalafmt_default_config(path = ".scalafmt.conf"): build.append(" srcs = [\"{}\"],".format(path)) build.append(" visibility = [\"//visibility:public\"],") build.append(")") - native.new_local_repository(name = "scalafmt_default", build_file_content = "\n".join(build), path = "scala/scalafmt/conf") + native.new_local_repository(name = "scalafmt_default", build_file_content = "\n".join(build), path = "") def scalafmt_repositories(maven_servers = ["https://repo.maven.apache.org/maven2"]): _scala_maven_import_external(