Skip to content

Commit 66c390f

Browse files
committed
-indent should take precedence over -source 3.0-migrate
1 parent b758f7d commit 66c390f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

compiler/src/dotty/tools/dotc/parsing/Scanners.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ object Scanners {
197197
val noindentSyntax =
198198
ctx.settings.noindent.value
199199
|| ctx.settings.oldSyntax.value
200+
|| (migrateTo3 && !ctx.settings.indent.value)
200201
val indentSyntax =
201202
((if (Config.defaultIndent) !noindentSyntax else ctx.settings.indent.value)
202203
|| rewriteNoIndent)

compiler/test/dotty/tools/dotc/CompilationTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class CompilationTests extends ParallelTesting {
7272

7373
aggregateTests(
7474
compileFile("tests/rewrites/rewrites.scala", scala2CompatMode.and("-rewrite", "-indent")),
75-
compileFile("tests/rewrites/i8982.scala", defaultOptions.and("-indent").and("-rewrite"))
75+
compileFile("tests/rewrites/i8982.scala", defaultOptions.and("-indent", "-rewrite"))
7676
).checkRewrites()
7777
}
7878

0 commit comments

Comments
 (0)