Revert "Add indented raw_ostream class"

This reverts commit 78530ce.

Fails on shared_lib build.

Author: jpienaar

mlir/include/mlir/Support/IndentedOstream.h

@@ -1,6 +1,5 @@
 set(LLVM_OPTIONAL_SOURCES
   FileUtilities.cpp
-  IndentedOstream.cpp
   MlirOptMain.cpp
   StorageUniquer.cpp
   ToolUtilities.cpp
@@ -28,10 +27,3 @@ add_mlir_library(MLIROptLib
   MLIRParser
   MLIRSupport
   )
-
-# This doesn't use add_mlir_library as it is used in mlir-tblgen and else
-# mlir-tblgen ends up depending on mlir-generic-headers.
-add_llvm_library(MLIRSupportIdentedOstream
-  IndentedOstream.cpp
-
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support)

mlir/lib/Support/CMakeLists.txt

@@ -25,7 +25,6 @@ add_tablegen(mlir-tblgen MLIR
 set_target_properties(mlir-tblgen PROPERTIES FOLDER "Tablegenning")
 target_link_libraries(mlir-tblgen
   PRIVATE
-  MLIRSupportIdentedOstream
   MLIRTableGen)
 
 mlir_check_all_link_libraries(mlir-tblgen)

mlir/lib/Support/IndentedOstream.cpp

@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "DocGenUtilities.h"
-#include "mlir/Support/IndentedOstream.h"
 #include "mlir/TableGen/GenInfo.h"
 #include "mlir/TableGen/Operator.h"
 #include "llvm/ADT/DenseMap.h"
@@ -36,8 +35,39 @@ using mlir::tblgen::Operator;
 // in a way the user wanted but has some additional indenting due to being
 // nested in the op definition.
 void mlir::tblgen::emitDescription(StringRef description, raw_ostream &os) {
-  raw_indented_ostream ros(os);
-  ros.reindent(description.rtrim(" \t"));
+  // Determine the minimum number of spaces in a line.
+  size_t min_indent = -1;
+  StringRef remaining = description;
+  while (!remaining.empty()) {
+    auto split = remaining.split('\n');
+    size_t indent = split.first.find_first_not_of(" \t");
+    if (indent != StringRef::npos)
+      min_indent = std::min(indent, min_indent);
+    remaining = split.second;
+  }
+
+  // Print out the description indented.
+  os << "\n";
+  remaining = description;
+  bool printed = false;
+  while (!remaining.empty()) {
+    auto split = remaining.split('\n');
+    if (split.second.empty()) {
+      // Skip last line with just spaces.
+      if (split.first.ltrim().empty())
+        break;
+    }
+    // Print empty new line without spaces if line only has spaces, unless no
+    // text has been emitted before.
+    if (split.first.ltrim().empty()) {
+      if (printed)
+        os << "\n";
+    } else {
+      os << split.first.substr(min_indent) << "\n";
+      printed = true;
+    }
+    remaining = split.second;
+  }
 }
 
 // Emits `str` with trailing newline if not empty.
@@ -86,7 +116,7 @@ static void emitOpDoc(Operator op, raw_ostream &os) {
 
   // Emit the summary, syntax, and description if present.
   if (op.hasSummary())
-    os << "\n" << op.getSummary() << "\n\n";
+    os << "\n" << op.getSummary() << "\n";
   if (op.hasAssemblyFormat())
     emitAssemblyFormat(op.getOperationName(), op.getAssemblyFormat().trim(),
                        os);
@@ -198,7 +228,7 @@ static void emitDialectDoc(const RecordKeeper &recordKeeper, raw_ostream &os) {
   }
 
   os << "<!-- Autogenerated by mlir-tblgen; don't manually edit -->\n";
-  for (const auto &dialectWithOps : dialectOps)
+  for (auto dialectWithOps : dialectOps)
     emitDialectDoc(dialectWithOps.first, dialectWithOps.second,
                    dialectTypes[dialectWithOps.first], os);
 }