Rewrite -> into → when RewriteArrowSymbols is on

Author: rkrzewski

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

@@ -268,6 +268,7 @@ abstract class ScalaFormatter extends HasFormattingPreferences with TypeFormatte
       val actualReplacementOption = replacementOption orElse (condOpt(token.tokenType) {
         case ARROW if rewriteArrows  ⇒ "⇒"
         case LARROW if rewriteArrows ⇒ "←"
+        case RARROW if rewriteArrows ⇒ "→"
         case EOF                     ⇒ ""
       })
       builder.append(actualReplacementOption getOrElse token.rawText)
@@ -444,7 +445,7 @@ object ScalaFormatter {
     RETURN, SEALED, /* SUPER, THIS, */
     THROW, TRAIT, TRY, /* TYPE ,*/
     VAL, VAR, WHILE, WITH, YIELD, 
-    /* USCORE, */ COLON, EQUALS, ARROW, LARROW, SUBTYPE, VIEWBOUND, SUPERTYPE, /* HASH, AT */
+    /* USCORE, */ COLON, EQUALS, ARROW, LARROW, RARROW, SUBTYPE, VIEWBOUND, SUPERTYPE, /* HASH, AT */
     LBRACE, SEMI)
 
   val ENSURE_SPACE_BEFORE = Set(
@@ -456,7 +457,7 @@ object ScalaFormatter {
     /* RETURN, */ SEALED, /* SUPER, THIS, */
     /* THROW, */ TRAIT, /* TRY, TYPE, */
     VAL, VAR, /* WHILE, */ WITH, YIELD, 
-    /* USCORE, COLON, */ EQUALS, /* ARROW, */ LARROW, SUBTYPE, VIEWBOUND, SUPERTYPE, /*, HASH, AT, */
+    /* USCORE, COLON, */ EQUALS, /* ARROW, */ LARROW, RARROW, SUBTYPE, VIEWBOUND, SUPERTYPE, /*, HASH, AT, */
     RBRACE)
   // format: ON
 

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

@@ -51,6 +51,7 @@ object Keywords {
     "=" -> EQUALS,
     "=>" -> ARROW,
     "<-" -> LARROW,
+    "->" -> RARROW,
     "<:" -> SUBTYPE,
     "<%" -> VIEWBOUND,
     ">:" -> SUPERTYPE,

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

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

scalariform/src/main/scala/scalariform/lexer/ScalaOnlyLexer.scala

@@ -126,6 +126,9 @@ private[lexer] trait ScalaOnlyLexer { self: ScalaLexer ⇒
         } else if (ch == '\u2190') {
           nextChar()
           token(LARROW)
+        } else if (ch == '\u2192') {
+          nextChar()
+          token(RARROW)
         } else if (Character.isUnicodeIdentifierStart(ch)) {
           nextChar()
           getIdentRest()

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

@@ -52,6 +52,7 @@ object Tokens {
   val LBRACE = TokenType("LBRACE")
   val FOR = TokenType("FOR")
   val LARROW = TokenType("LARROW")
+  val RARROW = TokenType("RARROW")
   val ABSTRACT = TokenType("ABSTRACT")
   val LPAREN = TokenType("LPAREN")
   val IF = TokenType("IF")

scalariform/src/main/scala/scalariform/parser/ScalaParser.scala

@@ -124,7 +124,7 @@ class ScalaParser(tokens: Array[Token]) {
   private def isIdent: Boolean = isIdent(currentTokenType)
 
   private def isIdent(tokenType: TokenType) = tokenType match {
-    case VARID | OTHERID | PLUS | MINUS | STAR | PIPE | TILDE | EXCLAMATION ⇒ true
+    case VARID | OTHERID | PLUS | MINUS | RARROW | STAR | PIPE | TILDE | EXCLAMATION ⇒ true
     case _ ⇒ false
   }
 

scalariform/src/test/scala/scalariform/formatter/MiscExpressionFormatterTest.scala

@@ -7,7 +7,7 @@ import scalariform.formatter.preferences._
 // format: OFF
 class MiscExpressionFormatterTest extends AbstractExpressionFormatterTest {
 
-   "→" ==> "→"
+   "a → b" ==> "a → b"
    "this" ==> "this"
    "super [ B ] . t" ==> "super[B].t"
    "E2 . super [ B ] . t" ==> "E2.super[B].t"

scalariform/src/test/scala/scalariform/formatter/RewriteArrowsTest.scala

@@ -12,6 +12,7 @@ class RewriteArrowsTest extends AbstractExpressionFormatterTest {
 
     "(a: Int) => 3" ==> "(a: Int) ⇒ 3"
     "for (i <- 1 to 10) yield i" ==> "for (i ← 1 to 10) yield i"
+    "cache += k -> f(k)" ==> "cache += k → f(k)"
   }
 
   override val debug = false

scalariform/src/test/scala/scalariform/lexer/ScalaLexerTest.scala

@@ -218,6 +218,10 @@ println("foo")""" producesTokens (VARID, LPAREN, STRING_LITERAL, RPAREN, WS, VAR
 
   "for(<book/><-Nil)Nil" producesTokens (FOR, LPAREN, XML_START_OPEN, XML_NAME, XML_EMPTY_CLOSE, LARROW, VARID, RPAREN, VARID)
 
+  "a -> b" producesTokens(VARID, WS, RARROW, WS, VARID)
+  
+  "a → b" producesTokens(VARID, WS, RARROW, WS, VARID)
+  
   "\"\\u001A\"" producesTokens (STRING_LITERAL)
 
   "\"\"\"\\u001A\"\"\"" producesTokens (STRING_LITERAL)