diff --git a/SourceKitStressTester/Sources/Common/Message.swift b/SourceKitStressTester/Sources/Common/Message.swift index 72c8d3c..9b65091 100644 --- a/SourceKitStressTester/Sources/Common/Message.swift +++ b/SourceKitStressTester/Sources/Common/Message.swift @@ -558,16 +558,13 @@ public enum RequestKind: String, CaseIterable, CustomStringConvertible, Codable case collectExpressionType = "CollectExpressionType" case format = "Format" case testModule = "TestModule" - case ide = "IDE" case all = "All" public var description: String { self.rawValue } - public static let ideRequests: [RequestKind] = + public static let allRequests: [RequestKind] = [.cursorInfo, .rangeInfo, .codeComplete, .collectExpressionType, .format, - .typeContextInfo, .conformingMethodList] - public static let allRequests: [RequestKind] = ideRequests + - [.testModule] + .typeContextInfo, .conformingMethodList, .testModule] public static func byName(_ name: String) -> RequestKind? { let lower = name.lowercased() @@ -578,8 +575,6 @@ public enum RequestKind: String, CaseIterable, CustomStringConvertible, Codable public static func reduce(_ kinds: [RequestKind]) -> Set { return Set(kinds.flatMap { kind -> [RequestKind] in switch kind { - case .ide: - return ideRequests case .all: return allRequests default: diff --git a/SourceKitStressTester/Sources/StressTester/StressTesterTool.swift b/SourceKitStressTester/Sources/StressTester/StressTesterTool.swift index 156ee4f..df4af22 100644 --- a/SourceKitStressTester/Sources/StressTester/StressTesterTool.swift +++ b/SourceKitStressTester/Sources/StressTester/StressTesterTool.swift @@ -50,7 +50,7 @@ public struct StressTesterTool: ParsableCommand { @Option(name: [.customLong("request"), .customShort("r")], help: "One of '\(RequestKind.allCases.map({ $0.rawValue }).joined(separator: "\", \""))'") - public var requests: [RequestKind] = [.ide] + public var requests: [RequestKind] = [.all] @Flag(name: .shortAndLong, help: """ Dump the sourcekitd requests the stress tester would perform instead of \ diff --git a/SourceKitStressTester/Sources/SwiftCWrapper/SwiftCWrapperTool.swift b/SourceKitStressTester/Sources/SwiftCWrapper/SwiftCWrapperTool.swift index 21fbbde..c830873 100644 --- a/SourceKitStressTester/Sources/SwiftCWrapper/SwiftCWrapperTool.swift +++ b/SourceKitStressTester/Sources/SwiftCWrapper/SwiftCWrapperTool.swift @@ -66,7 +66,7 @@ public struct SwiftCWrapperTool { let astBuildLimit = try astBuildLimitEnv.get(from: environment) let requestDurationsOutputFile = try requestDurationsOutputFileEnv.get(from: environment).map(URL.init(fileURLWithPath:)) let rewriteModes = try rewriteModesEnv.get(from: environment) ?? [.none, .concurrent, .insideOut] - let requestKinds = RequestKind.reduce(try requestKindsEnv.get(from: environment) ?? [.ide]) + let requestKinds = RequestKind.reduce(try requestKindsEnv.get(from: environment) ?? [.all]) let conformingMethodTypes = try conformingMethodTypesEnv.get(from: environment) let maxJobs = try maxJobsEnv.get(from: environment) let dumpResponsesPath = try dumpResponsesPathEnv.get(from: environment) diff --git a/SourceKitStressTester/Tests/StressTesterToolTests/StressTesterToolTests.swift b/SourceKitStressTester/Tests/StressTesterToolTests/StressTesterToolTests.swift index 0f2cd00..5c1c04d 100644 --- a/SourceKitStressTester/Tests/StressTesterToolTests/StressTesterToolTests.swift +++ b/SourceKitStressTester/Tests/StressTesterToolTests/StressTesterToolTests.swift @@ -39,7 +39,7 @@ class StressTesterToolTests: XCTestCase { XCTAssertEqual(defaults.format, .humanReadable) XCTAssertEqual(defaults.limit, nil) XCTAssertEqual(defaults.page, Page()) - XCTAssertEqual(defaults.requests, [.ide]) + XCTAssertEqual(defaults.requests, [.all]) XCTAssertEqual(defaults.dryRun, false) XCTAssertEqual(defaults.reportResponses, false) XCTAssertEqual(defaults.conformingMethodsTypeList, ["s:SQ", "s:SH"]) diff --git a/SourceKitStressTester/Tests/SwiftCWrapperToolTests/SwiftCWrapperToolTests.swift b/SourceKitStressTester/Tests/SwiftCWrapperToolTests/SwiftCWrapperToolTests.swift index ce653ae..b40208a 100644 --- a/SourceKitStressTester/Tests/SwiftCWrapperToolTests/SwiftCWrapperToolTests.swift +++ b/SourceKitStressTester/Tests/SwiftCWrapperToolTests/SwiftCWrapperToolTests.swift @@ -259,7 +259,7 @@ class SwiftCWrapperToolTests: XCTestCase { private func assertInvocationsMatch(invocations: [Substring], rewriteModes: [RewriteMode], - requestKinds: [RequestKind] = RequestKind.ideRequests) { + requestKinds: [RequestKind] = RequestKind.allRequests) { for invocation in invocations { XCTAssertTrue(invocation.contains("--format json"), "Missing json format in '\(invocation)'")