Swift: fix includes jumbled by IDE

Author: redsun82

swift/extractor/infra/SwiftDispatcher.h

@@ -5,9 +5,9 @@
 #include "swift/extractor/trap/TrapOutput.h"
 #include "swift/extractor/trap/generated/TrapClasses.h"
 #include "swift/extractor/infra/SwiftTagTraits.h"
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/AST/SourceFile.h"
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/Basic/SourceManager.h"
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/llvm/Support/FileSystem.h"
+#include <swift/AST/SourceFile.h>
+#include <swift/Basic/SourceManager.h>
+#include <llvm/Support/FileSystem.h>
 
 namespace codeql {
 

swift/extractor/infra/SwiftTagTraits.h

@@ -2,7 +2,7 @@
 
 // This file implements the mapping needed by the API defined in the TrapTagTraits.h, so that
 // TrapTagOf/TrapLabelOf provide the tags/labels for specific swift entity types.
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/AST/ASTVisitor.h"
+#include <swift/AST/ASTVisitor.h>
 #include "swift/extractor/trap/TrapTagTraits.h"
 #include "swift/extractor/trap/generated/TrapTags.h"
 
@@ -39,32 +39,32 @@ MAP_TAG(StmtCondition);
 MAP_TAG(CaseLabelItem);
 #define ABSTRACT_STMT(CLASS, PARENT) MAP_SUBTAG(CLASS##Stmt, PARENT)
 #define STMT(CLASS, PARENT) ABSTRACT_STMT(CLASS, PARENT)
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/AST/StmtNodes.def"
+#include <swift/AST/StmtNodes.def>
 
 MAP_TAG(Expr);
 #define ABSTRACT_EXPR(CLASS, PARENT) MAP_SUBTAG(CLASS##Expr, PARENT)
 #define EXPR(CLASS, PARENT) ABSTRACT_EXPR(CLASS, PARENT)
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/AST/ExprNodes.def"
+#include <swift/AST/ExprNodes.def>
 
 MAP_TAG(Decl);
 #define ABSTRACT_DECL(CLASS, PARENT) MAP_SUBTAG(CLASS##Decl, PARENT)
 #define DECL(CLASS, PARENT) ABSTRACT_DECL(CLASS, PARENT)
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/AST/DeclNodes.def"
+#include <swift/AST/DeclNodes.def>
 
 MAP_TAG(Pattern);
 #define ABSTRACT_PATTERN(CLASS, PARENT) MAP_SUBTAG(CLASS##Pattern, PARENT)
 #define PATTERN(CLASS, PARENT) ABSTRACT_PATTERN(CLASS, PARENT)
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/AST/PatternNodes.def"
+#include <swift/AST/PatternNodes.def>
 
 MAP_TAG(TypeRepr);
 #define ABSTRACT_TYPEREPR(CLASS, PARENT) MAP_SUBTAG(CLASS##TypeRepr, PARENT)
 #define TYPEREPR(CLASS, PARENT) ABSTRACT_TYPEREPR(CLASS, PARENT)
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/AST/TypeReprNodes.def"
+#include <swift/AST/TypeReprNodes.def>
 
 MAP_TYPE_TO_TAG(TypeBase, TypeTag);
 #define ABSTRACT_TYPE(CLASS, PARENT) MAP_SUBTAG(CLASS##Type, PARENT)
 #define TYPE(CLASS, PARENT) ABSTRACT_TYPE(CLASS, PARENT)
-#include "external/swift_prebuilt_linux/_virtual_includes/swift-llvm-support/swift/AST/TypeNodes.def"
+#include <swift/AST/TypeNodes.def>
 
 OVERRIDE_TAG(FuncDecl, ConcreteFuncDeclTag);
 OVERRIDE_TAG(VarDecl, ConcreteVarDeclTag);