Fix remaining SourceKit tests

Author: fwcd

test/SourceKit/CompileNotifications/diagnostics.swift

@@ -80,7 +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.id: "{{error_from_clang|error_unknown_arg}}"
 // INVALID_ARG-NEXT:     key.description: "unknown argument
 
 // Ignore the spurious -wmo + -enable-batch-mode warning.

test/SourceKit/Sema/enum-toraw/enum-toraw.swift.response

@@ -18,6 +18,7 @@
     key.column: 1,
     key.filepath: t2.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "missing_return_decl",
     key.description: "missing return in global function expected to return 'Bool'",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema
   }

test/SourceKit/Sema/main.swift

@@ -6,6 +6,7 @@
 // RUN: %sourcekitd-test -req=sema %S/Inputs/top_level.swift -- %s %S/Inputs/top_level.swift -module-name main | %FileCheck %s -check-prefix=TOP_LEVEL_ERROR
 // TOP_LEVEL_ERROR: key.filepath: {{.*}}top_level.swift
 // TOP_LEVEL_ERROR-NEXT: key.severity: source.diagnostic.severity.error,
+// TOP_LEVEL_ERROR-NEXT: key.id: "illegal_top_level_expr"
 // TOP_LEVEL_ERROR-NEXT: key.description: {{.*}}top level
 
 print("hi") // Top-level code.

test/SourceKit/Sema/sema_build_session.swift

@@ -44,14 +44,19 @@ func test() {
 
 // CHECK_SYSTEM_2-LABEL: ## THREE
 // CHECK_SYSTEM_2: key.severity: source.diagnostic.severity.error,
+// CHECK_SYSTEM_2-NEXT: key.id: "cannot_find_in_scope",
 // CHECK_SYSTEM_2-NEXT: key.description: "cannot find 'fooFunc' in scope",
 // CHECK_SYSTEM_2: key.severity: source.diagnostic.severity.error,
+// CHECK_SYSTEM_2-NEXT: key.id: "cannot_find_in_scope",
 // CHECK_SYSTEM_2-NEXT: key.description: "cannot find 'fooSubFunc' in scope",
 // CHECK_SYSTEM_2: key.severity: source.diagnostic.severity.error,
+// CHECK_SYSTEM_2-NEXT: key.id: "cannot_find_in_scope",
 // CHECK_SYSTEM_2-NEXT: key.description: "cannot find 'fooHelperFunc' in scope",
 // CHECK_SYSTEM_2: key.severity: source.diagnostic.severity.error,
+// CHECK_SYSTEM_2-NEXT: key.id: "cannot_find_in_scope",
 // CHECK_SYSTEM_2-NEXT: key.description: "cannot find 'fooHelperSubFunc' in scope",
 // CHECK_SYSTEM_2: key.severity: source.diagnostic.severity.error,
+// CHECK_SYSTEM_2-NEXT: key.id: "cannot_find_in_scope",
 // CHECK_SYSTEM_2-NEXT: key.description: "cannot find 'fooHelperExplicitFunc' in scope",
 
 // -----------------------------------------------------------------------------
@@ -78,8 +83,10 @@ func test() {
 // CHECK_USER-LABEL: ## TWO
 // CHECK_USER-NOT: key.severity: 
 // CHECK_USER: key.severity: source.diagnostic.severity.error,
+// CHECK_USER-NEXT: key.id: "cannot_find_in_scope",
 // CHECK_USER-NEXT: key.description: "cannot find 'fooFunc' in scope",
 // CHECK_USER: key.severity: source.diagnostic.severity.error,
+// CHECK_USER-NEXT: key.id: "cannot_find_in_scope",
 // CHECK_USER-NEXT: key.description: "cannot find 'fooSubFunc' in scope",
 // CHECK_USER-NOT: key.severity: 
 

test/SourceKit/Sema/sema_module.swift

@@ -3,4 +3,5 @@ Swift.String
 Swift
 // CHECK: key.kind: source.lang.swift.ref.struct,
 // CHECK: key.severity: source.diagnostic.severity.error,
+// CHECK-NEXT: key.id: "value_of_metatype_type",
 // CHECK-NEXT: key.description: "expected member name or constructor call after type name",

test/SourceKit/Sema/sema_playground.swift.response

@@ -11,6 +11,7 @@
     key.column: 5,
     key.filepath: sema_playground.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "dollar_identifier_decl",
     key.description: "cannot declare entity named '$blah'; the '$' prefix is reserved for implicitly-synthesized declarations",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema
   }

test/SourceKit/Sema/sema_symlink.swift.response

@@ -12,6 +12,7 @@
     key.column: 16,
     key.filepath: real.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "cannot_find_in_scope",
     key.description: "cannot find 'goo' in scope",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.ranges: [

test/SourceKit/SyntaxMapData/diags.swift.response

@@ -5,6 +5,7 @@
     key.column: 10,
     key.filepath: parse_error.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "func_decl_without_paren",
     key.description: "expected '(' in argument list of function declaration",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.fixits: [
@@ -20,6 +21,7 @@
     key.column: 8,
     key.filepath: parse_error.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "cannot_find_type_in_scope",
     key.description: "cannot find type 'Undeclared' in scope",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.ranges: [
@@ -36,6 +38,7 @@
     key.column: 13,
     key.filepath: parse_error.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "func_decl_without_paren",
     key.description: "expected '(' in argument list of function declaration",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.fixits: [
@@ -51,6 +54,7 @@
     key.column: 8,
     key.filepath: parse_error.swift,
     key.severity: source.diagnostic.severity.error,
+    key.id: "cannot_find_type_in_scope",
     key.description: "cannot find type 'Undeclared' in scope",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.ranges: [