Support significant indentation

Author: odersky

compiler/src/dotty/tools/dotc/config/Config.scala

@@ -157,6 +157,9 @@ object Config {
    */
   final val simplifyApplications = true
 
+  /** Always assume -indent */
+  final val allowIndent = true
+
   /** If set, prints a trace of all symbol completions */
   final val showCompletions = false
 

compiler/src/dotty/tools/dotc/config/Printers.scala

@@ -27,6 +27,7 @@ object Printers {
   val hk: Printer = noPrinter
   val implicits: Printer = noPrinter
   val implicitsDetailed: Printer = noPrinter
+  val lexical: Printer = noPrinter
   val inlining: Printer = noPrinter
   val interactiv: Printer = noPrinter
   val overload: Printer = noPrinter

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -50,6 +50,8 @@ class ScalaSettings extends Settings.SettingGroup {
 
   val newSyntax: Setting[Boolean] = BooleanSetting("-new-syntax", "Require `then` and `do` in control expressions")
   val oldSyntax: Setting[Boolean] = BooleanSetting("-old-syntax", "Require `(...)` around conditions")
+  val indent: Setting[Boolean] = BooleanSetting("-indent", "allow significant indentation")
+  val noindent: Setting[Boolean] = BooleanSetting("-noindent", "require classical {...} syntax, indentation is not significant")
 
   /** Decompiler settings */
   val printTasty: Setting[Boolean] = BooleanSetting("-print-tasty", "Prints the raw tasty.") withAbbreviation "--print-tasty"

compiler/src/dotty/tools/dotc/core/StdNames.scala

@@ -420,6 +420,7 @@ object StdNames {
     val elem: N                 = "elem"
     val elems: N                = "elems"
     val emptyValDef: N          = "emptyValDef"
+    val end: N                  = "end"
     val ensureAccessible : N    = "ensureAccessible"
     val eq: N                   = "eq"
     val eqInstance: N           = "eqInstance"

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

@@ -27,9 +27,6 @@ abstract class CharArrayReader { self =>
   /** The start offset of the current line */
   var lineStartOffset: Int = startFrom
 
-  /** The start offset of the line before the current one */
-  var lastLineStartOffset: Int = startFrom
-
   private[this] var lastUnicodeOffset = -1
 
   /** Is last character a unicode escape \\uxxxx? */
@@ -112,12 +109,8 @@ abstract class CharArrayReader { self =>
   }
 
   /** Handle line ends */
-  private def potentialLineEnd(): Unit = {
-    if (ch == LF || ch == FF) {
-      lastLineStartOffset = lineStartOffset
-      lineStartOffset = charOffset
-    }
-  }
+  private def potentialLineEnd(): Unit =
+    if (ch == LF || ch == FF) lineStartOffset = charOffset
 
   def isAtEnd: Boolean = charOffset >= buf.length