.

Author: lihaoyi

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

@@ -1322,13 +1322,10 @@ object Scanners {
                 nextRawChar()
               }
 
-              if (endQuoteCount == quoteCount && (ch == SU || ch == CR || ch == LF || ch == ' ' || ch == '\t' || ch == ';')) {
-                // Found closing delimiter
+              if (endQuoteCount == quoteCount && ch != '\'') {
+                // Found closing delimiter (not followed by another quote)
                 foundClosing = true
                 closingIndent = currentIndent.toString
-                // Consume any trailing whitespace/newlines after closing quotes
-                while (ch == ' ' || ch == '\t') nextChar()
-                if (ch == CR || ch == LF) nextChar()
               } else {
                 // False alarm, these quotes are part of the content
                 // We need to restore and add them to current line

tests/neg/dedented-string-literals.check

@@ -1,16 +1,16 @@
--- Error: tests/neg/dedented-string-literals.scala:5:36
+-- Error: tests/neg/dedented-string-literals.scala:5:27
 5 |  val noNewlineAfterOpen = '''content on same line // error
-  |                                    ^
+  |                           ^
   |dedented string literal must start with newline after opening quotes
--- Error: tests/neg/dedented-string-literals.scala:8:0
-8 |content
-  |^
+-- Error: tests/neg/dedented-string-literals.scala:8:20
+8 |  val notIndented = '''
+  |                    ^
   |line in dedented string literal must be indented at least as much as the closing delimiter
--- Error: tests/neg/dedented-string-literals.scala:14:0
-14 |  space line
-   |  ^
+-- Error: tests/neg/dedented-string-literals.scala:13:24
+13 |  val mixedTabsSpaces = '''
+   |                        ^
    |dedented string literal cannot mix tabs and spaces in indentation
--- [E040] Syntax Error: tests/neg/dedented-string-literals.scala:19:0
-19 |  // error: missing closing quotes
-   |  ^^
+-- [E040] Syntax Error: tests/neg/dedented-string-literals.scala:19:17
+19 |  val unclosed = '''
+   |                 ^
    |unclosed dedented string literal

tests/neg/dedented-string-literals.scala

@@ -4,19 +4,18 @@ object DedentedStringErrors {
   // Error: No newline after opening quotes
   val noNewlineAfterOpen = '''content on same line // error
 
-  // Error: Content not indented enough
+  // Error: Content not indented enough // error
   val notIndented = '''
 content
-  ''' // error
+  '''
 
-  // Error: Mixed tabs and spaces
+  // Error: Mixed tabs and spaces // error
   val mixedTabsSpaces = '''
 	tab line
   space line
-	''' // error
+	'''
 
-  // Error: Unclosed literal
+  // Error: Unclosed literal // error
   val unclosed = '''
 some content
-  // error: missing closing quotes
 }

tests/run/dedented-string-literals.check

@@ -3,8 +3,8 @@ i am cow
 hear me moo
 
 With indent:
-i am cow
-hear me moo
+  i am cow
+  hear me moo
 
 Empty:
 []
@@ -18,14 +18,14 @@ line 1
 line 3
 
 Deep indent:
-deeply
-indented
-content
+      deeply
+      indented
+      content
 
 Mixed indent:
-first level
-  second level
-    third level
+  first level
+    second level
+      third level
 
 With triple quotes:
 '''
@@ -45,8 +45,8 @@ Zero indent:
 content
 
 Precise:
-Length: 7
-Content: [ab
-cd]
-Chars: List(a, b,
-, c, d)
+Length: 9
+Content: [  ab
+  cd]
+Chars: List( ,  , a, b,
+,  ,  , c, d)