[gardening] Move FuzzyStringMatcher to libIDE

Author: benlangmuir

tools/SourceKit/include/SourceKit/Support/FuzzyStringMatcher.h renamed to include/swift/IDE/FuzzyStringMatcher.h

@@ -2,22 +2,23 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// 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
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_SOURCEKIT_LIB_SUPPORT_FUZZYSTRINGMATCHER_H
-#define LLVM_SOURCEKIT_LIB_SUPPORT_FUZZYSTRINGMATCHER_H
+#ifndef SWIFT_IDE_FUZZYSTRINGMATCHER_H
+#define SWIFT_IDE_FUZZYSTRINGMATCHER_H
 
-#include "SourceKit/Core/LLVM.h"
+#include "swift/Basic/LLVM.h"
 #include "llvm/ADT/BitVector.h"
 #include <string>
 
-namespace SourceKit {
+namespace swift {
+namespace ide {
 
 /// FuzzyStringMatcher compares candidate strings against a pattern
 /// string using a fuzzy matching algorithm and provides a numerical
@@ -49,6 +50,7 @@ class FuzzyStringMatcher {
   double scoreCandidate(StringRef candidate) const;
 };
 
-} // end namespace SourceKit
+} // namespace ide
+} // namespace swift
 
-#endif // LLVM_SOURCEKIT_LIB_SUPPORT_FUZZYSTRINGMATCHER_H
+#endif // SWIFT_IDE_FUZZYSTRINGMATCHER_H

lib/IDE/CMakeLists.txt

@@ -7,6 +7,7 @@ add_swift_host_library(swiftIDE STATIC
   ConformingMethodList.cpp
   ExprContextAnalysis.cpp
   Formatting.cpp
+  FuzzyStringMatcher.cpp
   Refactoring.cpp
   ModuleInterfacePrinting.cpp
   REPLCodeCompletion.cpp

tools/SourceKit/lib/Support/FuzzyStringMatcher.cpp renamed to lib/IDE/FuzzyStringMatcher.cpp

@@ -2,20 +2,21 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// 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
 //
 //===----------------------------------------------------------------------===//
 
-#include "SourceKit/Support/FuzzyStringMatcher.h"
+#include "swift/IDE/FuzzyStringMatcher.h"
 #include "clang/Basic/CharInfo.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallString.h"
 
-using namespace SourceKit;
+using namespace swift;
+using namespace swift::ide;
 using clang::toUppercase;
 using clang::toLowercase;
 using clang::isUppercase;

tools/SourceKit/lib/Support/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_sourcekit_library(SourceKitSupport
   Concurrency-libdispatch.cpp
-  FuzzyStringMatcher.cpp
   Logging.cpp
   ImmutableTextBuffer.cpp
   ThreadSafeRefCntPtr.cpp

tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp

@@ -11,10 +11,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "CodeCompletionOrganizer.h"
-#include "SourceKit/Support/FuzzyStringMatcher.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Module.h"
 #include "swift/IDE/CodeCompletionResultPrinter.h"
+#include "swift/IDE/FuzzyStringMatcher.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Markup/XMLUtils.h"
 #include "clang/Basic/CharInfo.h"

unittests/SourceKit/Support/FuzzyStringMatcherTest.cpp

@@ -10,10 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SourceKit/Support/FuzzyStringMatcher.h"
+#include "swift/IDE/FuzzyStringMatcher.h"
 #include "gtest/gtest.h"
 
-using FuzzyStringMatcher = SourceKit::FuzzyStringMatcher;
+using FuzzyStringMatcher = swift::ide::FuzzyStringMatcher;
 
 TEST(FuzzyStringMatcher, BasicMatching) {
   {