Merge pull request #7577 from bitjammer/syntax-remove-dummy-indent

[Syntax] Remove dummy indent implementation

Author: bitjammer

include/swift/Syntax/RawSyntax.h

@@ -230,10 +230,6 @@ struct RawSyntax : public llvm::ThreadSafeRefCountedBase<RawSyntax> {
     return Kind >= SyntaxKind::First_Stmt && Kind <= SyntaxKind::Last_Stmt;
   }
 
-
-  RC<RawSyntax> indent(unsigned Count, TriviaKind TrivKind,
-                       unsigned Depth = 0) const;
-
   /// Get the absolute position of this raw syntax: its offset, line,
   /// and column.
   AbsolutePosition getAbsolutePosition(RC<RawSyntax> Root) const;

include/swift/Syntax/TokenSyntax.h

@@ -178,27 +178,6 @@ struct TokenSyntax final : public RawSyntax {
     }
   }
 
-  /// A dummy implementation for indenting a token with some amount
-  /// of trivia.
-  RC<TokenSyntax> indent(unsigned Count, syntax::TriviaKind TrivKind) const {
-    Trivia NewLeadingTrivia { LeadingTrivia };
-    if (NewLeadingTrivia.empty()) {
-      NewLeadingTrivia.push_back(
-          syntax::TriviaPiece {TrivKind, Count, OwnedString{}});
-    } else {
-      auto Last = NewLeadingTrivia.back();
-      if (Last.Kind == TrivKind) {
-        NewLeadingTrivia.pop_back();
-        NewLeadingTrivia.push_back(
-            syntax::TriviaPiece {TrivKind, Count + Last.Count, OwnedString{}});
-      } else {
-        NewLeadingTrivia.push_back(
-            syntax::TriviaPiece {TrivKind, Count, OwnedString{}});
-      }
-    }
-    return make(TokenKind, Text, Presence, NewLeadingTrivia, TrailingTrivia);
-  }
-
   /// Advance the provided AbsolutePosition by the token's full width and
   /// return the AbsolutePosition of the start of the token's nontrivial text.
   AbsolutePosition accumulateAbsolutePosition(AbsolutePosition &Pos) const;

lib/Syntax/RawSyntax.cpp

@@ -80,38 +80,6 @@ void RawSyntax::dump(llvm::raw_ostream &OS, unsigned Indent) const {
   OS << ')';
 }
 
-RC<RawSyntax> RawSyntax::indent(unsigned Count, TriviaKind TrivKind,
-                                unsigned Depth) const {
-  LayoutList NewLayout;
-  bool IsFirst = Depth == 0;
-
-  for (const auto LE : Layout) {
-    switch (LE->Kind) {
-    case SyntaxKind::Token: {
-      auto Tok = llvm::cast<TokenSyntax>(LE);
-      auto Leading = Tok->LeadingTrivia;
-      auto LeadingNewline = Leading.find(TriviaKind::Newline);
-      auto FoundNewline = LeadingNewline != Leading.end();
-
-      if (IsFirst || FoundNewline) {
-        IsFirst = false;
-        RC<TokenSyntax> IndentedToken = Tok->indent(Count, TrivKind);
-        NewLayout.push_back(IndentedToken);
-      } else {
-        NewLayout.push_back(LE);
-      }
-
-      break;
-    }
-    default:
-      NewLayout.push_back(LE->indent(Count, TrivKind, Depth + 1));
-      break;
-    }
-  }
-
-  return RawSyntax::make(Kind, NewLayout, Presence);
-}
-
 bool RawSyntax::accumulateAbsolutePosition(
     AbsolutePosition &Pos, const RawSyntax *UpToTargetNode) const {
   auto Found = this == UpToTargetNode;

tools/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_swift_tool_subdirectory(driver)
 add_swift_tool_subdirectory(sil-opt)
 add_swift_tool_subdirectory(swift-ide-test)
-add_swift_tool_subdirectory(swift-format)
+add_swift_tool_subdirectory(swift-syntax-format)
 add_swift_tool_subdirectory(swift-remoteast-test)
 add_swift_tool_subdirectory(swift-demangle)
 add_swift_tool_subdirectory(lldb-moduleimport-test)

tools/swift-format/CMakeLists.txt renamed to tools/swift-syntax-format/CMakeLists.txt

@@ -1,5 +1,5 @@
-add_swift_host_tool(swift-format
-  swift-format.cpp
+add_swift_host_tool(swift-syntax-format
+  swift-syntax-format.cpp
   LINK_LIBRARIES
     swiftAST
     swiftDriver