.

Author: lihaoyi

.idea/kotlinc.xml

@@ -157,10 +157,12 @@ object ScalaSyntaxHighlighter {
   private val tSTRINGS = TokenSet.create(
     tSTRING,
     tMULTILINE_STRING,
+    tDEDENTED_STRING,
     tWRONG_STRING,
     tCHAR,
     tSYMBOL,
     tINTERPOLATED_MULTILINE_STRING,
+    tINTERPOLATED_DEDENTED_STRING,
     tINTERPOLATED_STRING,
     tINTERPOLATED_STRING_ID,
     tINTERPOLATED_STRING_END

scala/scala-impl/src/org/jetbrains/plugins/scala/highlighter/ScalaSyntaxHighlighter.scala

@@ -296,14 +296,14 @@ hexDigit             = [0-9A-Fa-f]
 CHAR_ESCAPE_SEQUENCE = \\[^\r\n]
 UNICODE_ESCAPE       = \\u+ {hexDigit}{hexDigit}{hexDigit}{hexDigit} // Scala supports 1. multiple `u` chars after `\` 2. even \u000A ('\n') and \u000D (unlike Java)
 ESCAPE_SEQUENCE      = {UNICODE_ESCAPE} | {CHAR_ESCAPE_SEQUENCE}
-CHARACTER_LITERAL    = "'"([^\\\'\r\n]|{ESCAPE_SEQUENCE}|{OCTAL_ESCAPE_LITERAL})("'"|\\) | \'\\u000A\' | "'''" // TODO: \'\\u000A\' is redundunt, remove
+CHARACTER_LITERAL    = "'"([^\\\'\r\n]|{ESCAPE_SEQUENCE}|{OCTAL_ESCAPE_LITERAL})("'"|\\) | \'\\u000A\' // TODO: \'\\u000A\' is redundunt, remove
 
 STRING_BEGIN = \"([^\\\"\r\n]|{CHAR_ESCAPE_SEQUENCE})*
 STRING_LITERAL={STRING_BEGIN} \"
 MULTI_LINE_STRING = \"\"\" ( (\"(\")?)? [^\"] )* \"\"\" (\")* // Multi-line string
 
 // Dedented string literals (Scala 3) - uses single quotes
-DEDENTED_STRING = \'\'\'+ ( (\'(\')?)? [^\'] )* \'\'\'+ // Dedented multiline string
+DEDENTED_STRING = \'\'\' ( (\'(\')?)? [^\'] )* \'\'\' (\')* // Dedented multiline string
 
 ////////String Interpolation////////
 INTERPOLATED_STRING_ID = {varid}
@@ -561,11 +561,11 @@ XML_BEGIN = "<" ("_" | [:jletter:]) | "<!--" | "<?" ("_" | [:jletter:]) | "<![CD
 
 {MULTI_LINE_STRING}                     {   return process(tMULTILINE_STRING);  }
 
-{DEDENTED_STRING}                       {   if (isScala3) return process(tDEDENTED_STRING); else return process(tIDENTIFIER);  }
-
 // TODO: incomplete strings should be handled the same way with interpolated strings
 //  what can be parsed should be parsed as tSTRING,
 //  tWRONG_LINE_BREAK_IN_STRING error token should be added at unexpected new line should
+{DEDENTED_STRING}                       {   if (isScala3) return process(tDEDENTED_STRING); else return process(tIDENTIFIER);  }
+
 {WRONG_STRING}                          {   return process(tWRONG_STRING);  }