Fix map printing to indent 2 levels, closes #2165

Author: José Valim

lib/elixir/lib/inspect.ex

@@ -210,9 +210,8 @@ defimpl Inspect, for: BitString do
   end
   defp escape(<<>>, _char, binary), do: binary
 
-
   @doc false
-  # also used by Regex
+  # Also used by Regex
   def escape_char(char) when char in ?\000..?\377,
     do: octify(char)
 
@@ -237,7 +236,6 @@ defimpl Inspect, for: BitString do
   defp to_hex(c) when c in 0..9, do: ?0+c
   defp to_hex(c) when c in 10..15, do: ?a+c-10
 
-
   defp append(<<h, t :: binary>>, binary), do: append(t, << binary :: binary, h >>)
   defp append(<<>>, binary), do: binary
 
@@ -355,7 +353,7 @@ end
 
 defimpl Inspect, for: Map do
   def inspect(map, opts) do
-    inspect(map, "", opts)
+    nest inspect(map, "", opts), 1
   end
 
   def inspect(map, name, opts) do

lib/elixir/lib/inspect/algebra.ex

@@ -180,8 +180,7 @@ defmodule Inspect.Algebra do
   end
 
   @doc """
-  Returns `:doc_nil` which is a document entity used to represent
-  nothingness. Takes no arguments.
+  Returns a document entity used to represent nothingness.
 
   ## Examples
 
@@ -193,8 +192,7 @@ defmodule Inspect.Algebra do
   def empty, do: :doc_nil
 
   @doc """
-  Concatenates two document entities. Takes two arguments:
-  left doc and right doc. Returns a DocCons doc
+  Concatenates two document entities.
 
   ## Examples
 
@@ -216,15 +214,16 @@ defmodule Inspect.Algebra do
     folddoc(docs, &concat(&1, &2))
   end
 
-  @doc """
-  Nests document entity `x` positions deep. Nesting will be
-  appended to the line breaks.
+  @doc ~S"""
+  Nests document entity `x` positions deep.
+
+  Nesting will be appended to the line breaks.
 
   ## Examples
 
-      iex> doc = Inspect.Algebra.nest(Inspect.Algebra.concat(Inspect.Algebra.break, "6"), 5)
-      iex> Inspect.Algebra.pretty(doc, 80)
-      " 6"
+      iex> doc = Inspect.Algebra.nest(Inspect.Algebra.glue("hello", "world"), 5)
+      iex> Inspect.Algebra.pretty(doc, 5)
+      "hello\n     world"
 
   """
   @spec nest(t, non_neg_integer) :: doc_nest
@@ -237,9 +236,11 @@ defmodule Inspect.Algebra do
   end
 
   @doc ~S"""
-  Document entity representing a break. This break can
-  be rendered as a linebreak or as spaces, depending on the
-  `mode` of the chosen layout or the provided separator.
+  Document entity representing a break.
+
+  This break can be rendered as a linebreak or as spaces,
+  depending on the `mode` of the chosen layout or the provided
+  separator.
 
   ## Examples
 

lib/elixir/test/elixir/inspect_test.exs

@@ -214,7 +214,7 @@ defmodule Inspect.MapTest do
 
   test :basic do
     assert inspect(%{1 => "b"}) == "%{1 => \"b\"}"
-    assert inspect(%{1 => "b", 2 => "c"}, [pretty: true, width: 1]) == "%{1 => \"b\",\n 2 => \"c\"}"
+    assert inspect(%{1 => "b", 2 => "c"}, [pretty: true, width: 1]) == "%{1 => \"b\",\n  2 => \"c\"}"
   end
 
   test :keyword do