Merge pull request #41395 from bnbarham/init-compiler-invocation-use-action

[IDE] Use the passed in Action for setting up an invocation

Author: bnbarham

lib/IDE/Utils.cpp

@@ -350,9 +350,7 @@ bool ide::initCompilerInvocation(
   FrontendOpts.IndexStorePath.clear();
   ImporterOpts.IndexStorePath.clear();
 
-  // Force the action type to be -typecheck. This affects importing the
-  // SwiftONoneSupport module.
-  FrontendOpts.RequestedAction = FrontendOptions::ActionType::Typecheck;
+  FrontendOpts.RequestedAction = Action;
 
   // We don't care about LLVMArgs
   FrontendOpts.LLVMArgs.clear();

test/SourceKit/Refactoring/find-rename-ranges/z.expected

@@ -1,6 +1,6 @@
 source.edit.kind.active:
   8:9-8:10 source.refactoring.range.kind.basename
-source.edit.kind.active:
+source.edit.kind.inactive:
   10:16-10:17 source.refactoring.range.kind.basename
 source.edit.kind.inactive:
   12:16-12:17 source.refactoring.range.kind.basename

test/SourceKit/Refactoring/syntactic-rename.swift

@@ -118,8 +118,15 @@ struct Foo {
 }
 
 // RUN: %empty-directory(%t.result)
+
+// Ensure that a syntactic rename request does not require the stdlib
+// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/empty.json %s -- -resource-dir /no/stdlib/here
+
 // RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/x.in.json %s >> %t.result/x.expected
 // RUN: %diff -u %S/syntactic-rename/x.expected %t.result/x.expected
+
+// Note: Even though the #if is true, it is not evaluated since we only parse.
+// Thus, both the #if and #else are inactive
 // RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/z.in.json %s >> %t.result/z.expected
 // RUN: %diff -u %S/syntactic-rename/z.expected %t.result/z.expected
 // RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/foo.in.json %s >> %t.result/foo_arity1.expected

test/SourceKit/Refactoring/syntactic-rename/empty.json

@@ -0,0 +1 @@
+[]

test/SourceKit/Refactoring/syntactic-rename/z.expected

@@ -1,6 +1,6 @@
 source.edit.kind.active:
   8:9-8:10 "foo"
-source.edit.kind.active:
+source.edit.kind.inactive:
   10:16-10:17 "foo"
 source.edit.kind.inactive:
   12:16-12:17 "foo"