Skip to content

Commit 26d4e81

Browse files
committed
-indent should take precedence over -source 3.0-migrate
1 parent 0749f94 commit 26d4e81

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,10 @@ object Scanners {
195195
val rewriteNoIndent = ctx.settings.noindent.value && rewrite
196196

197197
val noindentSyntax =
198-
ctx.settings.noindent.value
199-
|| ctx.settings.oldSyntax.value
198+
!ctx.settings.indent.value
199+
&& (ctx.settings.noindent.value
200+
|| ctx.settings.oldSyntax.value
201+
|| migrateTo3)
200202
val indentSyntax =
201203
((if (Config.defaultIndent) !noindentSyntax else ctx.settings.indent.value)
202204
|| 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)