Update diags in SourceKit tests to include key.id

- Update SourceKit/DocumentStructure tests
- Update SourceKit/CursorInfo tests
- Update SourceKit/SyntaxMapData tests
- Update SourceKit/Sema tests
- Update SourceKit/CompileNotifications tests

Author: fwcd

test/SourceKit/CompileNotifications/arg-parsing.swift

@@ -12,6 +12,7 @@
 // ARG_PARSE_0:     {
 // ARG_PARSE_0:       key.filepath: "<unknown>",
 // ARG_PARSE_0:       key.severity: source.diagnostic.severity.error,
+// ARG_PARSE_0:       key.id: "error_unknown_arg",
 // ARG_PARSE_0:       key.description: "unknown argument: '-no-such-arg'"
 // ARG_PARSE_0:     }
 // ARG_PARSE_0:   ]
@@ -34,6 +35,7 @@
 // ARG_PARSE_1:     {
 // ARG_PARSE_1:       key.filepath: "<unknown>",
 // ARG_PARSE_1:       key.severity: source.diagnostic.severity.error,
+// ARG_PARSE_1:       key.id: "error_unknown_arg",
 // ARG_PARSE_1:       key.description: "unknown argument: '-no-such-arg'"
 // ARG_PARSE_1:     }
 // ARG_PARSE_1:   ]
@@ -54,6 +56,7 @@
 // ARG_PARSE_2:     {
 // ARG_PARSE_2:       key.filepath: "<unknown>",
 // ARG_PARSE_2:       key.severity: source.diagnostic.severity.error,
+// ARG_PARSE_2:       key.id: "error_no_input_files",
 // ARG_PARSE_2:       key.description: "no input files"
 // ARG_PARSE_2:     }
 // ARG_PARSE_2:   ]

test/SourceKit/CompileNotifications/diagnostics.swift

@@ -11,6 +11,7 @@
 // PARSE-NEXT:     key.column: 6
 // PARSE-NEXT:     key.filepath: "{{.*}}parse-error.swift"
 // PARSE-NEXT:     key.severity: source.diagnostic.severity.error
+// PARSE-NEXT:     key.id: "number_cant_start_decl_name"
 // PARSE-NEXT:     key.description: "function name
 // PARSE-NEXT:   }
 // PARSE-NEXT: ]
@@ -23,6 +24,7 @@
 // PARSE-WITH-SOURCELOCATION-NEXT:     key.column: 6
 // PARSE-WITH-SOURCELOCATION-NEXT:     key.filepath: "custom.swuft"
 // PARSE-WITH-SOURCELOCATION-NEXT:     key.severity: source.diagnostic.severity.error
+// PARSE-WITH-SOURCELOCATION-NEXT:     key.id: "number_cant_start_decl_name"
 // PARSE-WITH-SOURCELOCATION-NEXT:     key.description: "function name
 // PARSE-WITH-SOURCELOCATION-NEXT:   }
 // PARSE-WITH-SOURCELOCATION-NEXT: ]
@@ -38,6 +40,7 @@
 // SEMA-NEXT:     key.column: 5
 // SEMA-NEXT:     key.filepath: "{{.*}}sema-error.swift"
 // SEMA-NEXT:     key.severity: source.diagnostic.severity.error
+// SEMA-NEXT:     key.id: "cannot_find_in_scope"
 // SEMA-NEXT:     key.description: "cannot find '{{.*}}' in scope
 // SEMA-NEXT:     key.ranges: [
 
@@ -49,6 +52,7 @@
 // CLANG_IMPORTER-NEXT:     key.column:
 // CLANG_IMPORTER-NEXT:     key.filepath: "<{{.*}}>"
 // CLANG_IMPORTER-NEXT:     key.severity: source.diagnostic.severity.error,
+// CLANG_IMPORTER-NEXT:     key.id: "error_from_clang"
 // CLANG_IMPORTER-NEXT:     key.description: {{.*}}not found
 
 // RUN: %sourcekitd-test -req=track-compiles == -req=sema %s -- %s -Xcc -ivfsoverlay -Xcc /doesnotexist | %FileCheck %s -check-prefix=CLANG_IMPORTER_UNKNOWN
@@ -58,6 +62,7 @@
 // CLANG_IMPORTER_UNKNOWN-NEXT:     key.filepath: "<unknown>"
 // CLANG_IMPORTER_UNKNOWN-NEXT:     key.severity: source.diagnostic.severity.error,
 // CLANG_IMPORTER_UNKNOWN-NEXT:     key.offset: 0
+// CLANG_IMPORTER_UNKNOWN-NEXT:     key.id: "error_from_clang"
 // CLANG_IMPORTER_UNKNOWN-NEXT:     key.description: "virtual filesystem{{.*}}not found
 
 // Note: we're missing the "compiler is in code completion mode" diagnostic,
@@ -75,6 +80,7 @@
 // INVALID_ARG-NEXT:     key.filepath: "<unknown>"
 // INVALID_ARG-NEXT:     key.severity: source.diagnostic.severity.error,
 // INVALID_ARG-NEXT:     key.offset: 0
+// INVALID_ARG-NEXT:     key.id: "error_from_clang"
 // INVALID_ARG-NEXT:     key.description: "unknown argument
 
 // Ignore the spurious -wmo + -enable-batch-mode warning.

test/SourceKit/CursorInfo/rdar_18677108-2.swift.response

@@ -4,6 +4,7 @@
     key.column: 1,
     key.filepath: rdar_18677108-2-a.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "expected_rparen_expr_list",
     key.description: "expected ')' in expression list",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.diagnostics: [
@@ -12,6 +13,7 @@
         key.column: 46,
         key.filepath: rdar_18677108-2-a.swift,
         key.severity: source.diagnostic.severity.note,
+        key.id: "opening_paren",
         key.description: "to match this opening '('"
       }
     ]
@@ -21,6 +23,7 @@
     key.column: 1,
     key.filepath: rdar_18677108-2-a.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "expected_rbrace_in_brace_stmt",
     key.description: "expected '}' at end of brace statement",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.diagnostics: [
@@ -29,6 +32,7 @@
         key.column: 3,
         key.filepath: rdar_18677108-2-a.swift,
         key.severity: source.diagnostic.severity.note,
+        key.id: "opening_brace",
         key.description: "to match this opening '{'"
       }
     ]
@@ -38,6 +42,7 @@
     key.column: 1,
     key.filepath: rdar_18677108-2-a.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "expected_rbrace_class",
     key.description: "expected '}' in class",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.diagnostics: [
@@ -46,6 +51,7 @@
         key.column: 1,
         key.filepath: rdar_18677108-2-a.swift,
         key.severity: source.diagnostic.severity.note,
+        key.id: "opening_brace",
         key.description: "to match this opening '{'"
       }
     ]

test/SourceKit/DocumentStructure/structure.swift.empty.response

@@ -1743,13 +1743,15 @@
       key.line: 71,
       key.column: 5,
       key.severity: source.diagnostic.severity.error,
+      key.id: "getset_nontrivial_pattern",
       key.description: "getter/setter can only be defined for a single variable",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
     {
       key.line: 77,
       key.column: 1,
       key.severity: source.diagnostic.severity.error,
+      key.id: "c_style_for_stmt_removed",
       key.description: "C-style for statement has been removed in Swift 3",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.ranges: [
@@ -1763,6 +1765,7 @@
       key.line: 116,
       key.column: 1,
       key.severity: source.diagnostic.severity.error,
+      key.id: "expected_keyword_in_decl",
       key.description: "expected 'func' keyword in instance method declaration",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.fixits: [
@@ -1777,13 +1780,15 @@
       key.line: 143,
       key.column: 12,
       key.severity: source.diagnostic.severity.error,
+      key.id: "initializer_decl_wrong_scope",
       key.description: "initializers may only be declared within a type",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
     {
       key.line: 147,
       key.column: 1,
       key.severity: source.diagnostic.severity.error,
+      key.id: "destructor_decl_outside_class",
       key.description: "deinitializers may only be declared within a class",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     }

test/SourceKit/DocumentStructure/structure.swift.foobar.response

@@ -1744,6 +1744,7 @@
       key.column: 5,
       key.filepath: "-foobar",
       key.severity: source.diagnostic.severity.error,
+      key.id: "getset_nontrivial_pattern",
       key.description: "getter/setter can only be defined for a single variable",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
@@ -1752,6 +1753,7 @@
       key.column: 1,
       key.filepath: "-foobar",
       key.severity: source.diagnostic.severity.error,
+      key.id: "c_style_for_stmt_removed",
       key.description: "C-style for statement has been removed in Swift 3",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.ranges: [
@@ -1766,6 +1768,7 @@
       key.column: 1,
       key.filepath: "-foobar",
       key.severity: source.diagnostic.severity.error,
+      key.id: "expected_keyword_in_decl",
       key.description: "expected 'func' keyword in instance method declaration",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.fixits: [
@@ -1781,6 +1784,7 @@
       key.column: 12,
       key.filepath: "-foobar",
       key.severity: source.diagnostic.severity.error,
+      key.id: "initializer_decl_wrong_scope",
       key.description: "initializers may only be declared within a type",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
@@ -1789,6 +1793,7 @@
       key.column: 1,
       key.filepath: "-foobar",
       key.severity: source.diagnostic.severity.error,
+      key.id: "destructor_decl_outside_class",
       key.description: "deinitializers may only be declared within a class",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     }

test/SourceKit/DocumentStructure/structure.swift.invalid.response

@@ -130,6 +130,7 @@
       key.column: 7,
       key.filepath: invalid.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "number_cant_start_decl_name",
       key.description: "class name can only start with a letter or underscore, not a number",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
@@ -138,6 +139,7 @@
       key.column: 1,
       key.filepath: invalid.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "statement_begins_with_closure",
       key.description: "top-level statement cannot begin with a closure expression",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
@@ -146,6 +148,7 @@
       key.column: 1,
       key.filepath: invalid.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "expected_closure_rbrace",
       key.description: "expected '}' at end of closure",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.diagnostics: [
@@ -154,6 +157,7 @@
           key.column: 1,
           key.filepath: invalid.swift,
           key.severity: source.diagnostic.severity.note,
+          key.id: "opening_brace",
           key.description: "to match this opening '{'"
         }
       ]

test/SourceKit/DocumentStructure/structure.swift.response

@@ -1744,6 +1744,7 @@
       key.column: 5,
       key.filepath: main.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "getset_nontrivial_pattern",
       key.description: "getter/setter can only be defined for a single variable",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
@@ -1752,6 +1753,7 @@
       key.column: 1,
       key.filepath: main.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "c_style_for_stmt_removed",
       key.description: "C-style for statement has been removed in Swift 3",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.ranges: [
@@ -1766,6 +1768,7 @@
       key.column: 1,
       key.filepath: main.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "expected_keyword_in_decl",
       key.description: "expected 'func' keyword in instance method declaration",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.fixits: [
@@ -1781,6 +1784,7 @@
       key.column: 12,
       key.filepath: main.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "initializer_decl_wrong_scope",
       key.description: "initializers may only be declared within a type",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
@@ -1789,6 +1793,7 @@
       key.column: 1,
       key.filepath: main.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "destructor_decl_outside_class",
       key.description: "deinitializers may only be declared within a class",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     }

test/SourceKit/Sema/placeholders.swift.placeholders.response

@@ -5,6 +5,7 @@
     key.column: 19,
     key.filepath: placeholders.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "cannot_find_type_in_scope",
     key.description: "cannot find type '<#OtherClass#>' in scope",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.ranges: [
@@ -19,6 +20,7 @@
     key.column: 19,
     key.filepath: placeholders.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "foreach_sequence_does_not_conform_to_expected_protocol",
     key.description: "for-in loop requires '()' to conform to 'Sequence'",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.ranges: [
@@ -33,6 +35,7 @@
     key.column: 5,
     key.filepath: placeholders.swift,
     key.severity: source.diagnostic.severity.warning,
+    key.id: "type_inferred_to_undesirable_type",
     key.description: "constant 'myArray' inferred to have type '[()]', which may be unexpected",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.diagnostics: [
@@ -41,6 +44,7 @@
         key.column: 5,
         key.filepath: placeholders.swift,
         key.severity: source.diagnostic.severity.note,
+        key.id: "add_explicit_type_annotation_to_silence",
         key.description: "add an explicit type annotation to silence this warning",
         key.fixits: [
           {

test/SourceKit/SyntaxMapData/syntaxmap-edit-del.swift.response

@@ -15,6 +15,7 @@
       key.column: 1,
       key.filepath: syntaxmap-edit-del.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "extra_rbrace",
       key.description: "extraneous '}' at top level",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.fixits: [
@@ -64,6 +65,7 @@
       key.column: 19,
       key.filepath: syntaxmap-edit-del.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "lex_unexpected_block_comment_end",
       key.description: "unexpected end of block comment",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     },
@@ -72,6 +74,7 @@
       key.column: 1,
       key.filepath: syntaxmap-edit-del.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "expected_decl",
       key.description: "expected declaration",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.diagnostics: [
@@ -80,6 +83,7 @@
           key.column: 8,
           key.filepath: syntaxmap-edit-del.swift,
           key.severity: source.diagnostic.severity.note,
+          key.id: "note_in_decl_extension",
           key.description: "in declaration of 'Foo'"
         }
       ]

test/SourceKit/SyntaxMapData/syntaxmap-edit-del.swift.response2

@@ -15,6 +15,7 @@
       key.column: 1,
       key.filepath: syntaxmap-edit-del.swift,
       key.severity: source.diagnostic.severity.error,
+      key.id: "extra_rbrace",
       key.description: "extraneous '}' at top level",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.fixits: [