Merge pull request #15925 from benlangmuir/minor-cleanups

Author: swift-ci

lib/IDE/Formatting.cpp

@@ -668,7 +668,7 @@ class FormatWalker : public SourceEntityWalker {
   SiblingCollector SCollector;
 
   /// Sometimes, target is a part of "parent", for instance, "#else" is a part
-  /// of an ifconfigstmt, so that ifconfigstmt is not really the parent of "#else".
+  /// of an IfConfigDecl, so that IfConfigDecl is not really the parent of "#else".
   bool isTargetPartOf(swift::ASTWalker::ParentTy Parent) {
     if (auto Conf = dyn_cast_or_null<IfConfigDecl>(Parent.getAsDecl())) {
       for (auto Clause : Conf->getClauses()) {

tools/SourceKit/tools/complete-test/complete-test.cpp

@@ -64,7 +64,6 @@ static sourcekitd_uid_t KeyRequest;
 static sourcekitd_uid_t KeyCompilerArgs;
 static sourcekitd_uid_t KeyOffset;
 static sourcekitd_uid_t KeyLength;
-static sourcekitd_uid_t KeyActionable;
 static sourcekitd_uid_t KeySourceFile;
 static sourcekitd_uid_t KeySourceText;
 static sourcekitd_uid_t KeyName;
@@ -286,7 +285,6 @@ static int skt_main(int argc, const char **argv) {
   KeyCompilerArgs = sourcekitd_uid_get_from_cstr("key.compilerargs");
   KeyOffset = sourcekitd_uid_get_from_cstr("key.offset");
   KeyLength = sourcekitd_uid_get_from_cstr("key.length");
-  KeyActionable = sourcekitd_uid_get_from_cstr("key.actionable");
   KeyKind = sourcekitd_uid_get_from_cstr("key.kind");
   KeyCodeCompleteOptions =
       sourcekitd_uid_get_from_cstr("key.codecomplete.options");

utils/gyb_sourcekit_support/UIDs.py

@@ -125,7 +125,6 @@ def __init__(self, internal_name, external_name):
     KEY('Names', 'key.names'),
     KEY('UIDs', 'key.uids'),
     KEY('SyntacticOnly', 'key.syntactic_only'),
-    KEY('Actionable', 'key.actionable'),
     KEY('ParentLoc', 'key.parent_loc'),
     KEY('IsTestCandidate', 'key.is_test_candidate'),
     KEY('Overrides', 'key.overrides'),