Merge pull request swiftlang#10289 from nathawes/rdar32148117-multiline-syntax-coloring-issues

[syntax-coloring] Rework the syntax map to use offset + length and simplify the delta logic

Author: Nathan Hawes

lib/IDE/SyntaxModel.cpp

@@ -206,6 +206,15 @@ SyntaxModelContext::SyntaxModelContext(SourceFile &SrcFile)
         break;
       }
 
+      case tok::unknown: {
+        if (Tok.getRawText().startswith("\"")) {
+          // This is an invalid string literal
+          Kind = SyntaxNodeKind::String;
+          break;
+        }
+        continue;
+      }
+
       default:
         continue;
       }

test/IDE/coloring.swift

@@ -227,6 +227,15 @@ func f(x: Int) -> Int {
   // CHECK: <str>"This is string </str>\<anchor>(</anchor>genFn({(a:<type>Int</type> -> <type>Int</type>) <kw>in</kw> a})<anchor>)</anchor><str> interpolation"</str>
   "This is string \(genFn({(a:Int -> Int) in a})) interpolation"
 
+  // CHECK: <str>"This is unterminated</str>
+  "This is unterminated
+
+  // CHECK: <str>"This is unterminated with ignored \(interpolation) in it</str>
+  "This is unterminated with ignored \(interpolation) in it
+
+  // CHECK: <str>"This is terminated with invalid \(interpolation" + "in it"</str>
+  "This is terminated with invalid \(interpolation" + "in it"
+
   // CHECK: <str>"""
   // CHECK-NEXT: This is a multiline string.
   // CHECK-NEXT: """</str>
@@ -236,9 +245,19 @@ func f(x: Int) -> Int {
 
   // CHECK: <str>"""
   // CHECK-NEXT: This is a multiline</str>\<anchor>(</anchor> <str>"interpolated"</str> <anchor>)</anchor><str>string
+  // CHECK-NEXT: </str>\<anchor>(</anchor>
+  // CHECK-NEXT: <str>"""
+  // CHECK-NEXT: inner
+  // CHECK-NEXT: """</str>
+  // CHECK-NEXT: <anchor>)</anchor><str>
   // CHECK-NEXT: """</str>
   """
       This is a multiline\( "interpolated" )string
+   \(
+   """
+    inner
+   """
+   )
    """
 }
 

test/IDE/unterminated_multiline.swift

@@ -0,0 +1,16 @@
+// RUN: %target-swift-ide-test -syntax-coloring -source-filename %s | %FileCheck %s
+// RUN: %target-swift-ide-test -syntax-coloring -typecheck -source-filename %s | %FileCheck %s
+
+// CHECK: <kw>let</kw> x = <str>"""
+// CHECK-NEXT: This is an unterminated
+// CHECK-NEXT: \( "multiline" )
+// CHECK-NEXT: string followed by code
+// CHECK-NEXT: ""
+// CHECK-NEXT: func foo() {}
+// CHECK-NEXT: </str>
+let x = """
+  This is an unterminated
+  \( "multiline" )
+  string followed by code
+  ""
+func foo() {}

test/SourceKit/DocumentStructure/mark_edit.swift.response

@@ -13,8 +13,6 @@
   ]
 }
 {
-  key.offset: 0,
-  key.length: 3,
   key.diagnostic_stage: source.diagnostic.stage.swift.parse,
   key.substructure: [
     {

test/SourceKit/SyntaxMapData/Inputs/syntaxmap-edit-block-comment.swift

@@ -0,0 +1,5 @@
+  
+let x = /*
+
+*/ 2
+func foo() {}

test/SourceKit/SyntaxMapData/Inputs/syntaxmap-edit-chained-comment.swift

@@ -0,0 +1,5 @@
+let y = /*
+
+*// /*
+
+*/ 2

test/SourceKit/SyntaxMapData/Inputs/syntaxmap-edit-multiline-string.swift

@@ -0,0 +1,12 @@
+let a = "value"
+let x = """
+
+\(
+a
+) 
+
+   
+
+func foo () -> String {
+  return "foo"
+}

test/SourceKit/SyntaxMapData/Inputs/syntaxmap-edit-nested-token.swift

@@ -0,0 +1,19 @@
+/// This function does stuff
+///
+/// - parameter first: The first parameter
+///
+/// - returns: The return value
+func foo(first: Int) -> String {
+  return ""
+}
+
+let x = "Changing this string should only affect this line"
+
+/// This function does other stuff
+///
+/// - parameter first: The first parameter
+///
+/// - returns: The return value
+func bar(first: Int) -> String {
+  return ""
+}

test/SourceKit/SyntaxMapData/Inputs/syntaxmap-edit-remove.swift

@@ -0,0 +1,4 @@
+let l = 2
+l
+\( 56
+)

test/SourceKit/SyntaxMapData/Inputs/syntaxmap-multiple-edits.swift

@@ -0,0 +1,14 @@
+ 
+/// A comment
+/// - Note: important things
+let x = 42
+
+struct Point {
+  let x: Int = x
+  let y: Int = x
+
+  func mag2() {
+    return x*x + y*y;
+  }
+}
+