Fix Windows test failures

Author: ahoppen

Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift

@@ -107,6 +107,12 @@ package actor CompilationDatabaseBuildSystem: BuiltInBuildSystem {
 
   package let configPath: URL
 
+  // Watch for all all changes to `compile_commands.json` and `compile_flags.txt` instead of just the one at
+  // `configPath` so that we cover the following semi-common scenario:
+  // The user has a build that stores `compile_commands.json` in `mybuild`. In order to pick it  up, they create a
+  // symlink from `<project root>/compile_commands.json` to `mybuild/compile_commands.json`.  We want to get notified
+  // about the change to `mybuild/compile_commands.json` because it effectively changes the contents of
+  // `<project root>/compile_commands.json`.
   package let fileWatchers: [FileSystemWatcher] = [
     FileSystemWatcher(globPattern: "**/compile_commands.json", kind: [.create, .change, .delete]),
     FileSystemWatcher(globPattern: "**/compile_flags.txt", kind: [.create, .change, .delete]),

Sources/SKTestSupport/MultiFileTestProject.swift

@@ -96,6 +96,10 @@ package class MultiFileTestProject {
       let markedText =
         markedText
         .replacingOccurrences(of: "$TEST_DIR_URL", with: testDirUrl)
+        .replacingOccurrences(
+          of: "$TEST_DIR_BACKSLASH_ESCAPED",
+          with: try scratchDirectory.filePath.replacing(#"\"#, with: #"\\"#)
+        )
         .replacingOccurrences(of: "$TEST_DIR", with: try scratchDirectory.filePath)
       let fileURL = fileLocation.url(relativeTo: scratchDirectory)
       try FileManager.default.createDirectory(

Tests/SourceKitLSPTests/WorkspaceTests.swift

@@ -985,10 +985,10 @@ final class WorkspaceTests: XCTestCase {
       "build/compile_commands.json": """
       [
       {
-        "directory": "$TEST_DIR",
-        "command": "swiftc $TEST_DIR/src/Foo.swift -DHAVE_SETTINGS \(defaultSDKArgs)",
+        "directory": "$TEST_DIR_BACKSLASH_ESCAPED",
+        "command": "swiftc $TEST_DIR_BACKSLASH_ESCAPED/src/Foo.swift -DHAVE_SETTINGS \(defaultSDKArgs)",
         "file": "src/Foo.swift",
-        "output": "$TEST_DIR/build/Foo.swift.o"
+        "output": "$TEST_DIR_BACKSLASH_ESCAPED/build/Foo.swift.o"
       }
       ]
       """,
@@ -1031,10 +1031,10 @@ final class WorkspaceTests: XCTestCase {
       "projA/build/compile_commands.json": """
       [
       {
-        "directory": "$TEST_DIR/projA",
-        "command": "swiftc $TEST_DIR/projA/src/Foo.swift -DHAVE_SETTINGS \(defaultSDKArgs)",
+        "directory": "$TEST_DIR_BACKSLASH_ESCAPED/projA",
+        "command": "swiftc $TEST_DIR_BACKSLASH_ESCAPED/projA/src/Foo.swift -DHAVE_SETTINGS \(defaultSDKArgs)",
         "file": "src/Foo.swift",
-        "output": "$TEST_DIR/projA/build/Foo.swift.o"
+        "output": "$TEST_DIR_BACKSLASH_ESCAPED/projA/build/Foo.swift.o"
       }
       ]
       """,
@@ -1078,10 +1078,10 @@ final class WorkspaceTests: XCTestCase {
       "otherbuild/compile_commands.json": """
       [
       {
-        "directory": "$TEST_DIR",
-        "command": "swiftc $TEST_DIR/src/Foo.swift -DHAVE_SETTINGS \(defaultSDKArgs)",
+        "directory": "$TEST_DIR_BACKSLASH_ESCAPED",
+        "command": "swiftc $TEST_DIR_BACKSLASH_ESCAPED/src/Foo.swift -DHAVE_SETTINGS \(defaultSDKArgs)",
         "file": "src/Foo.swift",
-        "output": "$TEST_DIR/otherbuild/Foo.swift.o"
+        "output": "$TEST_DIR_BACKSLASH_ESCAPED/otherbuild/Foo.swift.o"
       }
       ]
       """,
@@ -1112,10 +1112,12 @@ final class WorkspaceTests: XCTestCase {
 
 fileprivate let defaultSDKArgs: String = {
   if let defaultSDKPath {
-    let escapedPath = defaultSDKPath.replacing(#"\"#, with: #"\\"#)
+    let escapedPath = defaultSDKPath
     return """
-      -sdk '\(escapedPath)'
+      -sdk "\(escapedPath)"
       """
+      .replacing(#"\"#, with: #"\\"#)
+      .replacing("\"", with: #"\""#)
   }
   return ""
 }()