Remove long-dead "requires" keyword, fixes #79

Author: mdr

scalariform/src/main/scala/scalariform/formatter/ScalaFormatter.scala

@@ -423,7 +423,7 @@ object ScalaFormatter {
     FINALLY, FOR, FORSOME, IF, IMPLICIT,
     IMPORT, LAZY, MATCH, NEW,
     OBJECT, OVERRIDE, PACKAGE, PRIVATE, PROTECTED,
-    REQUIRES, RETURN, SEALED, /* SUPER, THIS, */
+    RETURN, SEALED, /* SUPER, THIS, */
     THROW, TRAIT, TRY, /* TYPE ,*/
     VAL, VAR, WHILE, WITH, YIELD, 
     /* USCORE, */ COLON, EQUALS, ARROW, LARROW, SUBTYPE, VIEWBOUND, SUPERTYPE, /* HASH, AT */
@@ -435,7 +435,7 @@ object ScalaFormatter {
     FINALLY, /* FOR, */ FORSOME, /* IF, */ IMPLICIT, 
     /* IMPORT, */ LAZY, MATCH, /* NEW, */
     OBJECT, OVERRIDE, /* PACKAGE, */ PRIVATE, PROTECTED,
-    /* REQUIRES, RETURN, */ SEALED, /* SUPER, THIS, */
+    /* RETURN, */ SEALED, /* SUPER, THIS, */
     /* THROW, */ TRAIT, /* TRY, TYPE, */
     VAL, VAR, /* WHILE, */ WITH, YIELD, 
     /* USCORE, COLON, */ EQUALS, /* ARROW, */ LARROW, SUBTYPE, VIEWBOUND, SUPERTYPE, /*, HASH, AT, */

scalariform/src/main/scala/scalariform/lexer/Keywords.scala

@@ -32,7 +32,6 @@ object Keywords {
     "package" -> PACKAGE,
     "private" -> PRIVATE,
     "protected" -> PROTECTED,
-    "requires" -> REQUIRES,
     "return" -> RETURN,
     "sealed" -> SEALED,
     "super" -> SUPER,
@@ -65,4 +64,4 @@ object Keywords {
     "~" -> TILDE,
     "!" -> EXCLAMATION)
 
-}
+}

scalariform/src/main/scala/scalariform/lexer/NewlineInferencer.scala

@@ -138,7 +138,7 @@ object NewlineInferencer {
     XML_COMMENT, XML_CDATA, XML_UNPARSED, XML_PROCESSING_INSTRUCTION, USCORE, RPAREN, RBRACKET, RBRACE)
 
   private val TOKENS_WHICH_CANNOT_BEGIN_A_STATEMENT: Set[TokenType] = Set(
-    CATCH, ELSE, EXTENDS, FINALLY, FORSOME, MATCH, REQUIRES, WITH, YIELD, COMMA, DOT, SEMI, COLON, /* USCORE, */ EQUALS,
+    CATCH, ELSE, EXTENDS, FINALLY, FORSOME, MATCH, WITH, YIELD, COMMA, DOT, SEMI, COLON, /* USCORE, */ EQUALS,
     ARROW, LARROW, SUBTYPE, VIEWBOUND, SUPERTYPE, HASH, LBRACKET, RPAREN, RBRACKET, RBRACE)
 
   private val BLANK_LINE_PATTERN = """(?s).*\n\s*\n.*"""

scalariform/src/main/scala/scalariform/lexer/Tokens.scala

@@ -78,7 +78,6 @@ object Tokens {
   val SEMI = TokenType("SEMI")
   val COLON = TokenType("COLON")
   val OTHERID = TokenType("OTHERID")
-  val REQUIRES = TokenType("REQUIRES")
   val NEWLINE = TokenType("NEWLINE")
   val FINALLY = TokenType("FINALLY")
   val OVERRIDE = TokenType("OVERRIDE")
@@ -105,7 +104,7 @@ object Tokens {
     FINALLY, FOR, FORSOME, IF, IMPLICIT,
     IMPORT, LAZY, MATCH, NEW,
     OBJECT, OVERRIDE, PACKAGE, PRIVATE, PROTECTED,
-    REQUIRES, RETURN, SEALED, SUPER, THIS,
+    RETURN, SEALED, SUPER, THIS,
     THROW, TRAIT, TRY, TYPE,
     VAL, VAR, WHILE, WITH, YIELD)