Merge pull request #353 from ahoppen/crash-recovery-again

Restart sourcekitd and clangd after they have crashed

Author: benlangmuir

Documentation/Development.md

@@ -175,6 +175,10 @@ Location(ws.testLoc("aaa:call"))
 Position(ws.testLoc("aaa:call"))
 ```
 
+### Long tests
+
+Tests that run longer than approx. 1 second are only executed if the the `SOURCEKIT_LSP_ENABLE_LONG_TESTS` environment variable is set to `YES` or `1`. This, in particular, includes the crash recovery tests.
+
 ## Tibs
 
 We use Tibs, the "Test Index Build System" from the IndexStoreDB project to provide build system support for test projects, including getting compiler arguments and building an index. 

Sources/SKTestSupport/INPUTS/ClangCrashRecovery/main.cpp

@@ -0,0 +1 @@
+/*loc*/

Sources/SKTestSupport/INPUTS/ClangCrashRecovery/project.json

@@ -0,0 +1,4 @@
+{
+  "clang_flags": ["-fno-modules", "-Wunused-variable"],
+  "sources": ["main.cpp"]
+}

Sources/SKTestSupport/INPUTS/ClangCrashRecoveryBuildSettings/main.cpp

@@ -0,0 +1,11 @@
+/*loc*/
+
+#if FOO
+void foo() {}
+#else
+void foo() {}
+#endif
+
+int main() {
+  foo();
+}

Sources/SKTestSupport/INPUTS/ClangCrashRecoveryBuildSettings/project.json

@@ -0,0 +1,4 @@
+{
+  "clang_flags": ["-fno-modules", "-Wunused-variable", "-DFOO"],
+  "sources": ["main.cpp"]
+}

Sources/SKTestSupport/INPUTS/sourcekitdCrashRecovery/main.swift

@@ -0,0 +1 @@
+/*loc*/

Sources/SKTestSupport/INPUTS/sourcekitdCrashRecovery/project.json

@@ -0,0 +1 @@
+{"sources": ["main.swift"]}

Sources/SKTestSupport/LongTestsEnabled.swift

@@ -0,0 +1,20 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Foundation
+
+public var longTestsEnabled: Bool {
+  if let value = ProcessInfo.processInfo.environment["SOURCEKIT_LSP_ENABLE_LONG_TESTS"] {
+    return value == "1" || value == "YES"
+  }
+  return false
+}

Sources/SKTestSupport/SKTibsTestWorkspace.swift

@@ -238,4 +238,5 @@ extension TibsToolchain {
 
 extension TestLocation {
   public var docIdentifier: TextDocumentIdentifier { TextDocumentIdentifier(url) }
+  public var docUri: DocumentURI { DocumentURI(url) }
 }

Sources/SourceKitD/sourcekitd_uids.swift

@@ -133,6 +133,7 @@ public struct sourcekitd_keys {
 }
 
 public struct sourcekitd_requests {
+  public let crash_exit: sourcekitd_uid_t
   public let editor_open: sourcekitd_uid_t
   public let editor_close: sourcekitd_uid_t
   public let editor_replacetext: sourcekitd_uid_t
@@ -145,6 +146,7 @@ public struct sourcekitd_requests {
   public let semantic_refactoring: sourcekitd_uid_t
 
   public init(api: sourcekitd_functions_t) {
+    crash_exit = api.uid_get_from_cstr("source.request.crash_exit")!
     editor_open = api.uid_get_from_cstr("source.request.editor.open")!
     editor_close = api.uid_get_from_cstr("source.request.editor.close")!
     editor_replacetext = api.uid_get_from_cstr("source.request.editor.replacetext")!
@@ -160,6 +162,7 @@ public struct sourcekitd_requests {
 
 public struct sourcekitd_values {
   public let notification_documentupdate: sourcekitd_uid_t
+  public let notification_sema_enabled: sourcekitd_uid_t
   public let diag_error: sourcekitd_uid_t
   public let diag_warning: sourcekitd_uid_t
   public let diag_note: sourcekitd_uid_t
@@ -252,6 +255,7 @@ public struct sourcekitd_values {
 
   public init(api: sourcekitd_functions_t) {
     notification_documentupdate = api.uid_get_from_cstr("source.notification.editor.documentupdate")!
+    notification_sema_enabled = api.uid_get_from_cstr("source.notification.sema_enabled")!
     diag_error = api.uid_get_from_cstr("source.diagnostic.severity.error")!
     diag_warning = api.uid_get_from_cstr("source.diagnostic.severity.warning")!
     diag_note = api.uid_get_from_cstr("source.diagnostic.severity.note")!